diff --git a/global/.config/nvim/lua/core/autocmds.lua b/global/.config/nvim/lua/core/autocmds.lua
index 9c845e3..5148020 100644
--- a/global/.config/nvim/lua/core/autocmds.lua
+++ b/global/.config/nvim/lua/core/autocmds.lua
@@ -39,3 +39,8 @@ vim.api.nvim_create_autocmd({ "BufNewFile", "BufReadPre" }, {
 		vim.o.secure = true
 	end,
 })
+
+vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+	pattern = "*.jrnl",
+	command = "set filetype=markdown",
+})
diff --git a/global/.config/nvim/lua/core/options.lua b/global/.config/nvim/lua/core/options.lua
index 2e9d4a6..b1ad302 100644
--- a/global/.config/nvim/lua/core/options.lua
+++ b/global/.config/nvim/lua/core/options.lua
@@ -132,8 +132,8 @@ vim.opt.langmap = {
 	"Ё/",
 }
 
-M.zettelkasten_dir = vim.fn.expand("~/PKM/00-zettelkasten/")
-M.resources_dir = vim.fn.expand("~/PKM/300-resources/")
+M.zettelkasten_dir = vim.fn.expand("~/PKM/01 - zettelkasten/")
+M.resources_dir = vim.fn.expand("~/PKM/05 - resources/")
 M.pkm_dir = vim.fn.expand("~/PKM/")
 
 return M
diff --git a/global/.zshrc b/global/.zshrc
index f62e0cd..d0a2c0a 100644
--- a/global/.zshrc
+++ b/global/.zshrc
@@ -45,6 +45,21 @@ ex ()
   fi
 }
 
+diary ()
+{
+  if [[ ! -v "$1" ]]; then
+    arg1=1
+  else
+    arg1="$1"
+  fi
+
+  if [[ "$2" == "md" ]]; then
+    jrnl -n "$arg1" | glow
+  else
+    jrnl -n "$arg1"
+  fi
+}
+
 
 # aliases
 ## tmux
@@ -63,16 +78,16 @@ alias zshs='. ~/.zshrc'
 ## neomutt
 alias nm='neomutt'
 ## vim
-alias ovim='vim' # original vim
-alias diary='ovim ~/vimwiki/diary/diary.asc.md'
+# alias ovim='vim' # original vim
+# alias diary='ovim ~/vimwiki/diary/diary.asc.md'
 ## nvim
 alias evim='nvim ~/.dotfiles/global/.config/nvim/'
 alias kvim='nvim ~/PKM/'
 alias cvim='nvim ~/.zshrc'
 alias tvim='nvim ~/Dropbox/TODO/'
-alias kvimr='nvim ~/PKM/300-resources/'
-alias kvimj='nvim ~/PKM/1-journal/'
-alias jvim='nvim ~/PKM/1-journal/$(date "+%Y-%m-%d").md'
+alias kvimr='nvim ~/PKM/05 - resources/'
+alias kvimj='nvim ~/PKM/02 - journal/'
+alias jvim='nvim ~/PKM/02 - journal/$(date "+%Y-%m-%d").md'
 # alias vim='nvim'
 alias vi='nvim'
 alias v='nvim'
@@ -93,6 +108,8 @@ alias to="toipe"
 ## jrnl.sh
 setopt HIST_IGNORE_SPACE
 alias jrnl=" jrnl"
+alias lj="jrnl -n 3 --format json | jq '.entries[].date'"
+alias di=" eton diary"
 ## jupyter
 alias jup="jupyter lab"
 ## hledger
diff --git a/global/scripts/vimwiki_diary_template b/global/scripts/vimwiki_diary_template
index c5887a9..fa6a330 100755
Binary files a/global/scripts/vimwiki_diary_template and b/global/scripts/vimwiki_diary_template differ