diff --git a/nvim/init.vim b/nvim/init.vim
index 95c3f6ab..14122a3f 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -110,34 +110,41 @@ inoremap let let = <left><esc>i
 "Insert a console.log()
 inoremap cll console.log()<esc>i
 
+"Shorten Template Literals
+inoremap `` `${}`<esc><left><left><left>i
+
 "Create class
-inoremap class class { constructor() {} }<left><left><left><left><left><left><left><left><left><left><left><left><left><left><left><left><left><left><left><esc>i
+inoremap class class {<return>constructor() {<return><return>}<return>}<up><up><up><up><right><right><right><right><right><right><esc>i
 
 "Create function
-inoremap fn function () {}<left><left><left><left><esc>i
+inoremap fn function () {<return><return>}<up><up><right><right><right><right><right><right><right><right><right><esc>i
 
 "Create standard for loop
-inoremap loo for (let i = 0; i <= ; i++) {}<left><left><left><left><left><left><left><left><esc>i
+inoremap loo for (let i = 0; i <= ; i++) {<return><return>}<up><up><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><right><esc>i
 
 "Create try catch statement
-inoremap cc try {} catch(err) {}<left><left><left><left><left><left><left><left><left><left><left><left><left><left><esc>i
+inoremap try try {<return><return>} <return>catch(err) {<return>console.error(err)<return>}<up><up><up><up><tab><tab><esc>i
 
 "Create arrow function
 inoremap => () => {}<left><left><left><left><left><left><esc>i
 
 "Create type comment
-inoremap ** /***/<left><esc>i
+inoremap ** /**<return><return>/<up><right><esc>i
 
 "If Statement
 inoremap if if ()<esc>i
 
 "Else If Statement
 inoremap elif else if ()<esc>i
-autocmd BufEnter *.{js,jsx,ts,tsx,vue} :syntax sync fromstart
-autocmd BufLeave *.{js,jsx,ts,tsx,vue} :syntax sync clear
+
+"Switch/Case Statement
+inoremap switch switch () { <return>case :<return><return>break <return>case :<return><return>break <return>default:<return><return>}<up><up><up><up><up><up><up><up><up><right><right><right><right><right><right><right><right><esc>i
 
 """
 
+autocmd BufEnter *.{js,jsx,ts,tsx,vue} :syntax sync fromstart
+autocmd BufLeave *.{js,jsx,ts,tsx,vue} :syntax sync clear
+
 " ctrlp
 let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']