diff --git a/files/templates/CHRISTMAS/default.html b/files/templates/CHRISTMAS/default.html
index ad0ce8f875..162e7cdefa 100644
--- a/files/templates/CHRISTMAS/default.html
+++ b/files/templates/CHRISTMAS/default.html
@@ -217,7 +217,7 @@
 
  </head>
 
- <body id="{% if request.path != '/comments' %}{% block pagetype %}frontpage{% endblock %}{% endif %}" class="{{v.theme}} theme-iron dark overflow-hidden overflow-y-auto sm:overflow-y-none antialiased bg-cover bg-center bg-gray-500 text-gray-900 dark:bg-gray-700 dark:text-gray-100">
+ <body id="{% if request.path != '/comments' %}{% block pagetype %}frontpage{% endblock %}{% endif %}" class="{% if v and v.theme %}{{v.theme}}{% else %}theme-iron dark{% endif %} overflow-hidden overflow-y-auto sm:overflow-y-none antialiased bg-cover bg-center bg-gray-500 text-gray-900 dark:bg-gray-700 dark:text-gray-100">
 
 {% block Banner %}
 {% endblock %}
diff --git a/files/templates/CHRISTMAS/modals/ModalThemePicker.html b/files/templates/CHRISTMAS/modals/ModalThemePicker.html
index b3a901e4e1..a9581ff706 100644
--- a/files/templates/CHRISTMAS/modals/ModalThemePicker.html
+++ b/files/templates/CHRISTMAS/modals/ModalThemePicker.html
@@ -14,7 +14,7 @@
 					<div class="flex flex-wrap -mx-2 overflow-hidden">
 						<!-- Evergreen -->
 						<div class="my-2 px-2 w-1/2 overflow-hidden lg:w-1/4 flex items-center justify-center">
-							<input hidden name="kind" value="evergreen" type="radio" id="evergreen-theme" class="peer" onchange="changeTheme(['theme-evergreen']);">
+							<input hidden name="kind" value="theme-evergreen" type="radio" id="evergreen-theme" class="peer" onchange="changeTheme(['theme-evergreen']); post_toast('/settings/profile?theme='+value, '1')">
 							<label for="evergreen-theme" class="flex flex-col items-center justify-center w-full h-full text-center border border-gray-200 dark:border-gray-600 hover:bg-gray-100 dark:hover:bg-gray-600 peer-checked:border-primary rounded-lg overflow-hidden">
 								<div class="flex flex-col w-full h-full bg-[#37523e]">
 									<div class="h-3 w-full bg-[#37523e]"></div>
