diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj
index 77d7ee440..184f3d260 100644
--- a/CodeEdit.xcodeproj/project.pbxproj
+++ b/CodeEdit.xcodeproj/project.pbxproj
@@ -63,6 +63,8 @@
 		28A51006281701B40087B0CC /* codeedit-github-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 28A51004281701B40087B0CC /* codeedit-github-dark.json */; };
 		28B0A19827E385C300B73177 /* NavigatorSidebarToolbarTop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28B0A19727E385C300B73177 /* NavigatorSidebarToolbarTop.swift */; };
 		28B8F884280FFE4600596236 /* NSTableView+Background.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28B8F883280FFE4600596236 /* NSTableView+Background.swift */; };
+		28F43DE029738792008BBA45 /* codeedit-solarized-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 28F43DDF29738792008BBA45 /* codeedit-solarized-dark.json */; };
+		28F43DE2297388C5008BBA45 /* codeedit-solarized-light.json in Resources */ = {isa = PBXBuildFile; fileRef = 28F43DE1297388C5008BBA45 /* codeedit-solarized-light.json */; };
 		28FFE1BF27E3A441001939DB /* NavigatorSidebarToolbarBottom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28FFE1BE27E3A441001939DB /* NavigatorSidebarToolbarBottom.swift */; };
 		2B7A583527E4BA0100D25D4E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468438427DC76E200F8E88E /* AppDelegate.swift */; };
 		2B7AC06B282452FB0082A5B8 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2B7AC06A282452FB0082A5B8 /* Media.xcassets */; };
@@ -439,6 +441,8 @@
 		28A51004281701B40087B0CC /* codeedit-github-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "codeedit-github-dark.json"; sourceTree = "<group>"; };
 		28B0A19727E385C300B73177 /* NavigatorSidebarToolbarTop.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = NavigatorSidebarToolbarTop.swift; sourceTree = "<group>"; tabWidth = 4; };
 		28B8F883280FFE4600596236 /* NSTableView+Background.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTableView+Background.swift"; sourceTree = "<group>"; };
+		28F43DDF29738792008BBA45 /* codeedit-solarized-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text.json; path = "codeedit-solarized-dark.json"; sourceTree = "<group>"; tabWidth = 2; };
+		28F43DE1297388C5008BBA45 /* codeedit-solarized-light.json */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text.json; path = "codeedit-solarized-light.json"; sourceTree = "<group>"; tabWidth = 2; };
 		28FFE1BE27E3A441001939DB /* NavigatorSidebarToolbarBottom.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = NavigatorSidebarToolbarBottom.swift; sourceTree = "<group>"; tabWidth = 4; };
 		2B15CA0028254139004E8F22 /* OpenWithCodeEdit.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = OpenWithCodeEdit.entitlements; sourceTree = "<group>"; };
 		2B7AC06A282452FB0082A5B8 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
@@ -880,6 +884,8 @@
 		28069DA527F5BD320016BC47 /* DefaultThemes */ = {
 			isa = PBXGroup;
 			children = (
+				28F43DDF29738792008BBA45 /* codeedit-solarized-dark.json */,
+				28F43DE1297388C5008BBA45 /* codeedit-solarized-light.json */,
 				28A50FFF281673530087B0CC /* codeedit-xcode-dark.json */,
 				28A51000281673530087B0CC /* codeedit-xcode-light.json */,
 				28A51004281701B40087B0CC /* codeedit-github-dark.json */,
@@ -2414,10 +2420,12 @@
 				283BDCBD2972EEBD002AFF81 /* Package.resolved in Resources */,
 				B658FB3727DA9E1000EA4DBD /* Preview Assets.xcassets in Resources */,
 				28A51006281701B40087B0CC /* codeedit-github-dark.json in Resources */,
+				28F43DE029738792008BBA45 /* codeedit-solarized-dark.json in Resources */,
 				58A5DFA529339F6400D1BD5D /* default_keybindings.json in Resources */,
 				28A51002281673530087B0CC /* codeedit-xcode-light.json in Resources */,
 				28A51005281701B40087B0CC /* codeedit-github-light.json in Resources */,
 				D7211D4727E06BFE008F2ED7 /* Localizable.strings in Resources */,
+				28F43DE2297388C5008BBA45 /* codeedit-solarized-light.json in Resources */,
 				28A51001281673530087B0CC /* codeedit-xcode-dark.json in Resources */,
 				B658FB3427DA9E1000EA4DBD /* Assets.xcassets in Resources */,
 				474397C52893AC4B00518C8C /* codeedit-midnight.json in Resources */,
diff --git a/CodeEdit/DefaultThemes/codeedit-solarized-dark.json b/CodeEdit/DefaultThemes/codeedit-solarized-dark.json
new file mode 100644
index 000000000..16ca9ec3c
--- /dev/null
+++ b/CodeEdit/DefaultThemes/codeedit-solarized-dark.json
@@ -0,0 +1,125 @@
+{
+  "author": "CodeEdit",
+  "description": "Solarized dark theme.",
+  "displayName": "Solarized Dark",
+  "distributionURL": "https://github.com/CodeEditApp/CodeEdit",
+  "editor": {
+    "attributes": {
+      "color": "#6C71C4"
+    },
+    "background": {
+      "color": "#002B36"
+    },
+    "characters": {
+      "color": "#DC322F"
+    },
+    "commands": {
+      "color": "#CB4B16"
+    },
+    "comments": {
+      "color": "#586E75"
+    },
+    "insertionPoint": {
+      "color": "#839496"
+    },
+    "invisibles": {
+      "color": "#073642"
+    },
+    "keywords": {
+      "color": "#859900"
+    },
+    "lineHighlight": {
+      "color": "#073642"
+    },
+    "numbers": {
+      "color": "#DC322F"
+    },
+    "selection": {
+      "color": "#586E75"
+    },
+    "strings": {
+      "color": "#2AA198"
+    },
+    "text": {
+      "color": "#839496"
+    },
+    "types": {
+      "color": "#268BD2"
+    },
+    "values": {
+      "color": "#D33682"
+    },
+    "variables": {
+      "color": "#B58900"
+    }
+  },
+  "license": "MIT",
+  "name": "codeedit-solarized-dark",
+  "terminal": {
+    "background": {
+      "color": "#002B36"
+    },
+    "black": {
+      "color": "#073642"
+    },
+    "blue": {
+      "color": "#268BD2"
+    },
+    "boldText": {
+      "color": "#839496"
+    },
+    "brightBlack": {
+      "color": "#002B36"
+    },
+    "brightBlue": {
+      "color": "#839496"
+    },
+    "brightCyan": {
+      "color": "#93A1A1"
+    },
+    "brightGreen": {
+      "color": "#586E75"
+    },
+    "brightMagenta": {
+      "color": "#6C71C4"
+    },
+    "brightRed": {
+      "color": "#CB4B16"
+    },
+    "brightWhite": {
+      "color": "#FDF6E3"
+    },
+    "brightYellow": {
+      "color": "#657B83"
+    },
+    "cursor": {
+      "color": "#839496"
+    },
+    "cyan": {
+      "color": "#2AA198"
+    },
+    "green": {
+      "color": "#859900"
+    },
+    "magenta": {
+      "color": "#D33682"
+    },
+    "red": {
+      "color": "#DC322F"
+    },
+    "selection": {
+      "color": "#073642"
+    },
+    "text": {
+      "color": "#839496"
+    },
+    "white": {
+      "color": "#EEE8D5"
+    },
+    "yellow": {
+      "color": "#B58900"
+    }
+  },
+  "type": "dark",
+  "version": "0.0.1"
+}
diff --git a/CodeEdit/DefaultThemes/codeedit-solarized-light.json b/CodeEdit/DefaultThemes/codeedit-solarized-light.json
new file mode 100644
index 000000000..bd038e77f
--- /dev/null
+++ b/CodeEdit/DefaultThemes/codeedit-solarized-light.json
@@ -0,0 +1,125 @@
+{
+  "author": "CodeEdit",
+  "description": "Solarized light theme.",
+  "displayName": "Solarized Light",
+  "distributionURL": "https://github.com/CodeEditApp/CodeEdit",
+  "editor": {
+    "attributes": {
+      "color": "#6C71C4"
+    },
+    "background": {
+      "color": "#FDF6E3"
+    },
+    "characters": {
+      "color": "#DC322F"
+    },
+    "commands": {
+      "color": "#CB4B16"
+    },
+    "comments": {
+      "color": "#93A1A1"
+    },
+    "insertionPoint": {
+      "color": "#657B83"
+    },
+    "invisibles": {
+      "color": "#EEE8D5"
+    },
+    "keywords": {
+      "color": "#859900"
+    },
+    "lineHighlight": {
+      "color": "#EEE8D5"
+    },
+    "numbers": {
+      "color": "#DC322F"
+    },
+    "selection": {
+      "color": "#93A1A1"
+    },
+    "strings": {
+      "color": "#2AA198"
+    },
+    "text": {
+      "color": "#657B83"
+    },
+    "types": {
+      "color": "#268BD2"
+    },
+    "values": {
+      "color": "#D33682"
+    },
+    "variables": {
+      "color": "#B58900"
+    }
+  },
+  "license": "MIT",
+  "name": "codeedit-solarized-light",
+  "terminal": {
+    "background": {
+      "color": "#FDF6E3"
+    },
+    "black": {
+      "color": "#073642"
+    },
+    "blue": {
+      "color": "#268BD2"
+    },
+    "boldText": {
+      "color": "#586E75"
+    },
+    "brightBlack": {
+      "color": "#002B36"
+    },
+    "brightBlue": {
+      "color": "#839496"
+    },
+    "brightCyan": {
+      "color": "#93A1A1"
+    },
+    "brightGreen": {
+      "color": "#586E75"
+    },
+    "brightMagenta": {
+      "color": "#6C71C4"
+    },
+    "brightRed": {
+      "color": "#CB4B16"
+    },
+    "brightWhite": {
+      "color": "#FDF6E3"
+    },
+    "brightYellow": {
+      "color": "#657B83"
+    },
+    "cursor": {
+      "color": "#657B83"
+    },
+    "cyan": {
+      "color": "#2AA198"
+    },
+    "green": {
+      "color": "#859900"
+    },
+    "magenta": {
+      "color": "#D33682"
+    },
+    "red": {
+      "color": "#DC322F"
+    },
+    "selection": {
+      "color": "#EEE8D5"
+    },
+    "text": {
+      "color": "#657B83"
+    },
+    "white": {
+      "color": "#EEE8D5"
+    },
+    "yellow": {
+      "color": "#B58900"
+    }
+  },
+  "type": "light",
+  "version": "0.0.1"
+}
diff --git a/CodeEdit/Features/AppPreferences/Sections/ThemePreferences/Model/ThemeModel.swift b/CodeEdit/Features/AppPreferences/Sections/ThemePreferences/Model/ThemeModel.swift
index 1b8055c01..1ab1fb813 100644
--- a/CodeEdit/Features/AppPreferences/Sections/ThemePreferences/Model/ThemeModel.swift
+++ b/CodeEdit/Features/AppPreferences/Sections/ThemePreferences/Model/ThemeModel.swift
@@ -214,7 +214,9 @@ final class ThemeModel: ObservableObject {
             "codeedit-xcode-light",
             "codeedit-github-dark",
             "codeedit-github-light",
-            "codeedit-midnight"
+            "codeedit-midnight",
+            "codeedit-solarized-dark",
+            "codeedit-solarized-light"
         ]
         for themeName in bundledThemeNames {
             guard let defaultUrl = Bundle.main.url(forResource: themeName, withExtension: "json") else {