diff --git a/README.md b/README.md
index 8ce1f3b..fd547b0 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,11 @@
A dark and light Jetbrains theme ported from the Visual Studio Code [TokyoNight](https://github.com/enkia/tokyo-night-vscode-theme) theme.
+There are 2 variants here:
+
+- TokyoNight Dark
+- TokyoNight Storm
+
diff --git a/gradle.properties b/gradle.properties
index 9056470..e7ab428 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
pluginGroup = com.alex.tokyonight
pluginName = TokyoNight Theme
-pluginVersion = 0.0.3
+pluginVersion = 0.0.4
pluginSinceBuild = 203
pluginUntilBuild = 213.*
platformType = IC
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index d3feeb3..6c5df32 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -10,6 +10,7 @@
com.intellij.modules.platform
-
+
+
diff --git a/src/main/resources/themes/TokyoNight.theme.json b/src/main/resources/themes/TokyoNightDark.theme.json
similarity index 98%
rename from src/main/resources/themes/TokyoNight.theme.json
rename to src/main/resources/themes/TokyoNightDark.theme.json
index c46df41..dba95dc 100644
--- a/src/main/resources/themes/TokyoNight.theme.json
+++ b/src/main/resources/themes/TokyoNightDark.theme.json
@@ -1,8 +1,8 @@
{
- "name": "TokyoNight",
+ "name": "TokyoNight Dark",
"dark": true,
"author": "Alexander Adhyatma ",
- "editorScheme": "/themes/TokyoNight.xml",
+ "editorScheme": "/themes/TokyoNightDark.xml",
"colors": {
"bgDark": "#1f2335",
"bg": "#24283b",
@@ -40,6 +40,8 @@
"*": {
"arc": "7",
"background": "bgDark",
+ "foreground": "fgDark",
+ "caretForeground": "fgDark",
"selectionForeground": "fg",
"selectionInactiveForeground": "fg",
"selectionBackground": "hoverBackground",
diff --git a/src/main/resources/themes/TokyoNightDark.xml b/src/main/resources/themes/TokyoNightDark.xml
new file mode 100644
index 0000000..3cef829
--- /dev/null
+++ b/src/main/resources/themes/TokyoNightDark.xml
@@ -0,0 +1,1210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/themes/TokyoNightStorm.theme.json b/src/main/resources/themes/TokyoNightStorm.theme.json
new file mode 100644
index 0000000..f4e23ce
--- /dev/null
+++ b/src/main/resources/themes/TokyoNightStorm.theme.json
@@ -0,0 +1,394 @@
+{
+ "name": "TokyoNight Storm",
+ "dark": true,
+ "author": "Alexander Adhyatma ",
+ "editorScheme": "/themes/TokyoNightStorm.xml",
+ "colors": {
+ "bgDark": "#1f2335",
+ "bg": "#24283b",
+ "terminalBlack": "#414868",
+ "fg": "#c0caf5",
+ "fgDark": "#a9b1d6",
+ "fgGutter": "#3b4261",
+ "dark3": "#545c7e",
+ "comment": "#565f89",
+ "dark5": "#737aa2",
+ "blue0": "#3d59a1",
+ "blue": "#7aa2f7",
+ "cyan": "#7dcfff",
+ "blue1": "#2ac3de",
+ "blue2": "#0db9d7",
+ "blue5": "#89ddff",
+ "blue6": "#B4F9F8",
+ "blue7": "#394b70",
+ "magenta": "#bb9af7",
+ "magenta2": "#ff007c",
+ "purple": "#9d7cd8",
+ "orange": "#ff9e64",
+ "yellow": "#e0af68",
+ "green": "#9ece6a",
+ "green1": "#73daca",
+ "green2": "#41a6b5",
+ "teal": "#1abc9c",
+ "red": "#f7768e",
+ "red1": "#db4b4b",
+ "hoverBackground": "#292e42",
+ "selectionInactiveBackground": "#414868",
+ "separatorColor": "#545c7e"
+ },
+ "ui": {
+ "*": {
+ "arc": "7",
+ "background": "bg",
+ "foreground": "fg",
+ "caretForeground": "fg",
+ "selectionForeground": "fg",
+ "selectionInactiveForeground": "fg",
+ "selectionBackground": "hoverBackground",
+ "selectionInactiveBackground": "selectionInactiveBackground",
+ "inactiveBackground": "bg",
+ "disabledBackground": "bg",
+ "disabledBorderColor": "bg",
+ "disabledForeground": "comment",
+ "borderColor": "bgDark",
+ "separatorColor": "separatorColor"
+ },
+ "Borders": {
+ "color": "bgDark",
+ "ContrastBorderColor": "hoverBackground"
+ },
+ "ActionButton": {
+ "hoverBackground": "hoverBackground",
+ "hoverBorderColor": "hoverBackground",
+ "pressedBackground": "hoverBackground",
+ "pressedBorderColor": "hoverBackground"
+ },
+ "Bookmark": {
+ "iconBackground": "blue",
+ "Mnemonic": {
+ "iconForeground": "fg",
+ "iconBackground": "hoverBackground",
+ "iconBorderColor": "blue"
+ }
+ },
+ "BookmarkMnemonicAssigned": {
+ "foreground": "fg",
+ "background": "hoverBackground",
+ "borderColor": "magenta"
+ },
+ "BookmarkMnemonicAvailable": {
+ },
+ "BookmarkMnemonicCurrent": {
+ "foreground": "fg",
+ "background": "hoverBackground",
+ "borderColor": "blue0"
+ },
+ "Button": {
+ "foreground": "fg",
+ "startBorderColor": "hoverBackground",
+ "endBorderColor": "hoverBackground",
+ "startBackground": "hoverBackground",
+ "endBackground": "hoverBackground",
+ "focusedBorderColor": "blue0",
+ "disabledBorderColor": "bgDark",
+ "default": {
+ "foreground": "bg",
+ "startBackground": "blue",
+ "endBackground": "blue",
+ "startBorderColor": "blue0",
+ "endBorderColor": "blue0",
+ "focusColor": "fg",
+ "focusedBorderColor": "fg"
+ }
+ },
+ "Counter": {
+ "foreground": "bgDark",
+ "background": "blue0"
+ },
+ "ComboBox": {
+ "ArrowButton": {
+ "background": "hoverBackground",
+ "nonEditableBackground": "hoverBackground",
+ "disabledIconColor": "comment",
+ "iconColor": "blue"
+ },
+ "selectionBackground": "blue0",
+ "nonEditableBackground": "hoverBackground"
+ },
+ "CompletionPopup": {
+ "selectionBackground": "hoverBackground",
+ "selectionInactiveBackground": "selectionInactiveBackground",
+ "matchForeground": "green1"
+ },
+ "Component": {
+ "focusColor": "hoverBackground",
+ "borderColor": "bgDark",
+ "focusedBorderColor": "blue0",
+ "disabledBorderColor": "blue0",
+ "errorFocusColor": "red1",
+ "inactiveErrorFocusColor": "red1",
+ "warningFocusColor": "yellow",
+ "inactiveWarningFocusColor": "yellow"
+ },
+ "DragAndDrop": {
+ "borderColor": "blue0"
+ },
+ "DefaultTabs": {
+ "background": "bg",
+ "borderColor": "hoverBackground",
+ "hoverBackground": "hoverBackground",
+ "inactiveUnderlineColor": "comment",
+ "underlineColor": "blue"
+ },
+ "Editor": {
+ "background": "bgDark",
+ "shortcutForeground": "blue"
+ },
+ "EditorTabs": {
+ "background": "bgDark",
+ "underlinedTabBackground": "hoverBackground",
+ "underlineColor": "blue",
+ "underlineHeight": 1,
+ "hoverBackground": "hoverBackground",
+ "inactiveUnderlineColor": "blue"
+ },
+ "FileColor": {
+ "Blue": "#7AA2F71a",
+ "Green": "#9ece6e05",
+ "Orange": "#FF9E6405",
+ "Yellow": "#e0af6805",
+ "Rose": "#F7768E05",
+ "Violet": "#bb9af705"
+ },
+ "Link": {
+ "activeForeground": "blue",
+ "hoverForeground": "blue",
+ "visitedForeground": "magenta",
+ "pressedForeground": "magenta"
+ },
+ "Notification": {
+ "background": "hoverBackground",
+ "errorBorderColor": "red1",
+ "errorBackground": "bgDark",
+ "errorForeground": "fg",
+ "ToolWindow": {
+ "warningForeground": "fg",
+ "warningBackground": "bgDark",
+ "warningBorderColor": "orange",
+ "errorForeground": "fg",
+ "errorBorderColor": "red1",
+ "errorBackground": "bgDark",
+ "informativeForeground": "fg",
+ "informativeBackground": "bgDark",
+ "informativeBorderColor": "magenta"
+ }
+ },
+ "PasswordField": {
+ "background": "hoverBackground"
+ },
+ "Plugins": {
+ "SearchField": {
+ "background": "hoverBackground"
+ },
+ "SectionHeader": {
+ "foreground": "fg"
+ },
+ "hoverBackground": "hoverBackground",
+ "lightSelectionBackground": "hoverBackground",
+ "Button": {
+ "installBorderColor": "magenta",
+ "installForeground": "magenta",
+ "installBackground": "bgDark",
+ "installFillForeground": "bgDark",
+ "installFillBackground": "magenta",
+ "installFocusedBackground": "bgDark",
+ "updateBorderColor": "blue",
+ "updateForeground": "fg",
+ "updateBackground": "blue"
+ },
+ "Tab": {
+ "selectedBackground": "hoverBackground",
+ "selectedForeground": "fg",
+ "hoverBackground": "hoverBackground"
+ }
+ },
+ "ProgressBar": {
+ "failedEndColor": "red",
+ "failedColor": "red1",
+ "trackColor": "selectionBackground",
+ "progressColor": "blue",
+ "indeterminateStartColor": "blue",
+ "indeterminateEndColor": "magenta",
+ "passedEndColor": "green1",
+ "passedColor": "green"
+ },
+ "Popup": {
+ "Header": {
+ "activeBackground": "hoverBackground",
+ "inactiveBackground": "hoverBackground"
+ }
+ },
+ "RadioButtonMenuItem": {
+ "selectionBackground": "hoverBackground"
+ },
+ "ScrollBar": {
+ "Mac": {
+ "hoverThumbColor": "hoverBackground",
+ "Transparent": {
+ "hoverThumbColor": "hoverBackground"
+ }
+ }
+ },
+ "SearchEverywhere": {
+ "Advertiser.foreground": "fg",
+ "SearchField": {
+ "background": "hoverBackground"
+ },
+ "Tab": {
+ "selectedBackground": "hoverBackground",
+ "selectedForeground": "fg"
+ }
+ },
+ "SearchMatch": {
+ "startBackground": "blue0",
+ "endBackground": "blue0"
+ },
+ "Separator": {
+ "separatorColor": "separatorColor"
+ },
+ "SidePanel": {
+ "background": "bg"
+ },
+ "StatusBar": {
+ "borderColor": "bg",
+ "hoverBackground": "hoverBackground"
+ },
+ "TabbedPane": {
+ "tabSelectionHeight": 1,
+ "focusColor": "hoverBackground",
+ "hoverColor": "hoverBackground",
+ "underlineColor": "blue",
+ "contentAreaColor": "bgDark"
+ },
+ "Table": {
+ "gridColor": "hoverBackground",
+ "hoverBackground": "hoverBackground"
+ },
+ "TableHeader": {
+ "bottomSeparatorColor": "fgGutter"
+ },
+ "TextField": {
+ "background": "hoverBackground"
+ },
+ "TextArea": {
+ "background": "bgDark"
+ },
+ "ToggleButton": {
+ "onBackground": "green",
+ "onForeground": "hoverBackground",
+ "offBackground": "hoverBackground",
+ "offForeground": "hoverBackground",
+ "buttonColor": "fg"
+ },
+ "ToolBar": {
+ "background": "bgDark",
+ "borderHandleColor": "magenta"
+ },
+ "ToolWindow": {
+ "Button": {
+ "hoverBackground": "hoverBackground"
+ },
+ "Header": {
+ "background": "bgDark",
+ "inactiveBackground": "bgDark",
+ "borderColor": "hoverBackground"
+ },
+ "HeaderTab": {
+ "underlineColor": "magenta2",
+ "inactiveUnderlineColor": "fgDark",
+ "underlineHeight": 1,
+ "underlinedTabBackground": "dark3",
+ "selectedInactiveBackground": "dark5",
+ "hoverBackground": "hoverBackground"
+ }
+ },
+ "Tree": {
+ "background": "bgDark",
+ "modifiedItemForeground": "blue",
+ "hoverBackground": "hoverBackground",
+ "selectionBackground": "blue0",
+ "selectionInactiveBackground": "selectionInactiveBackground"
+ },
+ "ValidationTooltip": {
+ "errorBackground": "bgDark",
+ "errorBorderColor": "red1",
+ "warningBackground": "bgDark",
+ "warningBorderColor": "orange"
+ },
+ "VersionControl": {
+ "FileHistory": {
+ "Commit": {
+ "selectedBranchBackground": "hoverBackground"
+ }
+ },
+ "GitLog": {
+ "headIconColor": "yellow",
+ "localBranchIconColor": "green",
+ "remoteBranchIconColor": "magenta",
+ "tagIconColor": "blue",
+ "otherIconColor": "green"
+ },
+ "Log": {
+ "Commit": {
+ "hoveredBackground": "hoverBackground",
+ "currentBranchBackground": "hoverBackground"
+ }
+ },
+ "RefLabel": {
+ "foreground": "fg"
+ }
+ },
+ "WelcomeScreen": {
+ "SidePanel": {
+ "background": "bg"
+ },
+ "separatorColor": "fgGutter",
+ "Projects": {
+ "background": "bg",
+ "selectionBackground": "hoverBackground",
+ "selectionInactiveBackground": "hoverBackground",
+ "actions": {
+ "background": "hoverBackground"
+ }
+ }
+ }
+ },
+ "icons": {
+ "ColorPalette": {
+ "Actions.Blue": "#7AA2F7",
+ "Actions.Green": "#9ECE6A",
+ "Actions.Orange": "#FF9E64",
+ "Actions.Purple": "#9D7CD8",
+ "Actions.Red": "#F7768E",
+ "Actions.Yellow": "#E0AF68",
+ "Actions.Gray": "comment",
+ "Actions.White": "#C0CAF5",
+ "Actions.Black": "#24283B",
+ "Actions.Grey": "#414868",
+ "Actions.GreyInline.Dark": "#565F89",
+ "Actions.GreyInline": "#565F89",
+ "Objects.Blue": "#7AA2F7",
+ "Objects.Green": "#9ECE6A",
+ "Objects.GreenAndroid": "#9ECE6A",
+ "Objects.Grey": "#414868",
+ "Objects.Pink": "#BB9AF7",
+ "Objects.Purple": "#9D7CD8",
+ "Objects.Red": "#F7768E",
+ "Objects.RedStatus": "#F7768E",
+ "Objects.Yellow": "#E0AF68",
+ "Objects.YellowDark": "#E0AF68",
+ "Objects.BlackText": "#565F89",
+ "Tree.iconColor": "#7aa2f7"
+ }
+ }
+}
diff --git a/src/main/resources/themes/TokyoNight.xml b/src/main/resources/themes/TokyoNightStorm.xml
similarity index 97%
rename from src/main/resources/themes/TokyoNight.xml
rename to src/main/resources/themes/TokyoNightStorm.xml
index b48d785..206f78b 100644
--- a/src/main/resources/themes/TokyoNight.xml
+++ b/src/main/resources/themes/TokyoNightStorm.xml
@@ -1,4 +1,4 @@
-
+
@@ -6,10 +6,10 @@
-
+
-
+
@@ -22,16 +22,16 @@
-
-
-
+
+
+
-
+
@@ -1039,13 +1039,24 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+