diff --git a/src/app/ui/theme-draft.js b/src/app/ui/theme-draft.js
index e773ce6ee2..f90bdcf470 100644
--- a/src/app/ui/theme-draft.js
+++ b/src/app/ui/theme-draft.js
@@ -2,6 +2,9 @@
 
 // REMIX
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Update theme-draft.js
 var remixGeneral = {
   general_BackgroundColor: {
     'background-color': ''
@@ -52,6 +55,7 @@ var remixGeneral = {
       'color': ''
     }
   }
+<<<<<<< HEAD
 =======
 var remix = {
   'background-color': '',
@@ -59,31 +63,42 @@ var remix = {
   'font-size': '',
   'color': ''
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+>>>>>>> Update theme-draft.js
 }
 
 // LEFT PANEL
 var filePanel = {
+<<<<<<< HEAD
 <<<<<<< HEAD
   icons: {   // icons
 =======
   icons: {
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+  icons: {   // icons
+>>>>>>> Update theme-draft.js
     'color': '',
     ':hover': {
       'color': ''
     }
   },
+<<<<<<< HEAD
 <<<<<<< HEAD
   togglePannel: {   // icons
 =======
   toggle: {
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+  togglePannel: {   // icons
+>>>>>>> Update theme-draft.js
     'color': '',
     ':hover': {
       'color': ''
     }
   },
   treeview: {
+<<<<<<< HEAD
 <<<<<<< HEAD
     'color': '',   // already defined in Remix general
     highlightedLine: {
@@ -93,12 +108,18 @@ var filePanel = {
     highlightedLine: {
       'background-color': ''
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+    'color': '',   // already defined in Remix general
+    highlightedLine: {
+      'background-color': ''  // highlight_BackgroundColor
+>>>>>>> Update theme-draft.js
     }
   }
 }
 
 // EDITOR
 var editor = {
+<<<<<<< HEAD
 <<<<<<< HEAD
   'background-color': '',  // general_BackgroundColor
   'color': '',  // fonts/color
@@ -116,18 +137,29 @@ var editor = {
 =======
   'background-color': '',
   'color': '',
+=======
+  'background-color': '',  // general_BackgroundColor
+  'color': '',  // fonts/color
+>>>>>>> Update theme-draft.js
   gutter: {
-    'background-color': '',
+    'background-color': '',  // highlight_BackgroundColor
     highlightedNumber: {
-      'background-color': ''
+      'background-color': ''  // highlight_BackgroundColor
     },
   },
   navTabs: {
+<<<<<<< HEAD
     'background-color': '',
     'color': ''
   }
   icons: {
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+    'background-color': '',  // highlight_BackgroundColor
+    'color': ''  // fonts/color
+  },
+  icons: {  // icons
+>>>>>>> Update theme-draft.js
     'color': '',
     ':hover': {
       'color': ''
@@ -136,6 +168,7 @@ var editor = {
   code: {
     // types, comments, parameters...
     highlightedLine: {
+<<<<<<< HEAD
 <<<<<<< HEAD
       'background-color': ''   //highlight_BackgroundColor
     },
@@ -147,20 +180,27 @@ var editor = {
   }
 =======
       'background-color': ''
+=======
+      'background-color': ''   //highlight_BackgroundColor
+>>>>>>> Update theme-draft.js
     },
     debuggerMode: {
       highlightedArea: {
-        'background-color': ''
-      },
+        'background-color': ''   // same as Debug button in Terminal window
+      }
     }
   }
+<<<<<<< HEAD
 
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+>>>>>>> Update theme-draft.js
 }
 
 // TERMINAL
 var terminal = {
   menu: {
+<<<<<<< HEAD
 <<<<<<< HEAD
     'background-color': '', // highlight_BackgroundColor
     'color': '',  // fonts/color
@@ -170,11 +210,17 @@ var terminal = {
     'color': '',
     icon: {
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+    'background-color': '', // highlight_BackgroundColor
+    'color': '',  // fonts/color
+    icons: {  // icons
+>>>>>>> Update theme-draft.js
       'color': '',
       ':hover': {
         'color': ''
       }
     },
+<<<<<<< HEAD
 <<<<<<< HEAD
     dropdown: {  // dropdown
       'background-color': '',
@@ -187,6 +233,13 @@ var terminal = {
     },
     toggle: {
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+    dropdown: {  // dropdown
+      'background-color': '',
+      'color': ''
+    },
+    togglePannel: {   // icons
+>>>>>>> Update theme-draft.js
       'color': '',
       ':hover': {
         'color': ''
@@ -195,14 +248,19 @@ var terminal = {
   },
   terminalWindow: {
     'background-color': '',
+<<<<<<< HEAD
 <<<<<<< HEAD
     'color': '',
 =======
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+    'color': '',
+>>>>>>> Update theme-draft.js
     logo: {
       'url': '',
     },
     infoLog: {
+<<<<<<< HEAD
 <<<<<<< HEAD
       'color': ''  // fonts/color
     },
@@ -214,6 +272,12 @@ var terminal = {
     errorLog: {
       'color': ''
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+      'color': ''  // fonts/color
+    },
+    errorLog: {
+      'color': ''  // same as border in errorMessage in rightPanel/compileTab  @TODO
+>>>>>>> Update theme-draft.js
     },
     transactionLog: {
       title: {
@@ -225,6 +289,7 @@ var terminal = {
       detailsButton: {
         'background-color': '',
         'color': ''
+<<<<<<< HEAD
 <<<<<<< HEAD
       },
       debugButton: {
@@ -234,6 +299,11 @@ var terminal = {
       debugButton: {
         'background-color': '',
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+      },
+      debugButton: {
+        'background-color': '',  // same as highlightedArea in editor/debuggerMode
+>>>>>>> Update theme-draft.js
         'color': ''
       }
     }
@@ -243,6 +313,9 @@ var terminal = {
 // RIGHT PANEL
 var rightPanel = {
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Update theme-draft.js
   'background-color': '',  // already defined in Remix general
   'color': '', // already defined in Remix general
   textBox: {        // already defined in Remix general
@@ -256,15 +329,21 @@ var rightPanel = {
     'color': ''
   },
   togglePannel: {   // icons
+<<<<<<< HEAD
 =======
   toggle: {
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+>>>>>>> Update theme-draft.js
     'color': '',
     ':hover': {
       'color': ''
     }
   },
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Update theme-draft.js
   logo: {
     'url': ''
   },
@@ -421,6 +500,7 @@ var rightPanel = {
       'color': ''
     }
   }
+<<<<<<< HEAD
 }
 
 /* @TODO
@@ -452,3 +532,33 @@ TERMINAL:
 =======
 }
 >>>>>>> Remove styles.css and start theme-draft.js
+=======
+}
+
+/* @TODO
+
+ALL:
+- text: mainText or supportText
+- unify color and hover for all icons (files panel, debuger, toggle etc.) => maybe add to styleguide
+
+COMPILE TAB:
+- details => copyToClipboard (same color and hover as other icons)
+
+RUN TAB:
+- unify copyToClipboard color and hover
+
+DEBUGGER TAB:
+- apply ${styles.button} + the rest (copy styling from below) to `eye button`
+  ${styles.button}
+  margin: 3px;
+  float: right;
+
+- Put whole debugger in textBox => then we get blue background like on other tabs + we have white background in the textBox so we can make highlighted color same as everywhere else
+- apply ${styles.dropdown} to Debugger
+
+TERMINAL:
+- apply ${styles.dropdown} + other fixes (already made in one PR - where is it?) to dropdown
+
+
+*/
+>>>>>>> Update theme-draft.js