rebase to master + resolve some conflicts

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

dashboard/client/themes/kontena-dark.json

@@ -1,7 +1,7 @@
 {
-  "name": "Kontena Dark",
+  "name": "Lens Dark Theme",
   "type": "dark",
-  "author": "Kontena, Inc.",
+  "author": "Lakend Labs",
   "colors": {
     "blue": "#3d90ce",
     "magenta": "#c93dce",

dashboard/client/themes/kontena-light.json

@@ -1,7 +1,7 @@
 {
-  "name": "Kontena Light",
+  "name": "Lens Light Theme",
   "type": "light",
-  "author": "Kontena, Inc.",
+  "author": "Lakend Labs",
   "colors": {
     "blue": "#3d90ce",
     "magenta": "#c93dce",

dashboard/client/themes/theme-vars.scss

@@ -1,6 +1,6 @@
 // Base colors
-$kontenaBlue: var(--blue);
-$kontenaMagenta: var(--magenta);
+$lensBlue: var(--blue);
+$lensMagenta: var(--magenta);
 $golden: var(--golden);
 $halfGray: var(--halfGray);
 $primary: var(--primary);