diff --git a/ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.tsx b/ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.tsx
index b48ebcaf64..ba70086a03 100644
--- a/ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.tsx
+++ b/ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.tsx
@@ -37,8 +37,10 @@ require('brace/theme/solarized_dark');
 require('brace/theme/twilight');
 require('brace/theme/dracula');
 require('brace/theme/chaos');
+require('brace/theme/tomorrow');
 require('brace/keybinding/vim');
 require('brace/keybinding/emacs');
+require('brace/keybinding/terminal');
 
 // TODO: Could not get below code to work
 
diff --git a/ElectronClient/gui/style/theme/nord.js b/ElectronClient/gui/style/theme/nord.js
index e3137383e2..fa385fbffd 100644
--- a/ElectronClient/gui/style/theme/nord.js
+++ b/ElectronClient/gui/style/theme/nord.js
@@ -77,7 +77,7 @@ const nordStyle = {
 	htmlCodeBorderColor: nord[2],
 	htmlCodeColor: nord[13],
 
-	editorTheme: 'chaos',
+	editorTheme: 'terminal',
 	codeThemeCss: 'atom-one-dark-reasonable.css',
 };
 
diff --git a/ElectronClient/gui/style/theme/solarizedDark.js b/ElectronClient/gui/style/theme/solarizedDark.js
index a0f818edcf..34dec6645a 100644
--- a/ElectronClient/gui/style/theme/solarizedDark.js
+++ b/ElectronClient/gui/style/theme/solarizedDark.js
@@ -31,7 +31,7 @@ const solarizedDarkStyle = {
 	htmlCodeBorderColor: '#696969',
 	htmlCodeColor: '#fdf6e3',
 
-	editorTheme: 'solarized_dark',
+	editorTheme: 'twilight',
 	codeThemeCss: 'atom-one-dark-reasonable.css',
 };
 
diff --git a/ElectronClient/gui/style/theme/solarizedLight.js b/ElectronClient/gui/style/theme/solarizedLight.js
index 64e1aa95ca..042ad3b052 100644
--- a/ElectronClient/gui/style/theme/solarizedLight.js
+++ b/ElectronClient/gui/style/theme/solarizedLight.js
@@ -31,7 +31,7 @@ const solarizedLightStyle = {
 	htmlCodeBorderColor: '#eee8d5',
 	htmlCodeColor: '#002b36',
 
-	editorTheme: 'solarized_light',
+	editorTheme: 'tomorrow',
 	codeThemeCss: 'atom-one-light.css',
 };