diff --git a/CSS/variables/organizr-dark.css b/CSS/variables/organizr-dark.css
index 587f5b60..aa8d9d5c 100644
--- a/CSS/variables/organizr-dark.css
+++ b/CSS/variables/organizr-dark.css
@@ -1,34 +1,30 @@
-<<<<<<< develop
-:root {
-  --main-bg-color: #1f1f1f;
-
-  --modal-bg-color: #333;
-  --modal-header-color: #232323;
-  --modal-footer-color: #232323;
-
-  --drop-down-menu-bg: #1b1b1b;
-
-  --button-color: #2cabe3;
-  --button-color-hover: #298fbc;
-  --button-text: #eee;
-  --button-text-hover: #fff;
-
-  --accent-color:  44, 171, 227;
-  --accent-color-hover: rgb(var(--accent-color),.8);
-  --link-color: #2cabe3;
-  --link-color-hover: #3cc5ff;
-  --label-text-color: #fff;
-    
-  --text:#96a2b4;
-  --text-hover: #fff;
-  --text-muted: #999;
-
-  /*Specials*/
-  --arr-queue-color: #2cabe3; /* Servarr apps + Bazarr*/
-  --plex-poster-unwatched: #2cabe3;
-  --petio-spinner: invert(65%) sepia(83%) saturate(2026%) hue-rotate(167deg) brightness(90%) contrast(97%);/* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
-  --gitea-color-primary-dark-4: 44, 171, 227;
-}
-=======
-@import url("https://theme-park.dev/CSS/variables/organizr.css");
->>>>>>> master
+:root {
+  --main-bg-color: #1f1f1f;
+
+  --modal-bg-color: #333;
+  --modal-header-color: #232323;
+  --modal-footer-color: #232323;
+
+  --drop-down-menu-bg: #1b1b1b;
+
+  --button-color: #2cabe3;
+  --button-color-hover: #298fbc;
+  --button-text: #eee;
+  --button-text-hover: #fff;
+
+  --accent-color:  44, 171, 227;
+  --accent-color-hover: rgb(var(--accent-color),.8);
+  --link-color: #2cabe3;
+  --link-color-hover: #3cc5ff;
+  --label-text-color: #fff;
+    
+  --text:#96a2b4;
+  --text-hover: #fff;
+  --text-muted: #999;
+
+  /*Specials*/
+  --arr-queue-color: #2cabe3; /* Servarr apps + Bazarr*/
+  --plex-poster-unwatched: #2cabe3;
+  --petio-spinner: invert(65%) sepia(83%) saturate(2026%) hue-rotate(167deg) brightness(90%) contrast(97%);/* Made with https://codepen.io/jsm91/embed/ZEEawyZ */
+  --gitea-color-primary-dark-4: 44, 171, 227;
+}
\ No newline at end of file
diff --git a/themes.json b/themes.json
index 9eb26d1d..3be31eb7 100644
--- a/themes.json
+++ b/themes.json
@@ -7,20 +7,12 @@
     "lidarr": {
       "lidarr-darker": "https://theme-park.dev/css/addons/lidarr/lidarr-darker/lidarr-darker.css?sha=fc479d221c05b5232d720f1c32d9cb1717f7b60b"
     },
-<<<<<<< develop
     "organizr": {
       "glass": {
         "css": [
           "https://theme-park.dev/css/addons/organizr/glass/glass-login.css?sha=0200383709509139874da6540d8a7fc07030f172",
           "https://theme-park.dev/css/addons/organizr/glass/glass-base.css?sha=056e0c4e097462b9d0ef236f40dde99453c332fa"
         ]
-=======
-    "plex": {
-      "base_css": "https://theme-park.dev/CSS/themes/plex/plex-base.css?sha=fcd94772cbe0427bf088b2aaa40aa535af45c2e9",
-      "addons": {
-        "plex-alt-logo": "https://theme-park.dev/CSS/addons/plex/plex-alt-logo/plex-alt-logo.css?sha=3e9bc7c76e836f8eb335431058241fe49906aa8f",
-        "overseerr-side-menu": "https://theme-park.dev/CSS/addons/plex/overseerr-side-menu/overseerr-side-menu.css?sha=b14fcec4d4226f766e3f3931b073b4b45ea416ff"
->>>>>>> master
       }
     },
     "plex": {
@@ -99,53 +91,8 @@
     "Blackberry-dreamscape": {
       "url": "https://theme-park.dev/css/community-theme-options/blackberry-dreamscape.css?sha=0ad15b8d2215b7528e27f3bd65f1cb0c42453be0"
     },
-<<<<<<< develop
     "Blackberry-flamingo": {
       "url": "https://theme-park.dev/css/community-theme-options/blackberry-flamingo.css?sha=4ddeb117541753969da70820d8205aef771e37b4"
-=======
-    "unraid": {
-      "base_css": "https://theme-park.dev/CSS/themes/unraid/unraid-base.css?sha=89388e23325b97b68f448362a18d71f0b46e1356",
-      "addons": {
-        "login-page": {
-          "alien": {
-            "css": [
-              "https://theme-park.dev/CSS/addons/unraid/login-page/alien/hallway3.css?sha=85719c35385fb0589d5a18a86b6c519cbaf1f220",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/alien/nightmare.css?sha=a75b65cad0455b260b1e6209b23ffc2389615b2a",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/alien/hallway2.css?sha=38ec4a1aa6c275d67c0c1ce35d79ca52027eb545",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/alien/hallway4.css?sha=f747496cb1de0be4f39710bb1ee245602d6446a4",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/alien/hallway.css?sha=a0724cde5e5afaddb956eba76523dccef9515f91",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/alien/scanner.css?sha=73f97cb8aac3a4f3c0894e404ce7c9ef7b0c17b8",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/alien/isolation_video.css?sha=7f1f89ab6d60182910b4ecf5b162057742f2b5a0",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/alien/alien_base.css?sha=7e310e223692a1169d19ad0eec747488ece7ca4e",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/alien/isolation.css?sha=0417009581d1933ada92ba746db761f9496d8774",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/alien/custom.css?sha=a2f4b06d3816bf875f861b12d7f07252c2862d82"
-            ]
-          },
-          "retro-terminal": {
-            "css": [
-              "https://theme-park.dev/CSS/addons/unraid/login-page/retro-terminal/white.css?sha=7616e7d06646356a0d99b3c7cd7db8fbd5cfe94d",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/retro-terminal/blue.css?sha=11ba12dd12e7079ac6c48805db70dec0a8fe751e",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/retro-terminal/retro-terminal-base.css?sha=860f370f1b8e25b26ab9bc45a73632de58c799ce",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/retro-terminal/red.css?sha=7d250ac647db0ade37a389f59a295213d6d286b1",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/retro-terminal/green.css?sha=5fa51725eccdeb604387b5d9078325c7419b06ec",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/retro-terminal/amber.css?sha=ce3d2ec61e4d228dbf369eb9892fe4ba59814303",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/retro-terminal/custom.css?sha=a2f4b06d3816bf875f861b12d7f07252c2862d82"
-            ]
-          },
-          "fallout": {
-            "css": [
-              "https://theme-park.dev/CSS/addons/unraid/login-page/fallout/dirty_terminal.css?sha=1f318dd614edb2a2cd3f5fb1dbdb04cd412af9d1",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/fallout/fallout_base.css?sha=3a79171bff7252461e4ff5e76b507640bffcf5e1",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/fallout/terminal.css?sha=8d924fbaba139bef37c1156c3c5b32ba959bb3a5",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/fallout/fallout_video.css?sha=ad5db68decc504f5b920f19d65481322c97b4db3",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/fallout/dirty_terminal2.css?sha=09ab0765e89df3081abfa3229d725884cc44f7ef",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/fallout/custom.css?sha=a2f4b06d3816bf875f861b12d7f07252c2862d82",
-              "https://theme-park.dev/CSS/addons/unraid/login-page/fallout/terminal2.css?sha=0cdbad30781b4e56b3ed7db820a7c1e8d9da2627"
-            ]
-          }
-        }
-      }
->>>>>>> master
     },
     "Blackberry-hearth": {
       "url": "https://theme-park.dev/css/community-theme-options/blackberry-hearth.css?sha=979626f867e9a9a91664f2b6da66d478040dc8fb"
@@ -252,7 +199,6 @@
       "addons": {},
       "base_css": "https://theme-park.dev/css/base/duplicacy/duplicacy-base.css?sha=00a671f67fde4f1f50308c283dbb29ff7c67965b"
     },
-<<<<<<< develop
     "duplicati": {
       "addons": {},
       "base_css": "https://theme-park.dev/css/base/duplicati/duplicati-base.css?sha=02066e66d69b6cd745021191f2ccaedb9a827550"
@@ -260,19 +206,6 @@
     "emby": {
       "addons": {},
       "base_css": "https://theme-park.dev/css/base/emby/emby-base.css?sha=86b7f7a143a7a1485985dee2c6cbbd33fff1bb79"
-=======
-    "overseerr": {
-      "base_css": "https://theme-park.dev/CSS/themes/overseerr/overseerr-base.css?sha=69c53aeb737ebea91c3ab1291fa235519448922a",
-      "addons": {}
-    },
-    "filebrowser": {
-      "base_css": "https://theme-park.dev/CSS/themes/filebrowser/filebrowser-base.css?sha=a4dd3a49bb749bd819e8bdc2a3f202a121626cb0",
-      "addons": {}
-    },
-    "portainer": {
-      "base_css": "https://theme-park.dev/CSS/themes/portainer/portainer-base.css?sha=4e76f910e1872f1532e7c737c52c312bf42e6a9e",
-      "addons": {}
->>>>>>> master
     },
     "filebrowser": {
       "addons": {},
@@ -345,10 +278,6 @@
       "base_css": "https://theme-park.dev/css/base/ombi/ombi-base.css?sha=c2dc7486c407f653d5cd1c1fa5cb5c94eb68ca00"
     },
     "organizr": {
-<<<<<<< develop
-=======
-      "base_css": "https://theme-park.dev/CSS/themes/organizr/organizr-base.css?sha=21c3ea5ce3073bb252cc955aa790033e3855ebdf",
->>>>>>> master
       "addons": {
         "glass": {
           "css": [
@@ -525,19 +454,8 @@
     "Blackberry-royal": {
       "url": "https://theme-park.dev/css/community-theme-options/blackberry-royal.css?sha=4bb56762e9469e831edf005100b9bd04849ad55c"
     },
-<<<<<<< develop
     "Blackberry-shadow": {
       "url": "https://theme-park.dev/css/community-theme-options/blackberry-shadow.css?sha=f8e59fbf4720063a949e1be5cb16ebef094dc724"
-=======
-    "Blackberry-solar": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-solar.css?sha=429071cc7b6204555899a4942d47446f54cc19c5"
-    },
-    "Blackberry-dreamscape": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-dreamscape.css?sha=0ad15b8d2215b7528e27f3bd65f1cb0c42453be0"
-    },
-    "Soul": {
-      "url": "https://theme-park.dev/CSS/variables/soul.css?sha=1ce095e4b03920af4bbd70b6fa8776614b3536db"
->>>>>>> master
     },
     "Blackberry-solar": {
       "url": "https://theme-park.dev/css/community-theme-options/blackberry-solar.css?sha=429071cc7b6204555899a4942d47446f54cc19c5"
@@ -551,7 +469,6 @@
     "Mind": {
       "url": "https://theme-park.dev/css/community-theme-options/mind.css?sha=fb9b9d13dcaae0d46499acbbae405bbc23ae37cb"
     },
-<<<<<<< develop
     "Onedark": {
       "url": "https://theme-park.dev/css/community-theme-options/onedark.css?sha=cbccbf4366ab59bd2b9253c221b1f093c2e85118"
     },
@@ -560,28 +477,6 @@
     },
     "Reality": {
       "url": "https://theme-park.dev/css/community-theme-options/reality.css?sha=8eadacd5602439f8430ccad8dba4e2465d87629f"
-=======
-    "Blackberry-abyss": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-abyss.css?sha=5e806cb7efad3e1ac97e985f71d7a631a1b7f02b"
-    },
-    "Overseerr": {
-      "url": "https://theme-park.dev/CSS/variables/overseerr.css?sha=7e3a8e3ca21dd82641113cf53f071a89252c7235"
-    },
-    "Blackberry-shadow": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-shadow.css?sha=f8e59fbf4720063a949e1be5cb16ebef094dc724"
-    },
-    "Hotpink": {
-      "url": "https://theme-park.dev/CSS/variables/hotpink.css?sha=2f3974c084d053521362bae34d415f3614dba2e2"
-    },
-    "Blackberry-flamingo": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-flamingo.css?sha=4ddeb117541753969da70820d8205aef771e37b4"
-    },
-    "Organizr-dark": {
-      "url": "https://theme-park.dev/CSS/variables/organizr-dark.css?sha=5775994f8dc66acfc3684ab78ea842290a6a7cf2"
-    },
-    "Blackberry-vanta": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-vanta.css?sha=45a001fcfcf1fae8d40216146f38595fcfc76738"
->>>>>>> master
     },
     "Soul": {
       "url": "https://theme-park.dev/css/community-theme-options/soul.css?sha=2ce22d7b1fd2867393fd066ea97ed3adbf15764f"
@@ -603,19 +498,8 @@
     "Dracula": {
       "url": "https://theme-park.dev/css/theme-options/dracula.css?sha=5abf85508d87243007cf5f4fda34a60340583466"
     },
-<<<<<<< develop
     "Hotline": {
       "url": "https://theme-park.dev/css/theme-options/hotline.css?sha=e027feaeea0f623144af4c45b61e332a0757f5fb"
-=======
-    "Blackberry-martian": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-martian.css?sha=f6fcaa104ff119d049fb72cebe2e6e620db1aa04"
-    },
-    "Blackberry-amethyst": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-amethyst.css?sha=bfb208569a57c23e562781bcbcc25c05779421de"
-    },
-    "Organizr": {
-      "url": "https://theme-park.dev/CSS/variables/organizr.css?sha=aa8d9d5c1b897b8f6d27ff274b073595b3d45741"
->>>>>>> master
     },
     "Hotpink": {
       "url": "https://theme-park.dev/css/theme-options/hotpink.css?sha=2f3974c084d053521362bae34d415f3614dba2e2"
@@ -626,7 +510,6 @@
     "Organizr": {
       "url": "https://theme-park.dev/css/theme-options/organizr.css?sha=aa8d9d5c1b897b8f6d27ff274b073595b3d45741"
     },
-<<<<<<< develop
     "Overseerr": {
       "url": "https://theme-park.dev/css/theme-options/overseerr.css?sha=7e3a8e3ca21dd82641113cf53f071a89252c7235"
     },
@@ -635,25 +518,6 @@
     },
     "Space-gray": {
       "url": "https://theme-park.dev/css/theme-options/space-gray.css?sha=566e5616a8e48be2d0670d3f4d1ce106d2616ea2"
-=======
-    "Blackberry-hearth": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-hearth.css?sha=979626f867e9a9a91664f2b6da66d478040dc8fb"
-    },
-    "Time": {
-      "url": "https://theme-park.dev/CSS/variables/time.css?sha=d7dd3e5ff6601ac1325218a24dc0f49944aa9a61"
-    },
-    "Aquamarine": {
-      "url": "https://theme-park.dev/CSS/variables/aquamarine.css?sha=5cdf3f13a57669f3732b64a7573580bcaa9ac6fc"
-    },
-    "Blackberry-pumpkin": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-pumpkin.css?sha=0ba03cc3999c36f3ef7c0eae7f381cdcbdfd7f33"
-    },
-    "Blackberry-royal": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-royal.css?sha=4bb56762e9469e831edf005100b9bd04849ad55c"
-    },
-    "Blackberry-carol": {
-      "url": "https://theme-park.dev/CSS/variables/blackberry-carol.css?sha=31e6efb3dc0a5b8faab64294f062ba76077e8af2"
->>>>>>> master
     }
   }
 }
\ No newline at end of file