diff --git a/.emacs.d/emacs-custom.el b/.emacs.d/emacs-custom.el
index 2dde3d7..f553052 100644
--- a/.emacs.d/emacs-custom.el
+++ b/.emacs.d/emacs-custom.el
@@ -7,7 +7,9 @@
  '(livedown-browser nil)
  '(livedown-open t)
  '(livedown-port 1337)
- '(package-selected-packages (quote (markdown-mode magit dracula-theme use-package))))
+ '(package-selected-packages
+   (quote
+    (ox-jira use-package switch-window ox-reveal markdown-mode magit htmlize dracula-theme))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 4f090f8..ab5c46f 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,4 +1,4 @@
-; Packages
+;Packages
 
 ;; package archives
 (require 'package)
@@ -36,6 +36,13 @@
 (global-set-key (kbd "C-x j") 'awesome-tab-backward-tab)
 (global-set-key (kbd "C-x k") 'awesome-tab-forward-tab)
 
+;; 80-charaters mode 
+(add-hook 'text-mode-hook 'auto-fill-mode)
+(setq-default fill-column 80)
+
+(add-hook 'org-mode-hook '(lambda () (setq fill-column 80)))
+(add-hook 'org-mode-hook 'auto-fill-mode)
+
 ;; Switch-window
 (use-package switch-window
   :ensure t
diff --git a/.vimrc-gentoo b/.vimrc-gentoo
index 7f37061..b90a0c6 100644
--- a/.vimrc-gentoo
+++ b/.vimrc-gentoo
@@ -18,6 +18,7 @@ Plug 'vimwiki/vimwiki'
 Plug 'nmante/vim-latex-live-preview'
 Plug 'lervag/vimtex'
 Plug 'junegunn/goyo.vim'
+Plug 'jceb/vim-orgmode'
 Plug 'prettier/vim-prettier', { 'do': 'npm install --force' }
 Plug 'iamcco/markdown-preview.nvim', { 'do': 'npm install --force' }
 " Problem with vim-prettier
@@ -27,10 +28,13 @@ Plug 'iamcco/markdown-preview.nvim', { 'do': 'npm install --force' }
 call plug#end()
 
 " Vim wiki
-"let g:vimwiki_list = [{'path': '~/git/notes', 'syntax': 'markdown', 'ext': '.md'}]
-let vimwiki_path=$HOME.'/git/notes/'
-let vimwiki_html_path=$HOME.'/vimwiki_html/'
-let g:vimwiki_list = [{'path_html':vimwiki_html_path, 'syntax':'markdown', 'ext':'.md', 'custom_wiki2html':$HOME.'/.vim/plugged/vimwiki/autoload/vimwiki/customwiki2html.sh'}]
+let wiki = {}
+let wiki.path = '~/git/notes/'
+let wiki.path_html = '~/vimwiki_html/'
+let wiki.syntax = 'default'
+let wiki.ext = '.wiki'
+let g:vimwiki_list = [wiki]
+let g:vimwiki_table_mappings = 0
 
 " Status-line
 set statusline=