diff --git a/README.md b/README.md
index 6b5350b..0b9f15c 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,3 @@ I'm going all in on [Nix](https://nixos.org/) & [home-manager](https://github.co
 - **home-mail**: email, contacts & calendar
 - **home-mac**: Mac-only
 - **home-linux**: Linux-only
-
-### Systems
-
-- **Samsung S22+**: Android & [Samsung Dex](https://www.samsung.com/us/explore/dex/) & [nix-on-droid](https://github.com/t184256/nix-on-droid)
-- **Raspberry Pi 4**: NixOS
-- **[Vultr](https://www.vultr.com/?ref=6895496) VPS ([dustinswan.com](http://dustinswan.com))**: NixOS
-- **Apple Macbook Pro (work laptop)**: MacOS & Nix
diff --git a/bin/visionable b/bin/visionable
deleted file mode 100755
index 5e436ca..0000000
--- a/bin/visionable
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -s /Applications/Visionable.app/Contents/MacOS/visionable ] && /Applications/Visionable.app/Contents/MacOS/visionable --nologin &
diff --git a/bin/visionable-debug b/bin/visionable-debug
deleted file mode 100755
index 0fc3d8d..0000000
--- a/bin/visionable-debug
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-export IGVERBOSE=3
-rm -rf ~/Library/Application\ Support/IOCOM/visionable/dswan.iocom.com
-rm -rf ~/Library/Application\ Support/IOCOM/visionable/devbranch.visionable.io
-[ -s /Applications/Visionable.app/Contents/MacOS/visionable ] && /Applications/Visionable.app/Contents/MacOS/visionable --nologin --remote-debugging-port=1234 &
diff --git a/configuration.nix b/configuration.nix
deleted file mode 100644
index 4b0ecae..0000000
--- a/configuration.nix
+++ /dev/null
@@ -1,196 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = false;
-  boot.plymouth.enable = true;
-  boot.plymouth.theme = "fade-in";
-  boot.plymouth.logo = pkgs.fetchurl {
-    url = "https://nixos.org/logo/nixos-hires.png";
-    sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si";
-  };
-
-  networking = {
-    hostName = "sw4n";
-    networkmanager.enable = true;
-    nameservers = [ "1.1.1.1" ];
-  };
-
-  networking.firewall.allowedTCPPorts = [ 24800 ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-
-  i18n = {
-    consoleFont = "Lat2-Terminus16";
-    # consoleKeyMap = "dvorak";
-    defaultLocale = "en_US.UTF-8";
-
-    inputMethod = {
-      enabled = "fcitx";
-      fcitx.engines = with pkgs.fcitx-engines; [ anthy mozc libpinyin ];
-    };
-  };
-
-  time.timeZone = "America/New_York";
-
-  # environment.systemPackages = with pkgs; [
-  # ];
-
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.bash.enableCompletion = true;
-  # programs.mtr.enable = true;
-
-  services = {
-    zerotierone = {
-      enable = true;
-      joinNetworks = [ "1d719394045bb17d" ];
-    };
-
-    # Enable the OpenSSH daemon.
-    # services.openssh.enable = true;
-
-    transmission = {
-      enable = true;
-    };
-
-    locate.enable = true;
-
-    udisks2.enable = true;
-
-    printing = {
-      enable = true;
-      drivers = [ pkgs.gutenprint pkgs.brlaser ];
-    };
-
-    upower.enable = true;
-
-    offlineimap = {
-      enable = true;
-      install = true;
-      path = [ pkgs.gnupg ];
-    };
-
-    xserver = {
-      enable = true;
-
-      videoDrivers = [ "nvidia" ];
-      resolutions = [ { x = 2560; y = 1440; } ];
-
-      desktopManager = {
-        default = "none";
-        xterm.enable = false;
-      };
-
-      displayManager = {
-        lightdm.enable = true;
-        lightdm.background = "/home/dustinswan/Sync/Pictures/Wallpaper/green_squares.png";
-        # sessionCommands = ''
-        #   setxkbmap -option ctrl:nocaps -option compose:ralt
-        #   xcape -e 'Control_L=Escape'
-        #   xmodmap -e "keycode 96 = dead_greek dead_greek dead_greek dead_greek"
-        #   compton -b --inactive-opacity 0.90
-        #   sh ~/dotfiles/logitech_linux_mouse.sh
-        #   xsetroot -solid black -cursor_name left_ptr
-        #   nitrogen --restore &
-        #   qsyncthingtray &
-        #   pasystray &
-        # '';
-      };
-
-      windowManager = {
-        i3 = {
-          enable = true;
-          package = pkgs.i3-gaps;
-        };
-
-        default = "i3";
-      };
-    };
-
-    synergy.server = {
-      enable = true;
-      screenName = "pc";
-    };
-  };
-
-  hardware = {
-    opengl.driSupport32Bit = true;
-    pulseaudio = {
-      enable = true;
-      support32Bit = true;
-      package = pkgs.pulseaudioFull;
-      zeroconf.discovery.enable = true;
-      tcp = {
-        enable = true;
-        anonymousClients.allowedIpRanges = ["127.0.0.1"];
-      };
-    };
-    bluetooth.enable = true;
-  };
-
-  sound.enable = true;
-  sound.mediaKeys.enable = true;
-
-  fonts = {
-    enableFontDir = true;
-    fonts = with pkgs; [
-      nerdfonts # includes Iosevka
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-    ];
-  };
-
-  virtualisation.virtualbox.host.enable = true;
-
-  virtualisation.docker.enable = true;
-
-  users.users.dustinswan = {
-    createHome = true;
-    description = "Dustin Swan";
-    isNormalUser = true;
-    extraGroups = [ "wheel" "sound" "pulse" "audio" "networkmanager" "vboxusers" "docker" ];
-    uid = 1000;
-    shell = pkgs.zsh;
-  };
-
-  environment.etc."synergy-server.conf" = { text = ''
-    section: screens
-      pc:
-      mac:
-    end
-
-    section: links
-      mac:
-        left = pc
-      pc:
-        right = mac
-    end
-
-    section: options
-      keystroke(super+tilde) = switchInDirection(left)
-      keystroke(super+backspace) = switchInDirection(right)
-      mousebutton(6) = keystroke(WWWBack)
-      mousebutton(7) = keystroke(WWWForward)
-    end
-  ''; };
-
-  # This value determines the NixOS release with which your system is to be
-  # compatible, in order to avoid breaking some software such as database
-  # servers. You should change this only after NixOS release notes say you
-  # should.
-  system.stateVersion = "17.09"; # Did you read the comment?
-}
diff --git a/catppuccin.yml b/themes/catppuccin/catppuccin.yml
similarity index 100%
rename from catppuccin.yml
rename to themes/catppuccin/catppuccin.yml
diff --git a/newsboat.catpuccin b/themes/catppuccin/newsboat.catpuccin
similarity index 100%
rename from newsboat.catpuccin
rename to themes/catppuccin/newsboat.catpuccin