diff --git a/src/common/user-store.ts b/src/common/user-store.ts
index 0bb953b153..b03616c1d2 100644
--- a/src/common/user-store.ts
+++ b/src/common/user-store.ts
@@ -31,7 +31,7 @@ export interface UserPreferences {
 }
 
 export class UserStore extends BaseStore<UserStoreModel> {
-  static readonly defaultTheme: ThemeId = "kontena-dark"
+  static readonly defaultTheme: ThemeId = "lens-dark"
 
   private constructor() {
     super({
diff --git a/src/renderer/components/dock/terminal.ts b/src/renderer/components/dock/terminal.ts
index e508cc22b2..ea17554a31 100644
--- a/src/renderer/components/dock/terminal.ts
+++ b/src/renderer/components/dock/terminal.ts
@@ -178,7 +178,6 @@ export class Terminal {
         break;
 
       // Ctrl+W: prevent unexpected terminal tab closing, e.g. editing file in vim
-      // https://github.com/kontena/lens-app/issues/156#issuecomment-534906480
       case "KeyW":
         evt.preventDefault();
         break;
diff --git a/src/renderer/theme.store.ts b/src/renderer/theme.store.ts
index 539be6651d..e96bc1f873 100644
--- a/src/renderer/theme.store.ts
+++ b/src/renderer/theme.store.ts
@@ -25,8 +25,8 @@ export class ThemeStore {
 
   // bundled themes from `themes/${themeId}.json`
   @observable themes: Theme[] = [
-    { id: "kontena-dark", type: ThemeType.DARK },
-    { id: "kontena-light", type: ThemeType.LIGHT },
+    { id: "lens-dark", type: ThemeType.DARK },
+    { id: "lens-light", type: ThemeType.LIGHT },
   ];
 
   @computed get activeThemeId() {
diff --git a/src/renderer/themes/kontena-dark.json b/src/renderer/themes/lens-dark.json
similarity index 100%
rename from src/renderer/themes/kontena-dark.json
rename to src/renderer/themes/lens-dark.json
diff --git a/src/renderer/themes/kontena-light.json b/src/renderer/themes/lens-light.json
similarity index 100%
rename from src/renderer/themes/kontena-light.json
rename to src/renderer/themes/lens-light.json