diff --git a/definitions/index.d.ts b/definitions/index.d.ts
index 3fd6c1adca..66c9a6aea0 100644
--- a/definitions/index.d.ts
+++ b/definitions/index.d.ts
@@ -4,7 +4,7 @@
 declare type Environment = "production" | "development" | "test";
 declare const ELECTRON_ENV: "renderer" | "main";
 
-// Gloval variables set by webpack
+// Global variables set by webpack
 declare const ENV: Environment;
 
 
diff --git a/src/@batch-flask/ui/form/form-field/form-field.scss b/src/@batch-flask/ui/form/form-field/form-field.scss
index 0b5f3d6477..6ec5bd3890 100644
--- a/src/@batch-flask/ui/form/form-field/form-field.scss
+++ b/src/@batch-flask/ui/form/form-field/form-field.scss
@@ -8,7 +8,7 @@ bl-form-field {
         sup.required {
             line-height: 1em;
             .fa-asterisk {
-                color: var(--color-danger);
+                color: $danger-color;
                 font-size: 8px;
             }
         }
diff --git a/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.scss b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.scss
index aa6a166f61..4182314a40 100644
--- a/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.scss
+++ b/src/app/components/account/details/programmatic-usage/programming-sample/programming-sample.scss
@@ -16,6 +16,6 @@ bl-programming-sample {
     }
 
     bl-tp-cell {
-        border: 1px solid var(--color-input-border);
+        border: 1px solid $input-border-color;
     }
 }
diff --git a/src/app/components/layout/main-navigation/profile-button/profile-button.component.spec.ts b/src/app/components/layout/main-navigation/profile-button/profile-button.component.spec.ts
index ae5b289e50..0fe2dc791f 100644
--- a/src/app/components/layout/main-navigation/profile-button/profile-button.component.spec.ts
+++ b/src/app/components/layout/main-navigation/profile-button/profile-button.component.spec.ts
@@ -130,7 +130,7 @@ describe("ProfileButtonComponent", () => {
         fixture.detectChanges();
         expect(contextMenuServiceSpy.openMenu).toHaveBeenCalledOnce();
         const items = contextMenuServiceSpy.lastMenu.items;
-        expect(items.length).toBe(14);
+        expect(items.length).toBe(13);
     });
 
     describe("Clicking on the profile", () => {
@@ -138,7 +138,7 @@ describe("ProfileButtonComponent", () => {
             click(clickableEl);
             expect(contextMenuServiceSpy.openMenu).toHaveBeenCalled();
             const items = contextMenuServiceSpy.lastMenu.items;
-            expect(items.length).toEqual(14);
+            expect(items.length).toEqual(13);
 
             let i = 0;
             const expectMenuItem= (menuItemType, label?) => {
@@ -155,13 +155,12 @@ describe("ProfileButtonComponent", () => {
             expectMenuItem(ContextMenuItem, "profile-button.authentication");
             expectMenuItem(ContextMenuItem, "profile-button.keybindings");
             expectMenuItem(MultiContextMenuItem, "Language (Preview)");
+            expectMenuItem(MultiContextMenuItem, "Developer");
             expectMenuItem(ContextMenuItem, "profile-button.thirdPartyNotices");
             expectMenuItem(ContextMenuItem, "profile-button.viewLogs");
             expectMenuItem(ContextMenuItem, "profile-button.report");
             expectMenuItem(ContextMenuItem, "profile-button.about");
             expectMenuItem(ContextMenuSeparator);
-            expectMenuItem(ContextMenuItem, "profile-button.viewTheme");
-            expectMenuItem(ContextMenuSeparator);
             expectMenuItem(ContextMenuItem, "profile-button.logout");
         });
 
diff --git a/src/app/components/layout/main-navigation/profile-button/profile-button.component.ts b/src/app/components/layout/main-navigation/profile-button/profile-button.component.ts
index 4bdfe1c6b8..240d2c5bd4 100644
--- a/src/app/components/layout/main-navigation/profile-button/profile-button.component.ts
+++ b/src/app/components/layout/main-navigation/profile-button/profile-button.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, NgZone, OnDestroy, OnInit } from "@angular/core";
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, isDevMode, NgZone, OnDestroy, OnInit } from "@angular/core";
 import { Router } from "@angular/router";
 import { I18nService, Locale, LocaleService, TranslatedLocales } from "@batch-flask/core";
 import {
@@ -112,14 +112,19 @@ export class ProfileButtonComponent implements OnDestroy, OnInit {
             new ContextMenuItem({ label: this.i18n.t("profile-button.report"), click: () => this._openGithubIssues() }),
             new ContextMenuItem({ label: this.i18n.t("profile-button.about"), click: () => this._showAboutPage() }),
             new ContextMenuSeparator(),
-            new ContextMenuItem({
-                label: this.i18n.t("profile-button.viewTheme"),
-                click: () => this._gotoThemeColors(),
-            }),
-            new ContextMenuSeparator(),
             new ContextMenuItem({ label: this.i18n.t("profile-button.logout"), click: () => this._logout() }),
         ];
 
+        if (isDevMode()) {
+            const devMenuItem = new MultiContextMenuItem({
+                label: "Developer",
+                subitems: [
+                    new ContextMenuItem({ label: this.i18n.t("profile-button.viewTheme"), click: () => this._gotoThemeColors() })
+                ],
+            });
+            items.splice(5, 0, devMenuItem);
+        }
+
         items.unshift(this._getAutoUpdateMenuItem());
         this.contextMenuService.openMenu(new ContextMenu(items));
     }
diff --git a/src/app/components/pool/action/scale/autoscale-formula-picker/autoscale-formula-picker.scss b/src/app/components/pool/action/scale/autoscale-formula-picker/autoscale-formula-picker.scss
index d4ac258cfc..659866b314 100644
--- a/src/app/components/pool/action/scale/autoscale-formula-picker/autoscale-formula-picker.scss
+++ b/src/app/components/pool/action/scale/autoscale-formula-picker/autoscale-formula-picker.scss
@@ -25,8 +25,8 @@
     .formula-list {
         height: 100%;
         overflow: auto;
-        border-top: 1px solid #d5d5d5;
-        border-bottom: 1px solid #d5d5d5;
+        border-top: 1px solid $input-disabled-border-color;
+        border-bottom: 1px solid $input-disabled-border-color;
 
         > .formula {
             display: flex;
@@ -41,7 +41,7 @@
             }
 
             &:not(:last-child) {
-                border-bottom: 1px solid #d5d5d5;
+                border-bottom: 1px solid $input-disabled-border-color;
             }
 
             &:hover {
diff --git a/src/app/components/tenant-picker/tenant-card.scss b/src/app/components/tenant-picker/tenant-card.scss
index d658afa438..9d669dc0fe 100644
--- a/src/app/components/tenant-picker/tenant-card.scss
+++ b/src/app/components/tenant-picker/tenant-card.scss
@@ -33,7 +33,7 @@ be-tenant-card {
         }
 
         background: $card-background;
-        border: 1px solid #ccc;
+        border: 1px solid $border-color;
         border-radius: $tenant-card-padding;
 
         &.home-tenant, &.home-tenant .main-tile {
diff --git a/src/app/styles/base/forms.scss b/src/app/styles/base/forms.scss
index e1a83fe381..60589df113 100644
--- a/src/app/styles/base/forms.scss
+++ b/src/app/styles/base/forms.scss
@@ -70,7 +70,7 @@ fieldset {
     display: flex;
     flex-flow: row nowrap;
     padding: 0;
-    border: 1px solid #aaa;
+    border: 1px solid $border-color;
     background-color: $main-background;
     margin-top: 16px;