diff --git a/src/main/resources/META-INF/resources/themes/flowset/components/vaadin-form-layout.css b/src/main/resources/META-INF/resources/themes/flowset/components/vaadin-form-layout.css
new file mode 100644
index 0000000..4f76c33
--- /dev/null
+++ b/src/main/resources/META-INF/resources/themes/flowset/components/vaadin-form-layout.css
@@ -0,0 +1,3 @@
+:host {
+    --vaadin-form-layout-column-spacing: var(--lumo-space-m);
+}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/resources/themes/flowset/components/vaadin-grid.css b/src/main/resources/META-INF/resources/themes/flowset/components/vaadin-grid.css
new file mode 100644
index 0000000..0d75023
--- /dev/null
+++ b/src/main/resources/META-INF/resources/themes/flowset/components/vaadin-grid.css
@@ -0,0 +1,39 @@
+[part~='header-cell'] {
+    background-color: var(--grid-header-bg-color);
+}
+
+:host(:not([theme~='no-border'])) {
+    border-radius: var(--grid-border-radius);
+}
+[part~='row']:before,
+[part~='focused-cell'] {
+    border-radius: var(--grid-border-radius);
+}
+
+[part~='row']:only-child [part~='header-cell'] {
+    min-height: var(--lumo-size-l);
+}
+
+[part~='first-row'] {
+    border-start-start-radius: var(--grid-border-radius);
+    border-start-end-radius: var(--grid-border-radius);
+}
+
+[part~='first-row'] [part~='first-column-cell']{
+    border-start-start-radius: var(--grid-border-radius);
+}
+[part~='first-row'] [part~='last-column-cell'] {
+    border-start-end-radius: var(--grid-border-radius);
+}
+
+[part~='last-row']:not([part~='first-row']) {
+    border-end-start-radius: var(--grid-border-radius);
+    border-end-end-radius: var(--grid-border-radius);
+}
+
+[part~='last-row']:not([part~='first-row']) [part~='first-column-cell'] {
+    border-end-start-radius: var(--grid-border-radius);
+}
+[part~='last-row']:not([part~='first-row']) [part~='last-column-cell'] {
+    border-end-end-radius: var(--grid-border-radius);
+}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/resources/themes/flowset/styles.css b/src/main/resources/META-INF/resources/themes/flowset/styles.css
index f563d6d..36eca4f 100644
--- a/src/main/resources/META-INF/resources/themes/flowset/styles.css
+++ b/src/main/resources/META-INF/resources/themes/flowset/styles.css
@@ -33,6 +33,32 @@ html {
 
     --vaadin-checkbox-background-hover: var(--lumo-contrast-10pct);
     --vaadin-radio-button-background-hover: var(--lumo-contrast-10pct);
+
+    --grid-header-bg-color: #EEF3F5;
+    --grid-border-radius: var(--lumo-border-radius-m);
+
+    --lumo-size-xl: 3rem;
+    --lumo-size-l: 2.5rem;
+    --lumo-size-m: 2rem;
+    --lumo-size-s: 1.75rem;
+    --lumo-size-xs: 1.5rem;
+
+    --lumo-space-xl: 1.875rem;
+    --lumo-space-l: 1.25rem;
+    --lumo-space-m: 0.625rem;
+    --lumo-space-s: 0.375rem;
+    --lumo-space-xs: 0.1875rem;
+    --lumo-font-size: 1rem;
+    --lumo-font-size-xxxl: 1.75rem;
+    --lumo-font-size-xxl: 1.375rem;
+    --lumo-font-size-xl: 1.125rem;
+    --lumo-font-size-l: 1rem;
+    --lumo-font-size-m: 0.875rem;
+    --lumo-font-size-s: 0.8125rem;
+    --lumo-font-size-xs: 0.75rem;
+    --lumo-font-size-xxs: 0.6875rem;
+
+    --vaadin-button-height: calc(var(--lumo-size-s) + 0.15rem);
 }
 
 [theme~='badge'] {
@@ -48,4 +74,20 @@ html {
 
 [theme~='badge'][theme~='warning'] {
     border-color: var(--lumo-warning-color-20pct);
+}
+
+[theme~='badge'] {
+    line-height: 1.1;
+}
+
+[theme~='badge'][theme~='small'] {
+    line-height: 1.1;
+}
+
+jmix-code-editor::part(input-field) {
+    font-size: var(--lumo-font-size-m) !important;
+}
+
+vaadin-dialog-overlay::part(footer) {
+    background-color: transparent;
 }
\ No newline at end of file