diff --git a/front-end b/front-end
index 810782a..a78db76 160000
--- a/front-end
+++ b/front-end
@@ -1 +1 @@
-Subproject commit 810782a7f299272b9ebfe0ae3c5087bc0fe9c59d
+Subproject commit a78db7632754694ddd9ab841f84dfef6ad09313c
diff --git a/user/screen.c b/user/screen.c
index 49b611b..da5204b 100644
--- a/user/screen.c
+++ b/user/screen.c
@@ -184,10 +184,10 @@ terminal_restore_defaults(void)
 	termconf->config_version = TERMCONF_VERSION;
 	termconf->display_cooldown_ms = SCR_DEF_DISPLAY_COOLDOWN_MS;
 	termconf->loopback = false;
-	termconf->show_buttons = true;
-	termconf->show_config_links = true;
-	termconf->cursor_shape = CURSOR_BLOCK_BL;
-	termconf->crlf_mode = false;
+	termconf->show_buttons = SCR_DEF_SHOW_BUTTONS;
+	termconf->show_config_links = SCR_DEF_SHOW_MENU;
+	termconf->cursor_shape = SCR_DEF_CURSOR_SHAPE;
+	termconf->crlf_mode = SCR_DEF_CRLF;
 }
 
 /**
diff --git a/user/screen.h b/user/screen.h
index 3ae7f04..98b9921 100644
--- a/user/screen.h
+++ b/user/screen.h
@@ -37,27 +37,24 @@
 // Size designed for the terminal config structure
 // Must be constant to avoid corrupting user config after upgrade
 #define TERMCONF_SIZE 300
+#define TERMCONF_VERSION 4
 
 #define TERM_BTN_LEN 10
 #define TERM_BTN_MSG_LEN 10
 #define TERM_TITLE_LEN 64
 #define TERM_BTN_COUNT 5
 
-#define SCR_DEF_DISPLAY_TOUT_MS 10
-#define SCR_DEF_DISPLAY_COOLDOWN_MS 30
+#define SCR_DEF_DISPLAY_TOUT_MS 12
+#define SCR_DEF_DISPLAY_COOLDOWN_MS 35
 #define SCR_DEF_PARSER_TOUT_MS 10
 #define SCR_DEF_FN_ALT_MODE true // true - SS3 codes, easier to parse & for xterm compatibility
-#define SCR_DEF_WIDTH 26
-#define SCR_DEF_HEIGHT 10
+#define SCR_DEF_WIDTH 80
+#define SCR_DEF_HEIGHT 25
 #define SCR_DEF_TITLE "ESPTerm"
 
 /** Maximum screen size (determines size of the static data array) */
 #define MAX_SCREEN_SIZE (80*25)
 
-#define TERMCONF_VERSION 4
-
-// --- Persistent Settings ---
-
 enum CursorShape {
 	CURSOR_BLOCK_BL = 0,
 	CURSOR_DEFAULT  = 1, // this is translated to a user configured style
@@ -68,6 +65,13 @@ enum CursorShape {
 	CURSOR_BAR = 6,
 };
 
+#define SCR_DEF_SHOW_BUTTONS 0
+#define SCR_DEF_SHOW_MENU 1
+#define SCR_DEF_CURSOR_SHAPE CURSOR_BLOCK_BL
+#define SCR_DEF_CRLF 0
+
+
+// --- Persistent Settings ---
 #define CURSOR_BLINKS(shape) ((shape)==CURSOR_BLOCK_BL||(shape)==CURSOR_UNDERLINE_BL||(shape)==CURSOR_BAR_BL)
 
 typedef struct {