diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index 2adbf8b..e6a2de1 100644
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ./feh.nix
-
+    ./freetube.nix
   ];
   services.flatpak = {
     enable = true;
@@ -18,14 +18,50 @@
 
   # TODO: switch to home manager
   home-manager.users.djai.home.packages = with pkgs; [
+    # chat
+    signal-desktop
+
+    # media
+    feishin
+
     # terminal
     fzf
   ];
 
+  home-manager.users.djai.xdg.desktopEntries = {
+    feishin = {
+      name = "Feishin";
+      exec = "env XDG_CURRENT_DESKTOP=GNOME feishin";
+      icon = "feishin";
+      categories = [ "Audio" "Music" ];
+      terminal = false;
+    };
+
+    signal = {
+      name = "Signal";
+      icon = "signal-desktop";
+      exec = "signal-desktop --disable-features=AudioServiceOutOfProcess -- %u";
+      terminal = false;
+      categories = [ "InstantMessaging" ];
+      settings = { StartupWMClass = "signal";};
+      mimeType = [
+      "x-scheme-handler/sgnl"
+      "x-scheme-handler/signalcaptcha"
+      ];
+    };
+
+    vesktop = {
+      name = "Vesktop";
+      exec = "vesktop --disable-features=AudioServiceOutOfProcess %U";
+      terminal = false;
+      icon = "discord";
+      settings = { StartupWMClass = "vesktop";};
+    };
+  };
+
   users.users.djai.packages = with pkgs; [
     # chat
     element-desktop
-    signal-desktop
     vesktop
     easyeffects
 
@@ -35,11 +71,9 @@
     zathura
 
     # media
-    freetube
     nautilus
     exiftool
     feh
-    feishin
     yt-dlp
     ffmpeg
     gimp
diff --git a/modules/apps/freetube.nix b/modules/apps/freetube.nix
new file mode 100644
index 0000000..8e6ef0a
--- /dev/null
+++ b/modules/apps/freetube.nix
@@ -0,0 +1,56 @@
+{ ... }:
+
+{
+  home-manager.users."djai".programs.freetube = {
+    enable = true;
+    settings = {
+      allSettingsSectionsExpandedByDefault = true;
+      autoplayVideos = true;
+      backendPreference = "invidious";
+      barColor = false;
+      blurThumbnails = true;
+      defaultCaptionSettings = "{\"backgroundColor\":\"#000\",\"backgroundOpacity\":\"1\",\"color\":\"#FFF\",\"fontFamily\":\"proportionalSansSerif\",\"textOpacity\":\"1\",\"windowColor\":\"#000\",\"windowOpacity\":\"0\"}";
+      defaultInvidiousInstance = "https://invidious.djairo.dev";
+      defaultViewingMode = "theatre";
+      displayVideoPlayButton = false;
+      expandSideBar = false;
+      hideCommentLikes = true;
+      hidePopularVideos = true;
+      hideTrendingVideos = true;
+      hideUpcomingPremieres = true;
+      hideVideoViews = false;
+      playNextVideo = false;
+      proxyVideos = true;
+      region = "IE";
+      settingsSectionSortEnabled = false;
+      showDistractionFreeTitles = false;
+      sponsorBlockFiller = {color = "CatppuccinMochaMaroon"; skip = "doNothing";};
+      sponsorBlockInteraction = {color = "CatppuccinMochaGreen"; skip = "autoSkip";};
+      sponsorBlockIntro = {color = "CatppuccinMochaPeach"; skip = "showInSeekBar";};
+      sponsorBlockMusicOffTopic = {color = "CatppuccinMochaMaroon"; skip = "doNothing";};
+      sponsorBlockOutro = {color = "CatppuccinMochaPeach"; skip = "showInSeekBar";};
+      sponsorBlockRecap = {color = "CatppuccinMochaPeach"; skip = "doNothing";};
+      sponsorBlockSelfPromo = {color = "CatppuccinMochaYellow"; skip = "autoSkip";};
+      sponsorBlockSponsor = {color = "CatppuccinMochaBlue"; skip = "autoSkip";};
+      thumbnailPreference = "blur";
+      useDeArrowTitles = true;
+      useRssFeeds = true;
+      useSponsorBlock = true;
+    };
+  };
+
+  home-manager.users.djai.catppuccin.freetube = {
+    flavor = "mocha";
+    accent = "red";
+    secondaryAccent = "mauve";
+  };
+
+  home-manager.users.djai.xdg.desktopEntries = {
+    freetube = {
+      name = "FreeTube";
+      exec = "freetube --disable-features=AudioServiceOutOfProcess %U";
+      terminal = false;
+      icon = "freetube";
+    };
+  };
+}