diff --git a/nvim/colors/dotfiles.vim b/nvim/colors/dotfiles.vim
index 22ada40..a181605 100644
--- a/nvim/colors/dotfiles.vim
+++ b/nvim/colors/dotfiles.vim
@@ -419,3 +419,9 @@
   hi! link zshFunction Function
   hi! link zshVariable Variable
 " }}}
+
+" Assembly {{{
+  hi! def link riscvRegister    Variable
+  hi! def link riscvCSRegister  Special
+  hi! def link riscvLabel       Function
+" }}}
diff --git a/nvim/dotfiles/plugins-list.vim b/nvim/dotfiles/plugins-list.vim
index 2993e99..6a49609 100644
--- a/nvim/dotfiles/plugins-list.vim
+++ b/nvim/dotfiles/plugins-list.vim
@@ -60,6 +60,7 @@
   Plug 'sheerun/vim-polyglot'
   Plug 'chikamichi/mediawiki.vim'
   Plug 'ron-rs/ron.vim'
+  Plug 'kylelaker/riscv.vim'
   if g:vim_ide
     Plug 'neoclide/coc.nvim', { 'branch': 'release' }
     Plug 'dag/vim2hs'
diff --git a/nvim/plugin/editing.vim b/nvim/plugin/editing.vim
index 5d796fa..de0e614 100644
--- a/nvim/plugin/editing.vim
+++ b/nvim/plugin/editing.vim
@@ -272,9 +272,11 @@ set commentstring=//%s
   " Make an alias for the comment text object
   omap <silent> gc ac
 
-  let g:tcomment#ignore_comment_def = ['asm']
   let g:tcomment#commentstring_c = '// %s'
 
+  call tcomment#type#Define('asm',   '# %s')
+  call tcomment#type#Define('riscv', '# %s')
+
 " }}}