diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/README.md b/README.md
index 9cf4257..2c2a0ca 100644
--- a/README.md
+++ b/README.md
@@ -66,3 +66,18 @@ Open `Preference` -> `Appearance`, choose the json file you just created in `The
 [Catpuccin Macchiato](./themes/Catpuccin_Macchiato.json) from [@eljoth](https://github.com/eljoth) based on the [Catpuccin Macchiato palette](https://github.com/catppuccin/catppuccin).
 
 ![Catpuccin Macchiato](screenshots/CatpuccinMacchiato.png)
+
+[One Dark](https://github.com/one-dark)
+
+![OneDark](screenshots/OneDark.png)
+
+[TokyoNight](https://github.com/one-dark) from [tokyo-night-vscode-theme](https://github.com/tokyo-night/tokyo-night-vscode-theme)
+
+TokyoNight
+![TokyoNight](screenshots/TokyoNight.png)
+
+TokyoNight Storm
+![TokyoNight Storm](screenshots/TokyoNight_storm.png)
+
+TokyoNight Light
+![TokyoNight_Light](screenshots/TokyoNight_light.png)
diff --git a/screenshots/OneDark.png b/screenshots/OneDark.png
new file mode 100644
index 0000000..ee07708
Binary files /dev/null and b/screenshots/OneDark.png differ
diff --git a/screenshots/TokyoNight.png b/screenshots/TokyoNight.png
new file mode 100644
index 0000000..d0249e4
Binary files /dev/null and b/screenshots/TokyoNight.png differ
diff --git a/screenshots/TokyoNight_light.png b/screenshots/TokyoNight_light.png
new file mode 100644
index 0000000..a6706df
Binary files /dev/null and b/screenshots/TokyoNight_light.png differ
diff --git a/screenshots/TokyoNight_storm.png b/screenshots/TokyoNight_storm.png
new file mode 100644
index 0000000..a099336
Binary files /dev/null and b/screenshots/TokyoNight_storm.png differ
diff --git a/themes/OneDark.json b/themes/OneDark.json
new file mode 100644
index 0000000..06fe4b6
--- /dev/null
+++ b/themes/OneDark.json
@@ -0,0 +1,50 @@
+{
+  "BasicColors": {
+    "Window": "#282c34",
+    "WindowBorder": "#181a1f",
+    "TitleBar": "#282c34",
+    "ToolBar": "#282c34",
+    "Popup": "#282c34",
+    "Contents": "#282c34",
+
+    "Badge": "#e06c75",
+    "BadgeFG": "#282c34",
+    "Conflict": "#e06c75",
+    "ConflictForeground": "#282c34",
+
+    "Border0": "#181a1f",
+    "Border1": "#3e4451",
+    "Border2": "#4b5263",
+
+    "FlatButton.Background": "#2c313c",
+    "FlatButton.BackgroundHovered": "#3e4451",
+
+    "FG1": "#abb2bf",
+    "FG2": "#5c6370",
+
+    "Diff.EmptyBG": "#282c34",
+
+    "Diff.AddedBG": "#2d4a2e",
+    "Diff.AddedHighlight": "#355e36",
+
+    "Diff.DeletedBG": "#4a2d2d",
+    "Diff.DeletedHighlight": "#5e3535",
+
+    "SystemAccentColor": "#61afef",
+    "Link": "#61afef"
+  },
+
+  "GraphPenThickness": 2,
+  "OpacityForNotMergedCommits": 0.5,
+
+  "GraphColors": [
+    "#c678dd",
+    "#e06c75",
+    "#d19a66",
+    "#e5c07b",
+    "#98c379",
+    "#56b6c2",
+    "#61afef",
+    "#abb2bf"
+  ]
+}
diff --git a/themes/TokyoNight.json b/themes/TokyoNight.json
new file mode 100644
index 0000000..987b823
--- /dev/null
+++ b/themes/TokyoNight.json
@@ -0,0 +1,50 @@
+{
+  "BasicColors": {
+    "Window": "#1a1b26",
+    "WindowBorder": "#292e42",
+    "TitleBar": "#1a1b26",
+    "ToolBar": "#1a1b26",
+    "Popup": "#1a1b26",
+    "Contents": "#1a1b26",
+
+    "Badge": "#f7768e",
+    "BadgeFG": "#1a1b26",
+    "Conflict": "#f7768e",
+    "ConflictForeground": "#1a1b26",
+
+    "Border0": "#292e42",
+    "Border1": "#3b4261",
+    "Border2": "#565f89",
+
+    "FlatButton.Background": "#292e42",
+    "FlatButton.BackgroundHovered": "#3b4261",
+
+    "FG1": "#c0caf5",
+    "FG2": "#a9b1d6",
+
+    "Diff.EmptyBG": "#1a1b26",
+
+    "Diff.AddedBG": "#2e3f3a",
+    "Diff.AddedHighlight": "#3a534b",
+
+    "Diff.DeletedBG": "#4b2230",
+    "Diff.DeletedHighlight": "#5a2a39",
+
+    "SystemAccentColor": "#7aa2f7",
+    "Link": "#7aa2f7"
+  },
+
+  "GraphPenThickness": 2,
+  "OpacityForNotMergedCommits": 0.5,
+
+  "GraphColors": [
+    "#bb9af7",
+    "#f7768e",
+    "#ff9e64",
+    "#e0af68",
+    "#9ece6a",
+    "#73daca",
+    "#7aa2f7",
+    "#b4f9f8"
+  ]
+}
diff --git a/themes/TokyoNight_Light.json b/themes/TokyoNight_Light.json
new file mode 100644
index 0000000..d8f6597
--- /dev/null
+++ b/themes/TokyoNight_Light.json
@@ -0,0 +1,50 @@
+{
+  "BasicColors": {
+    "Window": "#d5d6db",
+    "WindowBorder": "#b4b5b9",
+    "TitleBar": "#d5d6db",
+    "ToolBar": "#d5d6db",
+    "Popup": "#d5d6db",
+    "Contents": "#d5d6db",
+
+    "Badge": "#f52a65",
+    "BadgeFG": "#d5d6db",
+    "Conflict": "#f52a65",
+    "ConflictForeground": "#d5d6db",
+
+    "Border0": "#b4b5b9",
+    "Border1": "#a8aecb",
+    "Border2": "#8c92ad",
+
+    "FlatButton.Background": "#b4b5b9",
+    "FlatButton.BackgroundHovered": "#a8aecb",
+
+    "FG1": "#343b58",
+    "FG2": "#565a6e",
+
+    "Diff.EmptyBG": "#d5d6db",
+
+    "Diff.AddedBG": "#cdeff0",
+    "Diff.AddedHighlight": "#bfe3e6",
+
+    "Diff.DeletedBG": "#f3d5d9",
+    "Diff.DeletedHighlight": "#eabfc6",
+
+    "SystemAccentColor": "#34548a",
+    "Link": "#34548a"
+  },
+
+  "GraphPenThickness": 2,
+  "OpacityForNotMergedCommits": 0.5,
+
+  "GraphColors": [
+    "#5a4a78",
+    "#f52a65",
+    "#b15c00",
+    "#8f5e15",
+    "#587539",
+    "#0f4b6e",
+    "#34548a",
+    "#166775"
+  ]
+}
diff --git a/themes/TokyoNight_Storm.json b/themes/TokyoNight_Storm.json
new file mode 100644
index 0000000..7f13728
--- /dev/null
+++ b/themes/TokyoNight_Storm.json
@@ -0,0 +1,50 @@
+{
+  "BasicColors": {
+    "Window": "#24283b",
+    "WindowBorder": "#414868",
+    "TitleBar": "#24283b",
+    "ToolBar": "#24283b",
+    "Popup": "#24283b",
+    "Contents": "#24283b",
+
+    "Badge": "#f7768e",
+    "BadgeFG": "#24283b",
+    "Conflict": "#f7768e",
+    "ConflictForeground": "#24283b",
+
+    "Border0": "#414868",
+    "Border1": "#545c7e",
+    "Border2": "#737aa2",
+
+    "FlatButton.Background": "#414868",
+    "FlatButton.BackgroundHovered": "#545c7e",
+
+    "FG1": "#c0caf5",
+    "FG2": "#a9b1d6",
+
+    "Diff.EmptyBG": "#24283b",
+
+    "Diff.AddedBG": "#283b4d",
+    "Diff.AddedHighlight": "#324a61",
+
+    "Diff.DeletedBG": "#4b2230",
+    "Diff.DeletedHighlight": "#5a2a39",
+
+    "SystemAccentColor": "#7aa2f7",
+    "Link": "#7aa2f7"
+  },
+
+  "GraphPenThickness": 2,
+  "OpacityForNotMergedCommits": 0.5,
+
+  "GraphColors": [
+    "#bb9af7",
+    "#f7768e",
+    "#ff9e64",
+    "#e0af68",
+    "#9ece6a",
+    "#73daca",
+    "#7aa2f7",
+    "#b4f9f8"
+  ]
+}