From 341b76308856a3c413a7fed7d4ec7991e9c26fd8 Mon Sep 17 00:00:00 2001
From: Ayush Jain <aayushhjain23@gmail.com>
Date: Mon, 18 May 2020 16:00:29 +0530
Subject: [PATCH] Desktop: Resolves #2883: Themes switched for more appealing
 text highlighting (#3192)

* conflicts fixed and changes made to aceEditor.tsx

* theme imported

* theme imported
---
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.tsx | 2 ++
 ElectronClient/gui/style/theme/nord.js                         | 2 +-
 ElectronClient/gui/style/theme/solarizedDark.js                | 2 +-
 ElectronClient/gui/style/theme/solarizedLight.js               | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.tsx b/ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.tsx
index 5275d97b7e..1df8a49526 100644
--- a/ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.tsx
+++ b/ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.tsx
@@ -34,8 +34,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/theme/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 23a6d729fa..2189bfb13f 100644
--- a/ElectronClient/gui/style/theme/nord.js
+++ b/ElectronClient/gui/style/theme/nord.js
@@ -79,7 +79,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 2d839df372..afe7106cf8 100644
--- a/ElectronClient/gui/style/theme/solarizedDark.js
+++ b/ElectronClient/gui/style/theme/solarizedDark.js
@@ -33,7 +33,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',
 };