diff --git a/source/ubl-settings-manager-theme.c b/source/ubl-settings-manager-theme.c
index f73496a..55deff3 100644
--- a/source/ubl-settings-manager-theme.c
+++ b/source/ubl-settings-manager-theme.c
@@ -2,8 +2,8 @@
 
 theme_struct *yon_theme_update(main_window *widgets){
     char *theme_id;
-    if (!yon_window_config_get_parameter(settings_section,theme_parameter,&theme_id,YON_TYPE_STRING)){ 
-        theme_id = yon_char_new(MAIN_THEME_LABEL);
+    if (!yon_window_config_get_parameter(settings_section,theme_parameter,&theme_id,YON_TYPE_STRING)||!g_hash_table_contains(main_config.themes,theme_id)){ 
+        theme_id = yon_char_new("MAIN_THEME_LABEL");
     }
 
     theme_struct *theme = ((theme_struct*(*)())g_hash_table_lookup(main_config.themes,theme_id))();
@@ -27,6 +27,6 @@ theme_struct *yon_theme_update(main_window *widgets){
 void yon_theme_init(){
     // theme_struct *gnome_struct = (theme_struct*)yon_gnome_theme_new();
     // theme_struct *main_struct = (theme_struct*)yon_main_theme_new();
-    g_hash_table_insert(main_config.themes,yon_char_new(GNOME_THEME_LABEL),yon_gnome_theme_new);
-    g_hash_table_insert(main_config.themes,yon_char_new(MAIN_THEME_LABEL),yon_main_theme_new);
+    g_hash_table_insert(main_config.themes,yon_char_new("GNOME_THEME_LABEL"),yon_gnome_theme_new);
+    g_hash_table_insert(main_config.themes,yon_char_new("MAIN_THEME_LABEL"),yon_main_theme_new);
 }
\ No newline at end of file