diff --git a/global/.config/alacritty/alacritty.toml b/global/.config/alacritty/alacritty.toml
index 559a227..6b9b908 100644
--- a/global/.config/alacritty/alacritty.toml
+++ b/global/.config/alacritty/alacritty.toml
@@ -42,8 +42,8 @@ decorations = "Buttonless"
 dynamic_padding = false
 dynamic_title = true
 startup_mode = "Maximized"
-opacity = 0.8
-blur = true
+# opacity = 1
+# blur = false
 
 [window.padding]
 x = 2
diff --git a/global/.config/doom/config.el b/global/.config/doom/config.el
index c0cf7ff..0f0999d 100644
--- a/global/.config/doom/config.el
+++ b/global/.config/doom/config.el
@@ -43,12 +43,12 @@
 ;; (setq org-startup-with-inline-images t)
 ;; (add-hook 'org-mode-hook 'org-display-inline-images)
 
-;; (setq ispell-program-name "hunspell")
-;; (setq ispell-dictionary "en_US,ru_RU")
+(setq ispell-program-name "hunspell")
+(setq ispell-dictionary "en_US,ru_RU")
 
-;; (after! ispell
-;;   (ispell-set-spellchecker-params)
-;;   (ispell-hunspell-add-multi-dic "en_US,ru_RU"))
+(after! ispell
+  (ispell-set-spellchecker-params)
+  (ispell-hunspell-add-multi-dic "en_US,ru_RU"))
 
 (defun transform-square-brackets-to-round-ones(string-to-transform)
   "Transforms [ into ( and ] into ), other chars left unchanged."
@@ -161,7 +161,7 @@
 
         ("c" "Code To-Do"
          entry (file+headline "~/org/todos.org" "Code Related Tasks")
-         "* TODO [#C] %?\n:PROPERTIES:\n:Created: %T\n:END:\n%i\n*** Proposed Solution:\n"
+         "* TODO [#C] %?\n:PROPERTIES:\n:Created: %T\n:END:\n%i\n** Proposed Solution:\n"
          :empty-lines 0)
 
         ("w" "Selected web capture"
diff --git a/global/.config/jrnl/jrnl.yaml b/global/.config/jrnl/jrnl.yaml
index 75dd854..f144240 100644
--- a/global/.config/jrnl/jrnl.yaml
+++ b/global/.config/jrnl/jrnl.yaml
@@ -12,10 +12,10 @@ indent_character: '|'
 journals:
   default:
     display_format: markdown
-    encrypt: true
-    journal: /home/fz0x1/PKM/diary/diary.md
-linewrap: 79
+    encrypt: false
+    journal: /home/fz0x1/PKM/diary/diary.jrnl
+linewrap: 80
 tagsymbols: '@'
 template: false
 timeformat: '%F %r'
-version: v4.1
+version: v4.2
diff --git a/global/.config/nvim/after/syntax/jrnl.vim b/global/.config/nvim/after/syntax/jrnl.vim
new file mode 100644
index 0000000..c3c080d
--- /dev/null
+++ b/global/.config/nvim/after/syntax/jrnl.vim
@@ -0,0 +1,32 @@
+setlocal syntax=markdown
+setlocal textwidth=80
+setlocal spell
+
+syntax match jtag "@.\{-}\w\+"
+syntax match jyear /\[\d\{4}-\d\d-\d\d \d\d:\d\d:\d\{2\}\( [aApP][mM]\)\?\]/
+
+syntax region entryLine start=/\d\{4}-\d\d-\d\d \d\d:\d\d/ end=/$/ contains=jyear
+
+highlight def link jtag Constant
+highlight def link jyear Identifier
+highlight def entryLine ctermfg=250 guifg=Gray
+
+setlocal foldmethod=expr
+setlocal foldexpr=JrnlFoldExpr()
+
+function! JrnlFoldExpr()
+  let line = getline(v:lnum)
+
+  " Если строка начинается с даты [YYYY-MM-DD HH:MM:SS AM/PM]
+  if line =~ '^\[\d\{4}-\d\d-\d\d \d\d:\d\d:\d\{2\}\( [aApP][mM]\)\?\]'
+    return ">1" " Открываем новую свёртку (уровень 1)
+  endif
+
+  " Если строка - это Weather, Geo, или другие элементы
+  if line =~ '^-\s\+\w\+:'
+    return "1" " Оставляем эти строки внутри текущей свёртки
+  endif
+
+  " Все остальные строки не участвуют в свёртке
+  return "="
+endfunction
diff --git a/global/.config/nvim/ftplugin/jrnl.lua b/global/.config/nvim/ftplugin/jrnl.lua
deleted file mode 100644
index fd80435..0000000
--- a/global/.config/nvim/ftplugin/jrnl.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.opt_local.textwidth = 80
-vim.opt_local.colorcolumn = "80"
diff --git a/global/.config/nvim/lazy-lock.json b/global/.config/nvim/lazy-lock.json
index f44d461..9586fc6 100644
--- a/global/.config/nvim/lazy-lock.json
+++ b/global/.config/nvim/lazy-lock.json
@@ -25,10 +25,10 @@
   "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
   "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
   "nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ff2b85abaa810f6611233dbe6d31c07510ebf43d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" },
   "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
   "nvim-tree.lua": { "branch": "master", "commit": "68fc4c20f5803444277022c681785c5edd11916d" },
-  "nvim-treesitter": { "branch": "master", "commit": "eb3e850acff4d9f2f2dd8dacd75353043c899753" },
+  "nvim-treesitter": { "branch": "master", "commit": "7e0fcf0d456fc5818da1af35b1a3f5c784fce457" },
   "nvim-treesitter-context": { "branch": "master", "commit": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0" },
   "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
@@ -39,7 +39,7 @@
   "tagbar": { "branch": "master", "commit": "8de7694c0aeda253073098bbc9fb890b2902ddb8" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "toggleterm.nvim": { "branch": "main", "commit": "87b2d6a3cab8e2bd9a0255427074285f0365398d" },
+  "toggleterm.nvim": { "branch": "main", "commit": "344fc1810292785b3d962ddac2de57669e1a7ff9" },
   "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
   "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
   "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
diff --git a/global/.config/nvim/lua/plugins/conform.lua b/global/.config/nvim/lua/plugins/conform.lua
index a27a41b..16a6397 100644
--- a/global/.config/nvim/lua/plugins/conform.lua
+++ b/global/.config/nvim/lua/plugins/conform.lua
@@ -2,25 +2,6 @@ return {
 	"stevearc/conform.nvim",
 	opts = {
 		log_level = vim.log.levels.DEBUG,
-		formatters = {
-			prettier_markdown = {
-				command = "prettier",
-				args = {
-					"--stdin-filepath",
-					"$FILENAME",
-					"--config",
-					os.getenv("HOME") .. "/.prettierrc.yaml",
-					"--parser",
-					"markdown",
-				},
-				-- stdin = true,
-				-- options = {
-				-- 	ext_parsers = {
-				-- 		jrnl = { "markdown" },
-				-- 	},
-				-- },
-			},
-		},
 		icon = "", --'▎',
 		formatters_by_ft = {
 			lua = { "stylua" },
@@ -31,8 +12,7 @@ return {
 			typescriptreact = { "biome" },
 			json = { "biome" },
 			sh = { "shfmt" },
-			markdown = { "prettier_markdown" },
-			jrnl = { "prettier_markdown" },
+			markdown = { "prettier" },
 			["*"] = { "trim_whitespace", "codespell" },
 		},
 		format_on_save = {