diff --git a/build/build_theme_vars.ts b/build/build_theme_vars.ts
index 5b207e350e..f7c8a2f66b 100644
--- a/build/build_theme_vars.ts
+++ b/build/build_theme_vars.ts
@@ -42,6 +42,6 @@ ${themeCssVars.join("\n")}
 `;
 
 // Run
-console.info(`"Saving css-variables for Lens theme to "${outputCssFile}""`);
+console.info(`"Saving default Lens theme css-variables to "${outputCssFile}""`);
 fs.ensureFileSync(outputCssFile);
 fs.writeFile(outputCssFile, content);
diff --git a/src/renderer/components/+nodes/nodes.scss b/src/renderer/components/+nodes/nodes.scss
index 09696612a4..5919bac691 100644
--- a/src/renderer/components/+nodes/nodes.scss
+++ b/src/renderer/components/+nodes/nodes.scss
@@ -37,7 +37,7 @@
       align-self: center;
 
       .LineProgress {
-        color: var(--lensBlue);
+        color: var(--blue);
       }
     }
 
@@ -46,7 +46,7 @@
       align-self: center;
 
       .LineProgress {
-        color: var(--lensMagenta);
+        color: var(--magenta);
       }
     }
 
diff --git a/src/renderer/components/+workloads-pods/pod-details-list.scss b/src/renderer/components/+workloads-pods/pod-details-list.scss
index ec8d845099..43177d6c86 100644
--- a/src/renderer/components/+workloads-pods/pod-details-list.scss
+++ b/src/renderer/components/+workloads-pods/pod-details-list.scss
@@ -55,7 +55,7 @@
       align-self: center;
 
       .LineProgress {
-        color: var(--lensBlue);
+        color: var(--blue);
       }
     }
 
@@ -63,7 +63,7 @@
       align-self: center;
 
       .LineProgress {
-        color: var(--lensMagenta);
+        color: var(--magenta);
       }
     }
 
diff --git a/src/renderer/components/checkbox/checkbox.scss b/src/renderer/components/checkbox/checkbox.scss
index b0bd06af9a..edc605c925 100644
--- a/src/renderer/components/checkbox/checkbox.scss
+++ b/src/renderer/components/checkbox/checkbox.scss
@@ -23,7 +23,7 @@
 .Checkbox {
   --checkbox-color: var(--textColorPrimary); // tick color [√]
   --checkbox-color-active: var(--contentColor);
-  --checkbox-bgc-active: var(--lensBlue);
+  --checkbox-bgc-active: var(--blue);
 
   flex-shrink: 0;
 
@@ -32,7 +32,7 @@
       // default
     }
     &-light {
-      --checkbox-color-active: var(--lensBlue);
+      --checkbox-color-active: var(--blue);
       --checkbox-bgc-active: none;
     }
   }
diff --git a/src/renderer/components/drawer/drawer-param-toggler.scss b/src/renderer/components/drawer/drawer-param-toggler.scss
index 8698c3d58b..7c478462e8 100644
--- a/src/renderer/components/drawer/drawer-param-toggler.scss
+++ b/src/renderer/components/drawer/drawer-param-toggler.scss
@@ -28,7 +28,7 @@
     cursor: pointer;
 
     .param-link-text {
-      color: var(--lensBlue);
+      color: var(--blue);
       text-decoration: underline;
     }
   }
diff --git a/src/renderer/components/drawer/drawer.scss b/src/renderer/components/drawer/drawer.scss
index 3d59452700..e170bcc613 100644
--- a/src/renderer/components/drawer/drawer.scss
+++ b/src/renderer/components/drawer/drawer.scss
@@ -67,7 +67,7 @@
   }
 
   .drawer-title {
-    background: var(--lensBlue);
+    background: var(--blue);
     color: var(--drawerTitleText);
     padding: $padding $padding * 2.5;
     word-break: break-all;
diff --git a/src/renderer/components/icon/icon.scss b/src/renderer/components/icon/icon.scss
index 25f1bd1c12..49d4b9c192 100644
--- a/src/renderer/components/icon/icon.scss
+++ b/src/renderer/components/icon/icon.scss
@@ -26,7 +26,7 @@
   --big-size: 32px;
   --color-active: var(--iconActiveColor);
   --bgc-active: var(--iconActiveBackground);
-  --focus-color: var(--icon-focus-color, var(--lensBlue));
+  --focus-color: var(--icon-focus-color, var(--blue));
 
   display: inline-flex;
   flex-shrink: 0;
diff --git a/src/renderer/components/layout/sidebar-item.scss b/src/renderer/components/layout/sidebar-item.scss
index 330ef35610..c7d5baa629 100644
--- a/src/renderer/components/layout/sidebar-item.scss
+++ b/src/renderer/components/layout/sidebar-item.scss
@@ -42,7 +42,7 @@
     }
 
     &.active, &:hover {
-      background: var(--lensBlue);
+      background: var(--blue);
       color: var(--sidebarActiveColor);
     }
 
@@ -56,7 +56,7 @@
     border-left: $borderSize solid transparent;
 
     &.active {
-      border-left-color: var(--lensBlue);
+      border-left-color: var(--blue);
     }
 
     > .SidebarItem {
diff --git a/src/renderer/components/slider/slider.scss b/src/renderer/components/slider/slider.scss
index 589e316633..e97d3c96f7 100644
--- a/src/renderer/components/slider/slider.scss
+++ b/src/renderer/components/slider/slider.scss
@@ -21,18 +21,18 @@
 
 .Slider {
   .track {
-    background: var(--lensBlue);
+    background: var(--blue);
   }
 
   .thumb {
-    background: var(--lensBlue);
+    background: var(--blue);
 
     &.activated, &.jumped, &.focused {
-      box-shadow: 0 0 0 $unit * 2 rgba(var(--lensBlue), 0.16)!important;
+      box-shadow: 0 0 0 #{$unit * 2} var(--blue) !important;
     }
 
     &:hover{
-      box-shadow: 0 0 0 $unit rgba(var(--lensBlue), 0.16);
+      box-shadow: 0 0 0 $unit var(--blue);
     }
   }
 }
\ No newline at end of file
diff --git a/src/renderer/themes/lens-dark.json b/src/renderer/themes/lens-dark.json
index 720eef4717..87d653f7fa 100644
--- a/src/renderer/themes/lens-dark.json
+++ b/src/renderer/themes/lens-dark.json
@@ -23,6 +23,7 @@
     "layoutBackground": "#2e3136",
     "layoutTabsBackground": "#252729",
     "layoutTabsActiveColor": "#ffffff",
+    "layoutTabsLineColor": "#87909c80",
     "sidebarBackground": "#36393e",
     "sidebarLogoBackground": "#414448",
     "sidebarActiveColor": "#ffffff",
@@ -126,6 +127,7 @@
     "radioActiveBackground": "#36393e",
     "menuActiveBackground": "#36393e",
     "menuSelectedOptionBgc": "#36393e",
+    "canvasBackground": "#24292e",
     "scrollBarColor": "#5f6064",
     "settingsBackground": "#262b2e",
     "settingsColor": "#909ba6",
diff --git a/src/renderer/themes/lens-light.json b/src/renderer/themes/lens-light.json
index 69fd21c74f..d872823b8e 100644
--- a/src/renderer/themes/lens-light.json
+++ b/src/renderer/themes/lens-light.json
@@ -127,8 +127,8 @@
     "radioActiveBackground": "#f1f1f1",
     "menuActiveBackground": "#e8e8e8",
     "menuSelectedOptionBgc": "#e8e8e8",
-    "scrollBarColor": "#bbbbbb",
     "canvasBackground": "#24292e",
+    "scrollBarColor": "#bbbbbb",
     "settingsBackground": "#ffffff",
     "settingsColor": "#555555",
     "navSelectedBackground": "#ffffff",
diff --git a/src/renderer/themes/theme-vars.css b/src/renderer/themes/theme-vars.css
index 9f14e14aea..e0a695b72d 100644
--- a/src/renderer/themes/theme-vars.css
+++ b/src/renderer/themes/theme-vars.css
@@ -23,6 +23,7 @@
 --layoutBackground: #2e3136;
 --layoutTabsBackground: #252729;
 --layoutTabsActiveColor: #ffffff;
+--layoutTabsLineColor: #87909c80;
 --sidebarBackground: #36393e;
 --sidebarLogoBackground: #414448;
 --sidebarActiveColor: #ffffff;
@@ -126,6 +127,7 @@
 --radioActiveBackground: #36393e;
 --menuActiveBackground: #36393e;
 --menuSelectedOptionBgc: #36393e;
+--canvasBackground: #24292e;
 --scrollBarColor: #5f6064;
 --settingsBackground: #262b2e;
 --settingsColor: #909ba6;