diff --git a/front/core/components/field/style.scss b/front/core/components/field/style.scss
index 5f77e904e..c611773e3 100644
--- a/front/core/components/field/style.scss
+++ b/front/core/components/field/style.scss
@@ -222,7 +222,7 @@
             }
         }
         &.focused {
-            background-color: $color-bg-panel;
+            background-color: $color-font-dark;
 
             & > .container {
                 & > .infix > .control > * {
diff --git a/front/core/components/smart-table/table.scss b/front/core/components/smart-table/table.scss
index e0464465a..855534011 100644
--- a/front/core/components/smart-table/table.scss
+++ b/front/core/components/smart-table/table.scss
@@ -27,7 +27,7 @@ smart-table table {
             & > th,
             & > td {
                 text-align: left;
-                padding: 9px 5px;
+                padding: 5px;
                 white-space: nowrap;
                 text-overflow: ellipsis;
 
@@ -76,23 +76,26 @@ smart-table table {
             .chip {
                 padding: 4px;
                 border-radius: 4px;
-                color: $color-font-bg;
 
                 &.notice {
-                    background-color: $color-notice-medium
+                    background-color: $color-notice-medium;
+                    color: $color-font-bg;
                 }
                 &.success {
                     background-color: $color-success-medium;
+                    color: $color-font-bg;
                 }
                 &.warning {
                     background-color: $color-main-medium;
+                    color: $color-font-bg;
                 }
                 &.alert {
                     background-color: $color-alert-medium;
+                    color: $color-font-bg;
                 }
                 &.message {
+                    background-color: $color-bg-dark;
                     color: $color-font-dark;
-                    background-color: $color-bg-dark
                 }
             }
         }
diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss
index 2864ea8a1..c73a7f0b0 100644
--- a/front/core/components/table/style.scss
+++ b/front/core/components/table/style.scss
@@ -195,7 +195,7 @@ vn-table.scrollable > .vn-table,
     thead vn-th,
     thead th {
         border-bottom: 2px solid $color-spacer;
-        background-color: #FFF;
+        background-color: $color-bg-panel;
         position: sticky;
         z-index: 9;
         top: 0
diff --git a/front/core/styles/variables.scss b/front/core/styles/variables.scss
index 8883c5480..0c25aa873 100644
--- a/front/core/styles/variables.scss
+++ b/front/core/styles/variables.scss
@@ -1,6 +1,6 @@
 @import "./util";
 
-$font-size: 12pt;
+$font-size: 11pt;
 $menu-width: 256px;
 $topbar-height: 56px;
 $mobile-width: 800px;
@@ -24,7 +24,7 @@ $spacing-xl: 70px;
 
 // Light theme
 
-$color-primary: #f7931e;
+/* $color-primary: #f7931e;
 $color-secondary: $color-primary;
 
 $color-font: #222;
@@ -72,28 +72,36 @@ $color-success-light: lighten($color-success, 35%);
 $color-notice-medium: lighten($color-notice, 20%);
 $color-notice-light: lighten($color-notice, 35%);
 $color-alert-medium: lighten($color-alert, 20%);
-$color-alert-light: lighten($color-alert, 35%);
+$color-alert-light: lighten($color-alert, 35%); */
 /**/
 
 // Dark theme
-/*
-$color-header: #3d3d3d;
-$color-bg: #222;
-$color-bg-dark: #222;
+$color-primary: #f7931e;
+$color-secondary: $color-primary;
+
 $color-font: #eee;
 $color-font-light: #aaa;
 $color-font-secondary: #777;
 $color-font-dark: white;
+$color-font-link: $color-primary;
 $color-font-bg: rgba(0, 0, 0, .8);
-$color-font-link: #005a9a;
+$color-font-bg-marginal: rgba(0, 0, 0, .4);
+$color-font-bg-dark: rgba(255, 255, 255, .7);
+$color-font-bg-dark-marginal: rgba(255, 255, 255, .4);
+
+$color-header: #3d3d3d;
+$color-menu-header: #3d3d3d;
+$color-bg: #222;
+$color-bg-dark: #222;
 $color-active: #666;
 $color-active-font: white;
 $color-bg-panel: #3c3b3b;
-$color-main: #f7931e;
-$color-marginal: #ccc;
+$color-main: $color-primary;
+$color-marginal: #111;
 $color-success: #a3d131;
 $color-notice: #32b1ce;
 $color-alert: #f42121;
+$color-button: $color-secondary;
 
 $color-spacer: rgba(255, 255, 255, .3);
 $color-spacer-light: rgba(255, 255, 255, .12);
@@ -105,15 +113,18 @@ $color-hover-cd: rgba(255, 255, 255, .1);
 $color-hover-dc: .7;
 $color-disabled: .6;
 
-$color-font-link: lighten($color-main, 10%);
-$color-main-medium: darken($color-main, 20%);
-$color-main-light: darken($color-main, 35%);
-$color-success-medium: darken($color-success, 20%);
-$color-success-light: darken($color-success, 35%);
-$color-notice-medium: darken($color-notice, 20%);
-$color-notice-light: darken($color-notice, 35%);
-$color-alert-medium: darken($color-alert, 20%);
-$color-alert-light: darken($color-alert, 35%);
+$color-primary-medium: lighten($color-primary, 20%);
+$color-primary-light: lighten($color-primary, 35%);
+$color-font-link-medium: lighten($color-font-link, 20%);
+$color-font-link-light: lighten($color-font-link, 35%);
+$color-main-medium: lighten($color-main, 20%);
+$color-main-light: lighten($color-main, 35%);
+$color-success-medium: lighten($color-success, 20%);
+$color-success-light: lighten($color-success, 35%);
+$color-notice-medium: lighten($color-notice, 20%);
+$color-notice-light: lighten($color-notice, 35%);
+$color-alert-medium: lighten($color-alert, 20%);
+$color-alert-light: lighten($color-alert, 35%);
 /**/
 
 // Border
diff --git a/front/salix/components/summary/style.scss b/front/salix/components/summary/style.scss
index 99854fa9d..2db3d961e 100644
--- a/front/salix/components/summary/style.scss
+++ b/front/salix/components/summary/style.scss
@@ -68,7 +68,6 @@ ui-view > .vn-summary {
             padding: 7px;
             padding-bottom: 4px; /* Bottom line-height fix */
             font-weight: lighter;
-            background-color: $color-main-light;
             border-bottom: 1px solid $color-main;
             white-space: nowrap;
             overflow: hidden;
@@ -78,7 +77,7 @@ ui-view > .vn-summary {
                 display: block;
             }
             a {
-                color: $color-font;
+                color: $color-font-link;
             }
         }
         h4 span:after {
@@ -87,7 +86,7 @@ ui-view > .vn-summary {
             position: absolute;
             right: 5px;
             text-transform: none;
-            color: $color-spacer
+            color: $color-font-link;
         }
         & > * {
             margin: $spacing-sm;
diff --git a/modules/entry/front/buy/index/style.scss b/modules/entry/front/buy/index/style.scss
index 55df72f1c..04c8d130a 100644
--- a/modules/entry/front/buy/index/style.scss
+++ b/modules/entry/front/buy/index/style.scss
@@ -15,16 +15,16 @@ vn-entry-buy-index vn-card {
 
     tbody tr:nth-child(1),
     tbody tr:nth-child(2) {
-        border-left: 1px solid $color-marginal;
-        border-right: 1px solid $color-marginal;
+        border-left: 1px solid $color-spacer;
+        border-right: 1px solid $color-spacer;
     }
 
     tbody tr:nth-child(2) {
-        border-bottom: 1px solid $color-marginal;
+        border-bottom: 1px solid $color-spacer;
     }
     
     tbody{
-        border-bottom: 1px solid $color-marginal;
+        border-bottom: 1px solid $color-spacer;
     }
 
     tbody:last-child {
diff --git a/modules/entry/front/main/index.html b/modules/entry/front/main/index.html
index 6c08cd0c4..f6a4c61fc 100644
--- a/modules/entry/front/main/index.html
+++ b/modules/entry/front/main/index.html
@@ -2,7 +2,8 @@
     vn-id="model"
     url="Entries/filter"
     limit="20"
-    auto-load="true">
+    auto-load="true"
+    order="landed DESC, id DESC">
 </vn-crud-model>
 <vn-portal slot="topbar">
     <vn-searchbar
diff --git a/modules/entry/front/summary/style.scss b/modules/entry/front/summary/style.scss
index 94e38c419..1e3d3d482 100644
--- a/modules/entry/front/summary/style.scss
+++ b/modules/entry/front/summary/style.scss
@@ -9,13 +9,13 @@ vn-entry-summary .summary {
     }
 
     tbody tr:nth-child(1) {
-        border-top: 1px solid $color-marginal;
+        border-top: 1px solid $color-spacer;
     }
 
     tbody tr:nth-child(1),
     tbody tr:nth-child(2) {
-        border-left: 1px solid $color-marginal;
-        border-right: 1px solid $color-marginal
+        border-left: 1px solid $color-spacer;
+        border-right: 1px solid $color-spacer
     }
 
     tbody tr:nth-child(3) {
diff --git a/modules/monitor/front/index/orders/style.scss b/modules/monitor/front/index/orders/style.scss
index 102712eaf..d9d50360e 100644
--- a/modules/monitor/front/index/orders/style.scss
+++ b/modules/monitor/front/index/orders/style.scss
@@ -11,7 +11,7 @@ vn-monitor-sales-orders {
             color: gray;
 
             & > vn-td {
-                border-bottom: 2px solid $color-marginal;
+                border-bottom: 2px solid $color-spacer;
                 font-size: 13px;
             }
         }
diff --git a/modules/supplier/front/contact/style.scss b/modules/supplier/front/contact/style.scss
index 84e98050d..becc66dcf 100644
--- a/modules/supplier/front/contact/style.scss
+++ b/modules/supplier/front/contact/style.scss
@@ -6,5 +6,5 @@
     margin-bottom: 10px;
     padding-right: 10px;
     padding-left: 10px;
-    border: 1px solid $color-marginal;
+    border: 1px solid $color-spacer;
 }