diff --git a/README.markdown b/README.md
similarity index 83%
rename from README.markdown
rename to README.md
index 187d521..c9470db 100644
--- a/README.markdown
+++ b/README.md
@@ -26,11 +26,11 @@ Key mappings
 ```
 Colemak layout:                  |                 QWERTY layout:
 `12345 67890-=     Move around:  |  (instead of)   `12345 67890-=
- qwfpg jluy;[]\         e        |       k          qwert yuiop[]\
- arstd HNEIo'         h   i      |     h   l        asdfg HJKL;'
- zxcvb km,./            n        |       j          zxcvb nm,./
+ qwfpg jluy;[]\         i        |       k          qwert yuiop[]\
+ arstd hNEIO'         n   o      |     h   l        asdfg HJKL;'
+ zxcvb km,./            e        |       j          zxcvb nm,./
 
-(  novx)  h = h (Left)     i = l (Right)     e = k (Up)     n = j (Down)
+(  novx)  n = h (Left)     o = l (Right)     i = k (Up)     e = j (Down)
 
 (  novx)  l = b (Back word)            L = B (Back WORD)
 (  novx)  y = w (Forward word)         Y = W (Forward WORD)
@@ -39,11 +39,12 @@ Colemak layout:                  |                 QWERTY layout:
 (c     )  <C-L> = <C-Left> (Back WORD)
 (c     )  <C-Y> = <C-Right> (Seems to equal forward WORD minus 1 character)
 
-(  n  x)  a = v (Visual)   A = V (Visual line)
-(  n   )  r = r (Replace)  R = R (Replace)
-(  n   )  s = i (Insert)   S = I (Insert before first non-blank of line)
-(  n   )  t = a (Append)   T = A (Append at end of line)
-(  n   )  w = c (Change)   W = C (Change to end of line)  ww = cc (Change line)
+(  n  x)  a = v (Visual)                  A = V (Visual line)
+(  n   )  r = r (Replace)                 R = R (Replace)
+(  n   )  s = i (Insert)                  S = I (Insert before first non-blank of line)
+(  n   )  h = o (Insert new line below)   H = O (Insert new line above)
+(  n   )  t = a (Append)                  T = A (Append at end of line)
+(  n   )  w = c (Change)                  W = C (Change to end of line)  ww = cc (Change line)
 
 (  n  x)  z = u (Undo)    Z = <C-R> (Redo)  gz = U (Undo all latest changes on line)
 (  n  x)  x = x (Cut)     X = dd (Cut line)
@@ -65,10 +66,10 @@ Colemak layout:                  |                 QWERTY layout:
 (  n  x)  gK = K (Lookup)
 (  n  x)  gL = L (To line [count] from bottom of window)
 
-(  n  x)  <C-W>h = <C-W>h (Window left)
-(  n  x)  <C-W>n = <C-W>j (Window down)
-(  n  x)  <C-W>e = <C-W>k (Window up)
-(  n  x)  <C-W>i = <C-W>l (Window right)
+(  n  x)  <C-W>n = <C-W>h (Window left)
+(  n  x)  <C-W>e = <C-W>j (Window down)
+(  n  x)  <C-W>i = <C-W>k (Window up)
+(  n  x)  <C-W>o = <C-W>l (Window right)
 
 Lost:
 (  n  x)  H (To line [count] from top of window)
diff --git a/plugin/colemak.vim b/plugin/colemak.vim
index 81b43cb..599aa1e 100755
--- a/plugin/colemak.vim
+++ b/plugin/colemak.vim
@@ -10,10 +10,10 @@
     if v:version < 700 | echohl WarningMsg | echo "colemak.vim: You need Vim version 7.0 or later." | echohl None | finish | endif
 " }}}
 " Up/down/left/right {{{
-    nnoremap h h|xnoremap h h|onoremap h h|
-    nnoremap n j|xnoremap n j|onoremap n j|
-    nnoremap e k|xnoremap e k|onoremap e k|
-    nnoremap i l|xnoremap i l|onoremap i l|
+    nnoremap n h|xnoremap n h|onoremap n h|
+    nnoremap e j|xnoremap e j|onoremap e j|
+    nnoremap i k|xnoremap i k|onoremap i k|
+    nnoremap o l|xnoremap o l|onoremap o l|
 " }}}
 " Words forward/backward {{{
     " l/L = back word/WORD
@@ -28,11 +28,13 @@
     cnoremap <C-L> <C-Left>
     cnoremap <C-Y> <C-Right>
 " }}}
-" inSert/Replace/append (T) {{{
+" inSert/Replace/append (T)/new line {{{
     nnoremap s i|
     nnoremap S I|
     nnoremap t a|
     nnoremap T A|
+    nnoremap h o|
+    nnoremap H O|
 " }}}
 " Change {{{
     nnoremap w c|xnoremap w c|
@@ -88,8 +90,8 @@
     nnoremap gL L|xnoremap gL L|
 " }}}
 " Window handling {{{
-    nnoremap <C-W>h <C-W>h|xnoremap <C-W>h <C-W>h|
-    nnoremap <C-W>n <C-W>j|xnoremap <C-W>n <C-W>j|
-    nnoremap <C-W>e <C-W>k|xnoremap <C-W>e <C-W>k|
-    nnoremap <C-W>i <C-W>l|xnoremap <C-W>i <C-W>l|
+    nnoremap <C-W>n <C-W>h|xnoremap <C-W>n <C-W>h|
+    nnoremap <C-W>e <C-W>j|xnoremap <C-W>e <C-W>j|
+    nnoremap <C-W>i <C-W>k|xnoremap <C-W>i <C-W>k|
+    nnoremap <C-W>o <C-W>l|xnoremap <C-W>o <C-W>l|
 " }}}