diff --git a/build.zig b/build.zig
index 26541a5..106c69c 100644
--- a/build.zig
+++ b/build.zig
@@ -57,4 +57,7 @@ fn add_themes(b: *std.Build, exe: anytype) void {
     theme_file(b, exe, "gruvbox", "themes/gruvbox-light-hard.json");
     theme_file(b, exe, "gruvbox", "themes/gruvbox-light-medium.json");
     theme_file(b, exe, "gruvbox", "themes/gruvbox-light-soft.json");
+    theme_file(b, exe, "tokyo_night", "themes/tokyo-night-storm-color-theme.json");
+    theme_file(b, exe, "tokyo_night", "themes/tokyo-night-color-theme.json");
+    theme_file(b, exe, "tokyo_night", "themes/tokyo-night-light-color-theme.json");
 }
diff --git a/build.zig.zon b/build.zig.zon
index 4440564..559e7e4 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -33,6 +33,10 @@
             .url = "https://github.com/jdinhify/vscode-theme-gruvbox/archive/b1b9837e6747e040b69c7d46e502286bb0f257f7.tar.gz",
             .hash = "1220fcaf3181a354ee8a1413f3a15d2a1842e1377a95f636d4f26602d5bb38e45f00",
         },
+        .theme_tokyo_night = .{
+            .url = "https://github.com/enkia/tokyo-night-vscode-theme/archive/55336bd57924021c174470d9f476a1db01eddb97.tar.gz",
+            .hash = "1220f9729cd271c29dee0e199b2bc0f801cb657b603668680a07191b9a8c1b1f21fb",
+        },
     },
     .paths = .{
         "build.zig",
diff --git a/src/compile.zig b/src/compile.zig
index ad0f0b6..b9f3972 100644
--- a/src/compile.zig
+++ b/src/compile.zig
@@ -179,6 +179,9 @@ fn load_token_settings_object(file_name: []const u8, scopes_name: ?[]const u8, c
             } else if (eql(u8, "italic underline", value)) {
                 style.fs = .italic;
                 style.fs = .underline;
+            } else if (eql(u8, "bold italic", value)) {
+                style.fs = .bold;
+                style.fs = .italic;
             } else if (eql(u8, "strikethrough", value)) {
                 style.fs = .strikethrough;
             } else if (eql(u8, "", value)) {
diff --git a/src/theme_files.zig b/src/theme_files.zig
index 98df2be..923bd75 100644
--- a/src/theme_files.zig
+++ b/src/theme_files.zig
@@ -33,6 +33,9 @@ pub const theme_files = [_]theme_file{
     THEME("extensions/theme-defaults/themes/light_vs.json"),
     THEME("extensions/theme-defaults/themes/light_plus.json"),
     THEME("extensions/theme-defaults/themes/light_modern.json"),
+    THEME("themes/tokyo-night-storm-color-theme.json"),
+    THEME("themes/tokyo-night-color-theme.json"),
+    THEME("themes/tokyo-night-light-color-theme.json"),
 };
 
 fn THEME(comptime file_path: []const u8) theme_file {