diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix
index 75ec486..99eb821 100644
--- a/home/features/cli/default.nix
+++ b/home/features/cli/default.nix
@@ -7,10 +7,15 @@
     ./starship.nix
     ./tmux.nix
   ];
-  programs.autojump = {
+  programs.zoxide = {
     enable = true;
     enableFishIntegration = true;
   };
+  programs.fzf = {
+    enable = true;
+    enableFishIntegration = true;
+    tmux.enableShellIntegration = true;
+  };
   home.packages = with pkgs; [
     bc
     busybox
@@ -21,6 +26,7 @@
     htop
     httpie
     jq
+    neovim
     procs
     progress
     ripgrep
diff --git a/home/features/cli/tmux.nix b/home/features/cli/tmux.nix
index 1a5bc36..70fe81b 100644
--- a/home/features/cli/tmux.nix
+++ b/home/features/cli/tmux.nix
@@ -14,46 +14,48 @@ in {
       shortcut = "a";
       keyMode = "vi";
       clock24 = true;
+      plugins = with pkgs.tmuxPlugins; [ sensible yank ];
       extraConfig = ''
-        # Enable mouse mode (tmux 2.1 and above)
-        set -g mouse on
+         
+        set-option -sa terminal-overrides ",xterm*:Tc"             
+           # Enable mouse mode (tmux 2.1 and above)
+           set -g mouse on
 
-        # split panes using | and -
-        bind | split-window -h
-        bind - split-window -v
-        unbind '"'
-        unbind %
+           # split panes using | and -
+           bind | split-window -h
+           bind - split-window -v
+           unbind '"'
+           unbind %
 
-        # change status bar color
-        bind-key r source-file ~/.tmux.conf \; display-message "Konfiguration neu geladen"
+           bind-key r source-file ~/.tmux.conf \; display-message "Konfiguration neu geladen"
 
-        # status bar theme
-        set -g status-bg 'colour235'
-        #set -g message-command-fg 'colour222'
-        set -g status-justify 'centre'
-        set -g status-left-length '100'
-        set -g status 'on'
-        #set -g pane-active-border-fg 'colour154'
-        #set -g message-bg 'colour238'
-        set -g status-right-length '100'
-        #set -g status-right-attr 'none'
-        #set -g message-fg 'colour222'
-        #set -g message-command-bg 'colour238'
-        #set -g status-attr 'none'
-        #set -g status-utf8 'on'
-        #set -g pane-border-fg 'colour238'
-        #set -g status-left-attr 'none'
-        #setw -g window-status-fg 'colour121'
-        #setw -g window-status-attr 'none'
-        #setw -g window-status-activity-bg 'colour235'
-        #setw -g window-status-activity-attr 'none'
-        #setw -g window-status-activity-fg 'colour154'
-        setw -g window-status-separator ' '
-        #setw -g window-status-bg 'colour235'
-        set -g status-left '#[fg=colour232,bg=colour154] #S #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #W #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] #(whoami)  #(uptime  | cut -d " " -f 1,2,3) #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
-        set -g status-right '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] %r  %a  %Y #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #H #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour232,bg=colour154] #(rainbarf --battery --remaining --no-rgb) '
-        setw -g window-status-format '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[default] #I  #W #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
-        setw -g window-status-current-format '#[fg=colour235,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #I  #W  #F #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]'
+           # status bar theme
+           set -g status-bg 'colour235'
+           #set -g message-command-fg 'colour222'
+           set -g status-justify 'centre'
+           set -g status-left-length '100'
+           set -g status 'on'
+           #set -g pane-active-border-fg 'colour154'
+           #set -g message-bg 'colour238'
+           set -g status-right-length '100'
+           #set -g status-right-attr 'none'
+           #set -g message-fg 'colour222'
+           #set -g message-command-bg 'colour238'
+           #set -g status-attr 'none'
+           #set -g status-utf8 'on'
+           #set -g pane-border-fg 'colour238'
+           #set -g status-left-attr 'none'
+           #setw -g window-status-fg 'colour121'
+           #setw -g window-status-attr 'none'
+           #setw -g window-status-activity-bg 'colour235'
+           #setw -g window-status-activity-attr 'none'
+           #setw -g window-status-activity-fg 'colour154'
+           setw -g window-status-separator ' '
+           #setw -g window-status-bg 'colour235'
+           set -g status-left '#[fg=colour232,bg=colour154] #S #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #W #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] #(whoami)  #(uptime  | cut -d " " -f 1,2,3) #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
+           set -g status-right '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour121,bg=colour235] %r  %a  %Y #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #H #[fg=colour154,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour232,bg=colour154] #(rainbarf --battery --remaining --no-rgb) '
+           setw -g window-status-format '#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[default] #I  #W #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]'
+           setw -g window-status-current-format '#[fg=colour235,bg=colour238,nobold,nounderscore,noitalics]#[fg=colour222,bg=colour238] #I  #W  #F #[fg=colour238,bg=colour235,nobold,nounderscore,noitalics]'
       '';
     };
   };
diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix
index ad2bb55..c7528d4 100644
--- a/home/features/desktop/default.nix
+++ b/home/features/desktop/default.nix
@@ -57,7 +57,6 @@
     fuzzel
     gnome.file-roller
     gnome.nautilus
-    gnome.nautilus
     gnome.seahorse
     gnome.sushi
     gnome.vinagre
diff --git a/hosts/lkk-nix-1/services/containers/default.nix b/hosts/lkk-nix-1/services/containers/default.nix
index d62709e..e269097 100644
--- a/hosts/lkk-nix-1/services/containers/default.nix
+++ b/hosts/lkk-nix-1/services/containers/default.nix
@@ -4,6 +4,7 @@
     ./briefkasten.nix
     ./little-link.nix
     ./matomo.nix
+    ./mautic.nix
     ./nextcloud.nix
     ./nginx.nix
     ./wordpress.nix
diff --git a/hosts/lkk-nix-1/services/containers/mautic.nix b/hosts/lkk-nix-1/services/containers/mautic.nix
new file mode 100644
index 0000000..ecd490d
--- /dev/null
+++ b/hosts/lkk-nix-1/services/containers/mautic.nix
@@ -0,0 +1,16 @@
+{ config, outputs, ... }: {
+  virtualisation.oci-containers.containers."mautic" = {
+    image = "docker.io/mautic/mautic:v4-apache";
+    environment = {
+      MAUTIC_DB_HOST = "mysql";
+      MAUTIC_DB_USER = "mautic";
+      MAUTIC_DB_PASSWORD = "mautic";
+      MAUTIC_DB_DBNAME = "mautic";
+      PHP_MEMORY_LIMIT="2048M";
+      MAUTIC_RUN_CRON_JOBS="true";
+    };
+    ports = [ "3008:80" ];
+    volumes = [ "mautic_data:/var/www/html" ];
+    extraOptions = [ "--add-host=mysql:10.88.0.1" "--ip=10.88.0.23" ];
+  };
+}
diff --git a/hosts/lkk-nix-1/services/traefik.nix b/hosts/lkk-nix-1/services/traefik.nix
index c02d923..910c531 100644
--- a/hosts/lkk-nix-1/services/traefik.nix
+++ b/hosts/lkk-nix-1/services/traefik.nix
@@ -207,8 +207,7 @@
               certResolver = "godaddy";
               domains = "ma.lanakk.com";
             };
-            service = "adguard";
-            middlewares = "auth";
+            service = "mautic";
             entrypoints = "websecure";
           };
           briefkasten = {