diff --git a/webapp/titanembeds/constants.py b/webapp/titanembeds/constants.py
index 485c76a..257598b 100644
--- a/webapp/titanembeds/constants.py
+++ b/webapp/titanembeds/constants.py
@@ -80,6 +80,14 @@ QUERY_PARAMETERS = [
                 "name": "DiscordDark",
                 "default": False,
             },
+            {
+                "name": "FireWyvern",
+                "default": False,
+            },
+            {
+                "name": "IceWyvern",
+                "default": False,
+            },
             {
                 "name": "MetroEdge",
                 "default": False,
diff --git a/webapp/titanembeds/static/js/embed.js b/webapp/titanembeds/static/js/embed.js
index 80b6e97..cc6c4c8 100644
--- a/webapp/titanembeds/static/js/embed.js
+++ b/webapp/titanembeds/static/js/embed.js
@@ -22,7 +22,7 @@
 /* global post_timeout */
 
 (function () {
-    const theme_options = ["DiscordDark", "MetroEdge", "BetterTitan"]; // All the avaliable theming names
+    const theme_options = ["DiscordDark", "FireWyvern", "IceWyvern", "MetroEdge", "BetterTitan"]; // All the avaliable theming names
     const badges_options = ["administrator", "partner", "supporter", "discordbotsorgvoted"]; // All badges avaliable
     
     var user_def_css; // Saves the user defined css
diff --git a/webapp/titanembeds/static/themes/Fire Wyvern/css/style.css b/webapp/titanembeds/static/themes/FireWyvern/css/style.css
similarity index 100%
rename from webapp/titanembeds/static/themes/Fire Wyvern/css/style.css
rename to webapp/titanembeds/static/themes/FireWyvern/css/style.css
diff --git a/webapp/titanembeds/static/themes/Fire Wyvern/font/license.txt b/webapp/titanembeds/static/themes/FireWyvern/font/license.txt
similarity index 100%
rename from webapp/titanembeds/static/themes/Fire Wyvern/font/license.txt
rename to webapp/titanembeds/static/themes/FireWyvern/font/license.txt
diff --git a/webapp/titanembeds/static/themes/Fire Wyvern/font/roboto_bold.woff b/webapp/titanembeds/static/themes/FireWyvern/font/roboto_bold.woff
similarity index 100%
rename from webapp/titanembeds/static/themes/Fire Wyvern/font/roboto_bold.woff
rename to webapp/titanembeds/static/themes/FireWyvern/font/roboto_bold.woff
diff --git a/webapp/titanembeds/static/themes/Fire Wyvern/font/roboto_light.woff b/webapp/titanembeds/static/themes/FireWyvern/font/roboto_light.woff
similarity index 100%
rename from webapp/titanembeds/static/themes/Fire Wyvern/font/roboto_light.woff
rename to webapp/titanembeds/static/themes/FireWyvern/font/roboto_light.woff
diff --git a/webapp/titanembeds/static/themes/Fire Wyvern/font/roboto_medium.woff b/webapp/titanembeds/static/themes/FireWyvern/font/roboto_medium.woff
similarity index 100%
rename from webapp/titanembeds/static/themes/Fire Wyvern/font/roboto_medium.woff
rename to webapp/titanembeds/static/themes/FireWyvern/font/roboto_medium.woff
diff --git a/webapp/titanembeds/static/themes/Fire Wyvern/font/roboto_normal.woff b/webapp/titanembeds/static/themes/FireWyvern/font/roboto_normal.woff
similarity index 100%
rename from webapp/titanembeds/static/themes/Fire Wyvern/font/roboto_normal.woff
rename to webapp/titanembeds/static/themes/FireWyvern/font/roboto_normal.woff
diff --git a/webapp/titanembeds/static/themes/Fire Wyvern/promo/promo.mp4 b/webapp/titanembeds/static/themes/FireWyvern/promo/promo.mp4
similarity index 100%
rename from webapp/titanembeds/static/themes/Fire Wyvern/promo/promo.mp4
rename to webapp/titanembeds/static/themes/FireWyvern/promo/promo.mp4
diff --git a/webapp/titanembeds/static/themes/Fire Wyvern/promo/promo.png b/webapp/titanembeds/static/themes/FireWyvern/promo/promo.png
similarity index 100%
rename from webapp/titanembeds/static/themes/Fire Wyvern/promo/promo.png
rename to webapp/titanembeds/static/themes/FireWyvern/promo/promo.png
diff --git a/webapp/titanembeds/static/themes/Ice Wyvern/css/style.css b/webapp/titanembeds/static/themes/IceWyvern/css/style.css
similarity index 100%
rename from webapp/titanembeds/static/themes/Ice Wyvern/css/style.css
rename to webapp/titanembeds/static/themes/IceWyvern/css/style.css
diff --git a/webapp/titanembeds/static/themes/Ice Wyvern/font/license.txt b/webapp/titanembeds/static/themes/IceWyvern/font/license.txt
similarity index 100%
rename from webapp/titanembeds/static/themes/Ice Wyvern/font/license.txt
rename to webapp/titanembeds/static/themes/IceWyvern/font/license.txt
diff --git a/webapp/titanembeds/static/themes/Ice Wyvern/font/roboto_bold.woff b/webapp/titanembeds/static/themes/IceWyvern/font/roboto_bold.woff
similarity index 100%
rename from webapp/titanembeds/static/themes/Ice Wyvern/font/roboto_bold.woff
rename to webapp/titanembeds/static/themes/IceWyvern/font/roboto_bold.woff
diff --git a/webapp/titanembeds/static/themes/Ice Wyvern/font/roboto_light.woff b/webapp/titanembeds/static/themes/IceWyvern/font/roboto_light.woff
similarity index 100%
rename from webapp/titanembeds/static/themes/Ice Wyvern/font/roboto_light.woff
rename to webapp/titanembeds/static/themes/IceWyvern/font/roboto_light.woff
diff --git a/webapp/titanembeds/static/themes/Ice Wyvern/font/roboto_medium.woff b/webapp/titanembeds/static/themes/IceWyvern/font/roboto_medium.woff
similarity index 100%
rename from webapp/titanembeds/static/themes/Ice Wyvern/font/roboto_medium.woff
rename to webapp/titanembeds/static/themes/IceWyvern/font/roboto_medium.woff
diff --git a/webapp/titanembeds/static/themes/Ice Wyvern/font/roboto_normal.woff b/webapp/titanembeds/static/themes/IceWyvern/font/roboto_normal.woff
similarity index 100%
rename from webapp/titanembeds/static/themes/Ice Wyvern/font/roboto_normal.woff
rename to webapp/titanembeds/static/themes/IceWyvern/font/roboto_normal.woff
diff --git a/webapp/titanembeds/static/themes/Ice Wyvern/promo/promo.mp4 b/webapp/titanembeds/static/themes/IceWyvern/promo/promo.mp4
similarity index 100%
rename from webapp/titanembeds/static/themes/Ice Wyvern/promo/promo.mp4
rename to webapp/titanembeds/static/themes/IceWyvern/promo/promo.mp4
diff --git a/webapp/titanembeds/static/themes/Ice Wyvern/promo/promo.png b/webapp/titanembeds/static/themes/IceWyvern/promo/promo.png
similarity index 100%
rename from webapp/titanembeds/static/themes/Ice Wyvern/promo/promo.png
rename to webapp/titanembeds/static/themes/IceWyvern/promo/promo.png
diff --git a/webapp/titanembeds/templates/embed.html.j2 b/webapp/titanembeds/templates/embed.html.j2
index 1635662..4d4c731 100644
--- a/webapp/titanembeds/templates/embed.html.j2
+++ b/webapp/titanembeds/templates/embed.html.j2
@@ -175,6 +175,8 @@
             <select id="theme-selector">
               <option value="" selected>Default</option>
               <option value="DiscordDark">DiscordDark</option>
+              <option value="FireWyvern">Fire Wyvern</option>
+              <option value="IceWyvern">Ice Wyvern</option>
               <option value="MetroEdge">MetroEdge</option>
               <option value="BetterTitan">BetterTitan</option>
             </select>