diff --git a/readme.md b/readme.md
index 2475aca..ca9a7d6 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,3 @@
 # .dotfiles
 
-Moving to *Colemak*
-
+Moving to _Colemak_
diff --git a/vscode/vscode.vimrc b/vscode/vscode.vimrc
index 59ede03..b7e7690 100644
--- a/vscode/vscode.vimrc
+++ b/vscode/vscode.vimrc
@@ -9,15 +9,122 @@ noremap n j
 noremap e k
 noremap i l
 
+" Switch between tabs
+noremap H :bprevious<CR>
+noremap I :bnext<CR>
+
+noremap N 5j
+noremap E 5k
+
 " Similar position to i
 noremap l i
 noremap L I
 " ne[k]st
 noremap k n
 noremap K N
-" [j]ump 
+" [j]ump
 noremap j e
 noremap J E
 
 " Y to yank to end of line
-noremap Y y$
\ No newline at end of file
+noremap Y y$
+
+" 分词版本的w和b，支持中文，需要插件
+" Comment if you don't use cjk or the plugin
+noremap w cjkWordHandler.cursorWordEndRight
+noremap b cjkWordHandler.cursorWordStartLeft
+
+" keep selection after indent (define in settings.json)
+" voremap < <gv
+" voremap > >gv
+
+" lsp
+noremap gi editor.action.goToImplementation
+noremap gpi editor.action.peekImplementation
+noremap gd editor.action.goToDefinition
+noremap gpd editor.action.peekDefinition
+noremap gt editor.action.goToTypeDefinition
+noremap gpt editor.action.peekTypeDefinition
+noremap gh editor.action.showDefinitionPreviewHover
+
+noremap <leader><leader> workbench.action.quickOpen
+noremap <leader>: workbench.action.showCommands
+" <leader>q : +quit
+noremap <leader>qq :quit<CR>
+noremap <leader>qQ :qall<CR>
+noremap <leader>Q :quit<CR>
+" <leader>w : +write/window
+noremap <leader>ww :write<CR>
+noremap <leader>wa :wall<CR>
+noremap <leader>wq :wq<CR>
+noremap <leader>W :write<CR>
+noremap <leader>wh workbench.action.focusLeftGroup
+noremap <leader>wH workbench.action.splitEditorLeft
+noremap <leader>wn workbench.action.focusBelowGroup
+noremap <leader>wN workbench.action.splitEditorDown
+noremap <leader>we workbench.action.focusAboveGroup
+noremap <leader>wE workbench.action.splitEditorUp
+noremap <leader>wi workbench.action.focusRightGroup
+noremap <leader>wI workbench.action.splitEditorRight
+" <leader>f : +find/file
+noremap <leader>ff workbench.action.quickOpen
+noremap <leader>fF workbench.view.search
+noremap <leader>fc workbench.action.openSettings
+noremap <leader>fC workbench.action.openFolderSettingsFile
+noremap <leader>fe workbench.view.explorer
+noremap <leader>fr workbench.action.showAllEditorsByMostRecentlyUsed
+noremap <leader>fR workbench.action.openRecent
+noremap <leader>fs workbench.action.search.toggleQueryDetails
+noremap <leader>ft workbench.action.terminal.toggleTerminal
+noremap <leader>fx workbench.view.extensions
+" <leader>p : +project (requires Project Manager extension)
+noremap <leader>pp projectManager.listProjects
+noremap <leader>pP projectManager.listAnyProjects#sideBarAny
+noremap <leader>pc projectManager.openSettings#sideBarAny
+noremap <leader>pe projectManager.editProjects
+noremap <leader>pf projectManager.addToFavorites
+noremap <leader>pF projectManager.filterProjectsByTag
+noremap <leader>pg projectManager.listGitProjects#sideBarGit
+noremap <leader>pr workbench.action.openRecent
+noremap <leader>ps projectManager.saveProject
+" <leader>g : +git
+noremap <leader>gg workbench.view.scm
+noremap <leader>gS git.stageAll
+" <leader>j : +jump
+noremap <leader>jj workbench.action.gotoLine
+" <leader>l : +language (define in settings.json)
+" <leader>u : +ui
+noremap <leader>ui workbench.action.selectTheme
+noremap <leader>uw editor.action.toggleWordWrap
+noremap <leader>uz workbench.action.toggleZenMode
+" <leader>a : +ai/action
+noremap <leader>aa inlineChat.start
+noremap <leader>aA workbench.panel.chat
+noremap <leader>ae workbench.action.chat.openEditSession
+" <leader>r : +refactor
+" <leader>s : +search
+" <leader>t : +test
+noremap <leader>tt testing.runAll
+noremap <leader>tT testing.debugAll
+noremap <leader>ta testing.runAll
+noremap <leader>tA testing.debugAll
+noremap <leader>tf testing.reRunFailedTests
+noremap <leader>tF testing.debugFailedTests
+noremap <leader>tl testing.reRunLastRun
+noremap <leader>tL testing.debugLastRun
+noremap <leader>tc testing.runCurrentTest
+noremap <leader>tC testing.debugCurrentTest
+noremap <leader>tx testing.cancelTestRun
+" <leader>d : +debug
+" <leader>h : +help
+" <leader>c : +code
+noremap <leader>cr coderunner.run
+noremap <leader>cf editor.action.formatDocument
+noremap <leader>c<leader> editor.action.trimTrailingWhitespace
+noremap <leader>cs workbench.action.gotoSymbol
+noremap <leader>cS workbench.action.showAllSymbols
+" <leader>b : +buffer
+noremap <leader>bb workbench.action.showAllEditors
+noremap <leader>bd :bdelete<CR>
+noremap <leader>bh :bprevious<CR>
+noremap <leader>bi :bnext<CR>
diff --git a/win/ahk/main.ahk b/win/ahk/main.ahk
index 705eec7..519a77d 100644
--- a/win/ahk/main.ahk
+++ b/win/ahk/main.ahk
@@ -1,32 +1,33 @@
-; TODO: Update to AHK v2
-#[::
-Run, C:\Users\citoy\AppData\Local\Programs\Microsoft VS Code\Code.exe
-return
-#]::
-Run, C:\Program Files\Neovide\neovide.exe
-return
-#b::
-Run, C:\Program Files\Zotero\zotero.exe
-return
-#f::
-Run, C:\Program Files\GPSoftware\Directory Opus\dopus.exe
-return
-#q::
-Send !{F4}
-return
-#r::
-Run, C:\Program Files\WindowsApps\Microsoft.WindowsTerminal_1.21.3231.0_x64__8wekyb3d8bbwe\wt.exe
-return
+#Requires AutoHotkey v2.0
+
+; #b::
+; Run '"C:\Program Files\Zotero\zotero.exe"'
+; return
+
+; #f::
+; Run '"C:\Program Files\GPSoftware\Directory Opus\dopus.exe"'
+; return
+
+; #q::
+; Send '!{F4}'
+; return
+
+; #r::
+; Run '"C:\Program Files\WindowsApps\Microsoft.WindowsTerminal_1.21.3231.0_x64__8wekyb3d8bbwe\wt.exe"'
+; return
 
 #h::
-Send {Left}
+Send '{Left}'
 return
+
 #n::
-Send {Down}
+Send '{Down}'
 return
+
 #e::
-Send {Up}
+Send '{Up}'
 return
+
 #i::
-Send {Right}
+Send '{Right}'
 return