diff --git a/generate_layout.rb b/generate_layout.rb
index 81b3f12..1946ede 100755
--- a/generate_layout.rb
+++ b/generate_layout.rb
@@ -304,7 +304,7 @@ keys = [
   %w{	6           	          	}, %w{	f6  	    	}, %w{	f6       	    	}, %w{	f6            	    	},
   #  	top         	          	      	    	    	      	         	    	      	              	    	  	
   #  	letter      	type      	      	punc	type	      	nav      	type	      	func          	type	  	
-  %w{	x           	          	}, %w{	~   	    	}, %w{	escape   	    	}, %w{	              	    	},	# 1.5
+  %w{	tab         	          	}, %w{	    	    	}, %w{	         	    	}, %w{	              	    	},	# 1.5
   %w{	x           	          	}, %w{	~   	    	}, %w{	escape   	    	}, %w{	              	    	},
   %w{	v           	          	}, %w{	[   	    	}, %w{	backspace	    	}, %w{	              	    	},
   %w{	l           	          	}, %w{	'   	    	}, %w{	enter    	    	}, %w{	              	    	},
diff --git a/src/keyboard/layout.c b/src/keyboard/layout.c
index d62d137..ed7a473 100644
--- a/src/keyboard/layout.c
+++ b/src/keyboard/layout.c
@@ -12,7 +12,7 @@ static const keycode PROGMEM _kb_layout[KB_LAYERS][KB_ROWS][KB_COLUMNS]
 (keycode) KEY_4_Dollar,
 (keycode) KEY_5_Percent,
 (keycode) KEY_6_Caret,
-(keycode) KEY_x_X,
+(keycode) KEY_Tab,
 (keycode) KEY_x_X,
 (keycode) KEY_v_V,
 (keycode) KEY_l_L,
@@ -95,7 +95,7 @@ KB_MATRIX_LAYER(
 (keycode) KEY_F4,
 (keycode) KEY_F5,
 (keycode) KEY_F6,
-(keycode) KEY_GraveAccent_Tilde,
+(keycode) KEY_Tab,
 (keycode) KEY_GraveAccent_Tilde,
 (keycode) KEY_LeftBracket_LeftBrace,
 (keycode) KEY_SingleQuote_DoubleQuote,
@@ -178,7 +178,7 @@ KB_MATRIX_LAYER(
 (keycode) KEY_F4,
 (keycode) KEY_F5,
 (keycode) KEY_F6,
-(keycode) KEY_Escape,
+(keycode) KEY_Tab,
 (keycode) KEY_Escape,
 (keycode) KEY_DeleteBackspace,
 (keycode) KEY_ReturnEnter,
@@ -261,7 +261,7 @@ KB_MATRIX_LAYER(
 (keycode) KEY_F4,
 (keycode) KEY_F5,
 (keycode) KEY_F6,
-(keycode) KEY_Escape,
+(keycode) KEY_Tab,
 (keycode) KEY_Escape,
 (keycode) KEY_DeleteBackspace,
 (keycode) KEY_ReturnEnter,
@@ -427,7 +427,7 @@ KB_MATRIX_LAYER(
 (keyfunc) &kbfun_normal_press_release,
 (keyfunc) &kbfun_normal_press_release,
 (keyfunc) &kbfun_normal_press_release,
-(keyfunc) &kbfun_shift_press_release,
+(keyfunc) &kbfun_normal_press_release,
 (keyfunc) &kbfun_shift_press_release,
 (keyfunc) &kbfun_normal_press_release,
 (keyfunc) &kbfun_normal_press_release,
@@ -759,7 +759,7 @@ KB_MATRIX_LAYER(
 (keyfunc) &kbfun_normal_press_release,
 (keyfunc) &kbfun_normal_press_release,
 (keyfunc) &kbfun_normal_press_release,
-(keyfunc) &kbfun_shift_press_release,
+(keyfunc) &kbfun_normal_press_release,
 (keyfunc) &kbfun_shift_press_release,
 (keyfunc) &kbfun_normal_press_release,
 (keyfunc) &kbfun_normal_press_release,