diff --git a/Makefile b/Makefile
index c258640..be4d65b 100644
--- a/Makefile
+++ b/Makefile
@@ -126,6 +126,7 @@ install: check uninstall
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
 	@install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
 	@install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/csv/" "locales.csv"
+	@install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/csv/" "fonts.csv"
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
diff --git a/fonts.csv b/fonts.csv
new file mode 100644
index 0000000..e09d0b7
--- /dev/null
+++ b/fonts.csv
@@ -0,0 +1,2 @@
+cyr-sun16
+terminus-bold-16
\ No newline at end of file
diff --git a/source/ubl-settings-system.c b/source/ubl-settings-system.c
index 3f6cf2a..91ae403 100644
--- a/source/ubl-settings-system.c
+++ b/source/ubl-settings-system.c
@@ -166,7 +166,8 @@ void yon_config_global_load(GtkWidget *self, main_window *widgets){
         int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->fontlist),&iter);
         for(;valid;gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->fontlist),&iter)){
             gtk_tree_model_get(GTK_TREE_MODEL(widgets->fontlist),&iter,1,&code,-1);
-            if (code&&!strcmp(code,cons_font)) gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widgets->ConsoleFontCombo),&iter);
+            if (code&&!strcmp(code,cons_font)){ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widgets->ConsoleFontCombo),&iter); break; }
+            else { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConsoleFontCombo),0); }
         }
     }
     char *lang = yon_config_get_by_key(language_parameter);
@@ -174,7 +175,8 @@ void yon_config_global_load(GtkWidget *self, main_window *widgets){
         int valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->languagelist),&iter);
         for(;valid;valid=gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->languagelist),&iter)){
             gtk_tree_model_get(GTK_TREE_MODEL(widgets->languagelist),&iter,1,&code,-1);
-            if (!strcmp(code,lang)) gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widgets->LanguageCombo),&iter);
+            if (!strcmp(code,lang)){ gtk_combo_box_set_active_iter(GTK_COMBO_BOX(widgets->LanguageCombo),&iter); break; }
+            else { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0); }
         }
     }
 
diff --git a/source/ubl-settings-system.h b/source/ubl-settings-system.h
index cff1157..4fec797 100644
--- a/source/ubl-settings-system.h
+++ b/source/ubl-settings-system.h
@@ -31,7 +31,8 @@
 #define config_local_load_command "ubconfig --source system get "
 
 #define get_locales_command "grep '' /usr/share/ubl-settings-system/csv/locales.csv"
-#define get_fonts_command "ls /usr/share/kbd/consolefonts/ |grep -v \"README\"|grep -oE \"^[-a-zA-Z0-9_]{3,}.psf\"|sed -e 's/\\.psf//g'"
+#define get_fonts_command "grep '' /usr/share/ubl-settings-system/csv/fonts.csv"
+// #define get_fonts_command "ls /usr/share/kbd/consolefonts/ |grep -v \"README\"|grep -oE \"^[-a-zA-Z0-9_]{3,}.psf\"|sed -e 's/\\.psf//g'"
 
 typedef char* string;
 string version_application;