diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index 9c399f7a..f51f5cfa 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -287,6 +287,8 @@
   <https://github.com/nvim-treesitter/nvim-treesitter/blob/main/plugin/filetypes.lua>.
   This is mostly use full for Markdown code block injections.
 
+- Added some Tree-sitter filetype mappings for `ash`, `dash` and `zsh`.
+
 - Added `vim.lsp.presets.<name>` to contain LSP configurations. This allows for
   more flexibility in nvf and reuse of LSPs across languages. Dropped
   `deprecatedSingleOrListOf` in favor of `listOf` for the affected LSP options.
diff --git a/modules/plugins/languages/bash.nix b/modules/plugins/languages/bash.nix
index be1eaca9..6ae23d73 100644
--- a/modules/plugins/languages/bash.nix
+++ b/modules/plugins/languages/bash.nix
@@ -95,15 +95,19 @@ in {
 
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.treesitter.enable {
-      vim.treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.package];
+      vim.treesitter = {
+        enable = true;
+        grammars = [cfg.treesitter.package];
+        # not perfect mappings, but better than none
+        filetypeMappings.bash = ["ash" "dash" "zsh"];
+      };
     })
 
     (mkIf cfg.lsp.enable {
       vim.lsp = {
         presets = genAttrs cfg.lsp.servers (_: {enable = true;});
         servers = genAttrs cfg.lsp.servers (_: {
-          filetypes = ["bash" "sh" "zsh"];
+          filetypes = ["bash" "sh" "ash" "dash" "zsh"];
         });
       };
     })
diff --git a/modules/plugins/languages/typescript.nix b/modules/plugins/languages/typescript.nix
index 90749358..297cc1c0 100644
--- a/modules/plugins/languages/typescript.nix
+++ b/modules/plugins/languages/typescript.nix
@@ -158,8 +158,6 @@ in {
   };
 
   config = mkIf cfg.enable (mkMerge [
-    {vim.globals.markdown_fenced_languages = ["ts=typescript"];}
-
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
       vim.treesitter.grammars = [