diff --git a/Desktop/configuration.nix b/Desktop/configuration.nix
index dbe7b09..98619ff 100644
--- a/Desktop/configuration.nix
+++ b/Desktop/configuration.nix
@@ -24,8 +24,20 @@ in {
   boot.loader = {
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;
+    grub.useOSProber = true;
   };
 
+  fileSystems."/mediastorage" = {
+    device = "/dev/disk/by-uuid/aed202ac-7414-40b9-9d71-011b7043c850";
+    fsType = "ext4";
+  };
+
+  fileSystems."/backups" = {
+    device = "/dev/disk/by-uuid/63db910e-f906-4211-bac5-4330777c8283";
+    fsType = "ext4";
+  };
+
+
   networking = {
     hostName = "inex-pc";
     networkmanager.enable = true;
@@ -139,7 +151,10 @@ in {
     };
   };
 
-  virtualisation.docker.enable = true;
+  virtualisation.docker = {
+    enable = true;
+    enableOnBoot = false;
+  };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.inex = {
diff --git a/Desktop/software.nix b/Desktop/software.nix
index 4477831..c622ae2 100644
--- a/Desktop/software.nix
+++ b/Desktop/software.nix
@@ -5,34 +5,40 @@ let
 in {
   environment.systemPackages = with pkgs; [
     # Utils    
-    cool-retro-term
-    tmux
-    ponysay
-    (pkgs.callPackage ./modules/my_vim.nix {})
-    neofetch
     pciutils
     usbutils
     i2c-tools
     lm_sensors
     bind
-    libcec
-    # openvpn
-    git
-    unzip
-    tldr
-    ffmpeg
-    wget
     nix-bundle
-    nmap
     file
-    unrar
-    mosh
-    syncthing
+    restic
 
-    # ROCm
-    rocm-opencl-runtime
-    rocm-smi
-    clinfo
+    # Connectivity
+    nmap
+    libcec
+
+    # File systems
+    gparted
+
+    # Archives
+    unzip
+    unrar
+
+    # Running things
+    appimage-run
+
+    # Manuals
+    unstable.manix
+    tldr
+
+    # Terminal
+    cool-retro-term
+    mosh
+    tmux
+    neofetch
+    ponysay
+    bpytop
 
     # Voice
     speechd
@@ -50,18 +56,24 @@ in {
 
     # Browsers
     firefox
+    ungoogled-chromium
+    unstable.tor-browser-bundle-bin
+
+    # Downloaders
     transmission-gtk
     youtube-dl
+    syncthing
+    wget
 
     # Messangers
     tdesktop
     #discord
     mumble
     #riot-desktop
-    #qtox
+    qtox
     dino
-    zoom-us
-    teams
+    #zoom-us
+    #teams
     teamspeak_client
     
     # Games
@@ -69,37 +81,49 @@ in {
     steam-run-native
     openttd
     minecraft
-    unstable.lutris-unwrapped
     vulkan-tools
     wineWowPackages.full
     wineWowPackages.fonts
     winetricks
     xonotic
     
-    # Development
+    # VCS
+    git
+    gitAndTools.git-bug
+
+    # IDE
     vscode
-    ansible
+    (pkgs.callPackage ./modules/my_vim.nix {})
+
+    # Compilers and interpretators
+    ccls
+    cmake
+    gcc-unwrapped
     octaveFull
     texlive.combined.scheme-full
-    gcc-unwrapped
     python3Full
-    # (import (builtins.fetchTarball "https://github.com/babariviere/nixpkgs/archive/flutter-init.tar.gz") {}).flutter
-    #android-studio
-    cmake
     nodejs
+    fdroidserver
 
-    ccls
-
+    # Docker and orchestration
+    ansible_2_9
+    docker-compose
+    
+    # Maps
     josm
     
     # Screen recording
     unstable.obs-studio
+    unstable.obs-wlrobs
+    unstable.obs-v4l2sink
+    #unstable.obs-linuxbrowser
     peek
     
     # Graphics
     krita
     gmic_krita_qt
     potrace
+    ffmpeg
     
     # Audio
     audacity
@@ -107,8 +131,12 @@ in {
     picard
     cmus
     spotify
+    pulseeffects
 
     vlc
+    syncplay
+
+    kruler
 
     # Plugins
     # ladspaPlugins
@@ -122,6 +150,7 @@ in {
     klavaro
     liberation_ttf
     keepassxc
+    glow
     
     # Themes
     paper-icon-theme