From c4845cd4543f09d3cde0e33c7008469dc8695a7a Mon Sep 17 00:00:00 2001
From: Philipp Schaffrath <philipp.schaffrath@gmail.com>
Date: Tue, 17 Nov 2020 21:47:24 +0100
Subject: [PATCH] cleaned up color palette, using color palette for code
 highlighting

---
 src/main/resources/themes/phocus.theme.json | 127 +++++-----
 src/main/resources/themes/phocus.xml        | 248 +++++++++++++++++++-
 2 files changed, 308 insertions(+), 67 deletions(-)

diff --git a/src/main/resources/themes/phocus.theme.json b/src/main/resources/themes/phocus.theme.json
index b6719b2..b18eb49 100644
--- a/src/main/resources/themes/phocus.theme.json
+++ b/src/main/resources/themes/phocus.theme.json
@@ -4,42 +4,48 @@
   "author": "phisch",
   "editorScheme": "/themes/phocus.xml",
   "colors": {
-    "background-1": "#0a0a0a",
-    "background-1-2": "#0f0f0f",
-    "background-2": "#141414",
-    "background-2-3": "#1a1a1a",
-    "background-3": "#1f1f1f",
-    "background-3-4": "#242424",
-    "background-4": "#292929",
-    "background-5": "#333333",
+    "transparent": "#00000000",
     "foreground": "#ffffffaa",
-    "foreground-fade": "#ffffff40",
-    "color-1": "#d96c6c",
-    "color-1-fade": "#d96c6c10",
-    "color-2": "#d99a6c",
-    "color-2-fade": "#d99a6c10",
-    "color-3": "#d9d06c",
-    "color-3-fade": "#d9d06c10",
-    "color-4": "#6cd96c",
-    "color-4-fade": "#6cd96c10",
-    "color-5": "#6cd0d9",
-    "color-5-fade": "#6cd0d910",
-    "color-6": "#6c6cd9",
-    "color-6-fade": "#6c6cd910",
-    "color-7": "#8b6cd9",
-    "color-7-fade": "#8b6cd910",
-    "color-8": "#d96cd9",
-    "color-8-fade": "#d96cd910",
+    "foreground-tint": "#ffffff40",
+    "background-1": "#080808",
+    "background-1-2": "#0d0d0d",
+    "background-2": "#121212",
+    "background-3": "#1c1c1c",
+    "background-4": "#262626",
+    "background-5": "#303030",
     "elevate-1": "#ffffff10",
     "elevate-2": "#ffffff20",
-    "transparent": "#00000000"
+    "red": "#e65c5c",
+    "orange": "#e6955c",
+    "yellow": "#e6da5c",
+    "green": "#5ce65c",
+    "cyan": "#5ce6e6",
+    "blue": "#5c8ae6",
+    "purple": "#835ce6",
+    "pink": "#e65ce6",
+    "red-tint": "#e65c5c10",
+    "orange-tint": "#e6955c10",
+    "yellow-tint": "#e6da5c10",
+    "green-tint": "#5ce65c10",
+    "cyan-tint": "#5ce6e610",
+    "blue-tint": "#5c8ae610",
+    "purple-tint": "#835ce610",
+    "pink-tint": "#e65ce610",
+    "red-faint": "#cc7a7a",
+    "orange-faint": "#cca37a",
+    "yellow-faint": "#ccc57a",
+    "green-faint": "#7acc7a",
+    "cyan-faint": "#7acccc",
+    "blue-faint": "#7a96cc",
+    "purple-faint": "#927acc",
+    "pink-faint": "#cc7acc"
   },
   "icons": {
     "ColorPalette": {
-      "Actions.Red": "#d96c6c",
-      "Actions.Yellow": "#d9d06c",
-      "Actions.Green": "#6cd96c",
-      "Actions.Blue": "#6cd0d9",
+      "Actions.Red": "#e65c5c",
+      "Actions.Yellow": "#e6da5c",
+      "Actions.Green": "#5ce65c",
+      "Actions.Blue": "#5ce6e6",
       "Actions.Grey": "#ffffff40",
       "Actions.GreyInline": "#ff0000",
       "Actions.GreyInline.Dark": "#ffffff50",
@@ -81,7 +87,7 @@
       "pressedBorderColor": "transparent"
     },
     "Borders": {
-      "color": "background-1-2",
+      "color": "background-3",
       "ContrastBorderColor": "background-4"
     },
     "Button": {
@@ -89,11 +95,11 @@
       "background": "transparent",
       "default": {
         "endBackground": "elevate-1",
-        "endBorderColor": "color-7",
-        "focusColor": "color-7",
-        "focusedBorderColor": "color-7",
+        "endBorderColor": "purple",
+        "focusColor": "purple",
+        "focusedBorderColor": "purple",
         "startBackground": "elevate-1",
-        "startBorderColor": "color-7"
+        "startBorderColor": "purple"
       },
       "endBackground": "elevate-1",
       "endBorderColor": "transparent",
@@ -102,15 +108,7 @@
       "startBorderColor": "transparent"
     },
     "CheckBox": {
-      "background": "transparent",
-      "foreground": "color-1",
-      "select": "color-1"
-    },
-    "CheckBoxMenuItem": {
-      "acceleratorForeground": "color-1"
-    },
-    "ComboBox": {
-      "modifiedItemForeground": "color-1"
+      "background": "transparent"
     },
     "ComboBoxButton": {
       "background": "elevate-1"
@@ -118,34 +116,34 @@
     "Component": {
       "arc": 4,
       "borderColor": "transparent",
-      "focusColor": "color-7",
+      "focusColor": "purple",
       "focusedBorderColor": "transparent",
       "focusWidth": 1
     },
     "EditorTabs": {
       "background": "background-3",
       "borderColor": "transparent",
-      "hoverBackground": "elevate-2",
+      "hoverBackground": "background-5",
       "inactiveUnderlineColor": "elevate-2",
-      "underlineColor": "color-7",
-      "underlinedTabBackground": "background-4",
+      "underlineColor": "purple",
+      "underlinedTabBackground": "background-5",
       "underlineHeight": 3,
       "height": 36
     },
     "FileColor": {
-      "Blue": "color-6-fade",
-      "Green": "color-4-fade",
-      "Orange": "color-2-fade",
-      "Rose": "color-1-fade",
-      "Violet": "color-7-fade",
-      "Yellow": "color-3-fade"
+      "Blue": "blue-tint",
+      "Green": "green-tint",
+      "Orange": "orange-tint",
+      "Rose": "red-tint",
+      "Violet": "purple-tint",
+      "Yellow": "yellow-tint"
     },
     "Link": {
-      "activeForeground": "color-4"
+      "activeForeground": "purple"
     },
     "List": {
-      "background": "background-4",
-      "dropLineColor": "color-4",
+      "background": "background-5",
+      "dropLineColor": "green",
       "selectionBackground": "elevate-2",
       "selectionInactiveBackground": "elevate-1"
     },
@@ -208,7 +206,7 @@
         "background": "background-3"
       },
       "Tab": {
-        "selectedBackground": "color-1"
+        "selectedBackground": "red"
       }
     },
     "Separator": {
@@ -221,7 +219,7 @@
       }
     },
     "TextArea": {
-      "selectionBackground": "color-7",
+      "selectionBackground": "purple",
       "selectionForeground": "foreground"
     },
     "TextField": {
@@ -233,8 +231,8 @@
       "selectionForeground": "#FFFFFF"
     },
     "ToggleButton": {
-      "borderColor": "color-1",
-      "background": "color-3"
+      "borderColor": "red",
+      "background": "yellow"
     },
     "ToolWindow": {
       "Button": {
@@ -251,7 +249,7 @@
       "HeaderTab": {
         "hoverBackground": "elevate-2",
         "inactiveUnderlineColor": "elevate-2",
-        "underlineColor": "color-7",
+        "underlineColor": "purple",
         "underlinedTabBackground": "background-4",
         "underlinedTabInactiveBackground": "background-4",
         "underlineHeight": 3
@@ -262,12 +260,15 @@
     },
     "Tree": {
       "background": "background-2",
-      "foreground": "foreground-fade",
+      "foreground": "foreground-tint",
       "hash": "background-3",
       "selectionBackground": "elevate-2",
       "selectionForeground": "foreground",
       "selectionInactiveBackground": "elevate-1",
       "height": 30
+    },
+    "SidePanel": {
+      "background": "background-2"
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/themes/phocus.xml b/src/main/resources/themes/phocus.xml
index ba9dbb1..9dfb65d 100644
--- a/src/main/resources/themes/phocus.xml
+++ b/src/main/resources/themes/phocus.xml
@@ -3,8 +3,9 @@
     <property name="originalScheme">phocus</property>
   </metaInfo>
   <colors>
-    <option name="CONSOLE_BACKGROUND_KEY" value="0a0a0a" />
-    <option name="GUTTER_BACKGROUND" value="0f0f0f" />
+    <option name="CONSOLE_BACKGROUND_KEY" value="80808" />
+    <option name="DOC_COMMENT_LINK" value="6cd0d9" />
+    <option name="GUTTER_BACKGROUND" value="d0d0d" />
     <option name="INDENT_GUIDE" value="1f1f1f" />
     <option name="LINE_NUMBERS_COLOR" value="4d4d4d" />
     <option name="RIGHT_MARGIN_COLOR" value="1f1f1f" />
@@ -13,13 +14,252 @@
     <option name="SELECTION_BACKGROUND" value="ffffff20" />
     <option name="TEARLINE_COLOR" value="1f1f1f" />
     <option name="VISUAL_INDENT_GUIDE" value="141414" />
-    <option name="CARET_ROW_COLOR" value="ffffff10" />
   </colors>
   <attributes>
+    <option name="CONSOLE_BLUE_BRIGHT_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="7a96cc" />
+      </value>
+    </option>
+    <option name="CONSOLE_BLUE_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="5c8ae6" />
+      </value>
+    </option>
+    <option name="CONSOLE_CYAN_BRIGHT_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="7acccc" />
+      </value>
+    </option>
+    <option name="CONSOLE_CYAN_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="5ce6e6" />
+      </value>
+    </option>
+    <option name="CONSOLE_GREEN_BRIGHT_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="7acc7a" />
+      </value>
+    </option>
+    <option name="CONSOLE_GREEN_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="5ce65c" />
+      </value>
+    </option>
+    <option name="CONSOLE_MAGENTA_BRIGHT_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="927acc" />
+      </value>
+    </option>
+    <option name="CONSOLE_MAGENTA_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="835ce6" />
+      </value>
+    </option>
+    <option name="CONSOLE_RED_BRIGHT_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="cc7a7a" />
+      </value>
+    </option>
+    <option name="CONSOLE_RED_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="e65c5c" />
+      </value>
+    </option>
+    <option name="CONSOLE_YELLOW_BRIGHT_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="ccc57a" />
+      </value>
+    </option>
+    <option name="CONSOLE_YELLOW_OUTPUT">
+      <value>
+        <option name="FOREGROUND" value="e6da5c" />
+      </value>
+    </option>
+    <option name="CUSTOM_KEYWORD1_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+      </value>
+    </option>
+    <option name="CUSTOM_KEYWORD2_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="cc7acc" />
+      </value>
+    </option>
+    <option name="CUSTOM_KEYWORD3_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="7acccc" />
+      </value>
+    </option>
+    <option name="CUSTOM_KEYWORD4_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="ccc57a" />
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="CUSTOM_STRING_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="7acc7a" />
+      </value>
+    </option>
+    <option name="CUSTOM_VALID_STRING_ESCAPE_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="7a96cc" />
+      </value>
+    </option>
+    <option name="DEFAULT_COMMA">
+      <value>
+        <option name="FOREGROUND" value="d99a6c" />
+      </value>
+    </option>
+    <option name="DEFAULT_CONSTANT">
+      <value>
+        <option name="FOREGROUND" value="927acc" />
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="DEFAULT_DOC_COMMENT">
+      <value>
+        <option name="FOREGROUND" value="7acc7a" />
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="DEFAULT_DOC_COMMENT_TAG">
+      <value>
+        <option name="FOREGROUND" value="7acc7a" />
+        <option name="FONT_TYPE" value="3" />
+        <option name="EFFECT_COLOR" value="629755" />
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="DEFAULT_DOC_COMMENT_TAG_VALUE">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+      </value>
+    </option>
+    <option name="DEFAULT_FUNCTION_DECLARATION">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+      </value>
+    </option>
+    <option name="DEFAULT_INSTANCE_FIELD">
+      <value>
+        <option name="FOREGROUND" value="927acc" />
+      </value>
+    </option>
+    <option name="DEFAULT_INVALID_STRING_ESCAPE">
+      <value>
+        <option name="FOREGROUND" value="7acc7a" />
+        <option name="EFFECT_COLOR" value="ff0000" />
+        <option name="EFFECT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="DEFAULT_KEYWORD">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+      </value>
+    </option>
+    <option name="DEFAULT_NUMBER">
+      <value>
+        <option name="FOREGROUND" value="6cd0d9" />
+      </value>
+    </option>
+    <option name="DEFAULT_SEMICOLON">
+      <value>
+        <option name="FOREGROUND" value="d99a6c" />
+      </value>
+    </option>
+    <option name="DEFAULT_STATIC_FIELD">
+      <value>
+        <option name="FOREGROUND" value="927acc" />
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="DEFAULT_STATIC_METHOD">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+        <option name="FONT_TYPE" value="2" />
+      </value>
+    </option>
+    <option name="DEFAULT_STRING">
+      <value>
+        <option name="FOREGROUND" value="7acc7a" />
+      </value>
+    </option>
+    <option name="DEFAULT_VALID_STRING_ESCAPE">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+      </value>
+    </option>
+    <option name="DELETED_TEXT_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="bbbbbb" />
+        <option name="BACKGROUND" value="e65c5c" />
+        <option name="EFFECT_COLOR" value="c3c3c3" />
+        <option name="EFFECT_TYPE" value="3" />
+      </value>
+    </option>
+    <option name="TEMPLATE_VARIABLE_ATTRIBUTES">
+      <value>
+        <option name="FOREGROUND" value="927acc" />
+      </value>
+    </option>
     <option name="TEXT">
       <value>
         <option name="FOREGROUND" value="eeffff" />
-        <option name="BACKGROUND" value="0a0a0a" />
+        <option name="BACKGROUND" value="80808" />
+      </value>
+    </option>
+    <option name="BASH.EXTERNAL_COMMAND">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+      </value>
+    </option>
+    <option name="CSS.IMPORTANT">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+        <option name="FONT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="JSP_DIRECTIVE_NAME">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+        <option name="FONT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="PROPERTIES.KEY">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+        <option name="EFFECT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="REGEXP.ESC_CHARACTER">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+        <option name="FONT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="REGEXP.META">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+        <option name="FONT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="REGEXP.QUOTE_CHARACTER">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+        <option name="FONT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="VELOCITY_KEYWORD">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
+        <option name="FONT_TYPE" value="1" />
+      </value>
+    </option>
+    <option name="XPATH.XPATH_NAME">
+      <value>
+        <option name="FOREGROUND" value="cca37a" />
       </value>
     </option>
   </attributes>