diff --git a/generate_layout.rb b/generate_layout.rb
index 94a3e81..5432d26 100755
--- a/generate_layout.rb
+++ b/generate_layout.rb
@@ -278,11 +278,11 @@ keys = [
   #  	home        	          	      	    	       	      	         	    	      	    	    	  	
   #  	letter      	type      	      	punc	type   	      	nav      	type	      	func	type	  	
   %w{	umlaut      	          	}, %w{	    	       	}, %w{	         	    	}, %w{	    	    	},	# 1.5
-  %w{	u           	          	}, %w{	,   	       	}, %w{	left     	    	}, %w{	    	    	},
-  %w{	i           	          	}, %w{	\{  	shifted	}, %w{	up       	    	}, %w{	    	    	},
-  %w{	a           	          	}, %w{	?   	shifted	}, %w{	down     	    	}, %w{	    	    	},
-  %w{	e           	          	}, %w{	!   	shifted	}, %w{	right    	    	}, %w{	    	    	},
-  %w{	o           	          	}, %w{	(   	shifted	}, %w{	tab      	    	}, %w{	    	    	},
+  %w{	u           	          	}, %w{	,   	       	}, %w{	left     	    	}, %w{	f1  	    	},
+  %w{	i           	          	}, %w{	\{  	shifted	}, %w{	up       	    	}, %w{	f1  	    	},
+  %w{	a           	          	}, %w{	?   	shifted	}, %w{	down     	    	}, %w{	f1  	    	},
+  %w{	e           	          	}, %w{	!   	shifted	}, %w{	right    	    	}, %w{	f1  	    	},
+  %w{	o           	          	}, %w{	(   	shifted	}, %w{	tab      	    	}, %w{	f1  	    	},
   #  	bottom      	          	      	    	       	      	         	    	      	    	    	  	
   #  	letter      	type      	      	punc	type   	      	nav      	type	      	func	type	  	
   %w{	shift_l     	capslock  	}, %w{	    	       	}, %w{	         	    	}, %w{	    	    	},	# 1.5
@@ -360,8 +360,8 @@ keys = [
   %w{	right       	          	}, %w{	    	       	}, %w{	         	    	}, %w{	    	    	},
   #  	thumb-top   	          	      	    	       	      	         	    	      	    	    	  	
   #  	letter      	type      	      	punc	type   	      	nav      	type	      	func	type	  	
-  %w{	            	          	}, %w{	    	       	}, %w{	         	    	}, %w{	    	    	},
-  %w{	            	          	}, %w{	    	       	}, %w{	         	    	}, %w{	    	    	},
+  %w{	punc        	punc      	}, %w{	    	       	}, %w{	func     	func	}, %w{	    	    	},
+  %w{	nav         	nav       	}, %w{	func	func   	}, %w{	         	    	}, %w{	    	    	},
   #  	thumb-double	          	      	    	       	      	         	    	      	    	    	  	
   #  	letter      	type      	      	punc	type   	      	nav      	type	      	func	type	  	
   %w{	menu        	          	}, %w{	    	       	}, %w{	         	    	}, %w{	    	    	},
diff --git a/src/keyboard/ergodox/layout/saneo-mod.c b/src/keyboard/ergodox/layout/saneo-mod.c
index 5c33080..9776a9c 100644
--- a/src/keyboard/ergodox/layout/saneo-mod.c
+++ b/src/keyboard/ergodox/layout/saneo-mod.c
@@ -85,8 +85,8 @@ KEY_LeftArrow,
 KEY_UpArrow,
 KEY_DownArrow,
 KEY_RightArrow,
-NULL,
-NULL,
+1,
+2,
 KEY_Application,
 KEY_LeftAlt,
 1,
@@ -169,7 +169,7 @@ NULL,
 NULL,
 NULL,
 NULL,
-NULL,
+3,
 NULL,
 NULL,
 1,
@@ -251,7 +251,7 @@ NULL,
 NULL,
 NULL,
 NULL,
-NULL,
+3,
 NULL,
 NULL,
 NULL,
@@ -277,11 +277,11 @@ NULL,
 NULL,
 NULL,
 NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
+KEY_F1,
+KEY_F1,
+KEY_F1,
+KEY_F1,
+KEY_F1,
 NULL,
 NULL,
 NULL,
@@ -417,8 +417,8 @@ const void_funptr_t PROGMEM _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUMNS]   =
 &kbfun_press_release,
 &kbfun_press_release,
 &kbfun_press_release,
-&kbfun_transparent,
-&kbfun_transparent,
+&kbfun_layer_push_1,
+&kbfun_layer_push_2,
 &kbfun_press_release,
 &kbfun_press_release,
 &kbfun_layer_sticky_1,
@@ -501,7 +501,7 @@ KB_MATRIX_LAYER(
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_transparent,
-&kbfun_transparent,
+&kbfun_layer_push_3,
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_layer_push_1,
@@ -583,7 +583,7 @@ KB_MATRIX_LAYER(
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_transparent,
-&kbfun_transparent,
+&kbfun_layer_push_3,
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_transparent,
@@ -609,11 +609,11 @@ KB_MATRIX_LAYER(
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_transparent,
-&kbfun_transparent,
-&kbfun_transparent,
-&kbfun_transparent,
-&kbfun_transparent,
-&kbfun_transparent,
+&kbfun_press_release,
+&kbfun_press_release,
+&kbfun_press_release,
+&kbfun_press_release,
+&kbfun_press_release,
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_transparent,
@@ -749,8 +749,8 @@ const void_funptr_t PROGMEM _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COLUMNS] =
 &kbfun_press_release,
 &kbfun_press_release,
 &kbfun_press_release,
-&kbfun_transparent,
-&kbfun_transparent,
+&kbfun_layer_pop_1,
+&kbfun_layer_pop_2,
 &kbfun_press_release,
 &kbfun_press_release,
 &kbfun_layer_sticky_1,
@@ -833,7 +833,7 @@ KB_MATRIX_LAYER(
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_transparent,
-&kbfun_transparent,
+&kbfun_layer_pop_3,
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_layer_pop_1,
@@ -915,7 +915,7 @@ KB_MATRIX_LAYER(
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_transparent,
-&kbfun_transparent,
+&kbfun_layer_pop_3,
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_transparent,
@@ -941,11 +941,11 @@ KB_MATRIX_LAYER(
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_transparent,
-&kbfun_transparent,
-&kbfun_transparent,
-&kbfun_transparent,
-&kbfun_transparent,
-&kbfun_transparent,
+&kbfun_press_release,
+&kbfun_press_release,
+&kbfun_press_release,
+&kbfun_press_release,
+&kbfun_press_release,
 &kbfun_transparent,
 &kbfun_transparent,
 &kbfun_transparent,