diff --git a/desktop-wayland.nix b/desktop-wayland.nix
deleted file mode 100644
index 7677def..0000000
--- a/desktop-wayland.nix
+++ /dev/null
@@ -1,134 +0,0 @@
-{ config, pkgs, ... }:
-{
-  assertions = [
-    {
-      assertion = config.users.users ? "vili";
-      message = "User 'vili' needed for desktop!";
-    }
-  ];
-
-  imports = [
-    ./program-config-files/firefox.nix
-    ./program-config-files/sway.nix
-  ];
-
-  environment.systemPackages = with pkgs; [
-    telegram-desktop
-    signal-desktop
-    discord
-    tidal-hifi
-    vlc
-    viewnior
-    xfce.mousepad
-    pcmanfm
-    libreoffice
-    evince
-    networkmanagerapplet
-    flameshot
-    speedcrunch
-
-    zotero
-    kile
-    texliveFull
-    imagemagick
-    ghostscript
-    kdePackages.okular
-  ];
-
-  services = {
-    gnome.gnome-keyring.enable = true;
-    greetd = {
-      enable = true;
-      settings = {
-        initial_session = {
-          command = "${pkgs.sway}/bin/sway";
-          user = "vili";
-        };
-        default_session = {
-          command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
-          user = "greeter";
-        };
-      };
-    };
-    printing.enable = true;
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-  };
-
-  # rtkit is optional but recommended
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true; # if not already enabled
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  xdg.mime.defaultApplications = {
-    "application/pdf" = "org.gnome.Evince.desktop";
-    "text/plain" = "org.xfce.mousepad.desktop";
-    "text/x-tex" = "org.kde.kile.desktop";
-    "inode/directory" = "pcmanfm.description";
-  };
-
-  qt = {
-    enable = true;
-    style = "adwaita-dark";
-    platformTheme = "gnome";
-  };
-
-  system.userActivationScripts.mkDesktopSettingsSymlinks.text =
-    let
-      home = "/home/vili/";
-      paths = [
-        rec {
-          dir = "${home}.config/pcmanfm/default/";
-          file = "pcmanfm.conf";
-          full = "${dir}${file}";
-          source = "${./program-config-files/pcmanfm.conf}";
-        }
-        rec {
-          dir = "${home}.config/libfm/";
-          file = "libfm.conf";
-          full = "${dir}${file}";
-          source = "${./program-config-files/libfm.conf}";
-        }
-        rec {
-          dir = "${home}.config/gtk-3.0/";
-          file = "bookmarks";
-          full = "${dir}${file}";
-          source = "${./program-config-files/gtk-bookmarks}";
-        }
-        rec {
-          dir = "${home}";
-          file = ".gtkrc-2.0";
-          full = "${dir}${file}";
-          source = "${./program-config-files/gtkrc-2.0}";
-        }
-        rec {
-          dir = "${home}.config/gtk-3.0/";
-          file = "settings.ini";
-          full = "${dir}${file}";
-          source = "${./program-config-files/gtk-3-4-settings.ini}";
-        }
-        rec {
-          dir = "${home}.config/gtk-4.0/";
-          file = "settings.ini";
-          full = "${dir}${file}";
-          source = "${./program-config-files/gtk-3-4-settings.ini}";
-        }
-      ];
-    in
-    toString (
-      map (path: ''
-        mkdir -p ${path.dir}
-        if test -e ${path.full} -a ! -L ${path.full}; then
-          mv -f ${path.full} ${path.full}.old
-        fi
-        ln -sf ${path.source} ${path.full}
-      '') paths
-    );
-}
diff --git a/hardware-specific/intel-laptop.nix b/hardware-specific/intel-laptop.nix
index 0ff24fc..4e0fa9d 100644
--- a/hardware-specific/intel-laptop.nix
+++ b/hardware-specific/intel-laptop.nix
@@ -7,5 +7,28 @@
     ];
   };
 
-  services.logind.lidSwitch = if config.boot.resumeDevice != "" then "hibernate" else "suspend";
+  services = {
+    tlp = {
+      enable = true;
+      settings = {
+        CPU_SCALING_GOVERNOR_ON_AC = "performance";
+        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+
+        CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+        CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+
+        CPU_MIN_PERF_ON_AC = 0;
+        CPU_MAX_PERF_ON_AC = 100;
+        CPU_MIN_PERF_ON_BAT = 0;
+        CPU_MAX_PERF_ON_BAT = 40;
+
+        #Optional helps save long term battery health
+        START_CHARGE_THRESH_BAT0 = 60; # 60 and bellow it starts to charge
+        STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
+
+      };
+    };
+
+    logind.lidSwitch = if config.boot.resumeDevice != "" then "hibernate" else "suspend";
+  };
 }
diff --git a/machine-confs/lithium.nix b/machine-confs/lithium.nix
index 521ada0..6e6f7f2 100644
--- a/machine-confs/lithium.nix
+++ b/machine-confs/lithium.nix
@@ -42,10 +42,11 @@
   imports = [
     ../base.nix
     ../users/vili.nix
-    ../desktop-wayland.nix
+    ../desktop.nix
     ../development.nix
     ../onlykey.nix
     ../services/syncthing.nix
+    ../services/redshift.nix
     ../services/moonlight.nix
     ../hardware-specific/keychron-q11.nix
     ../hardware-specific/trackball.nix
diff --git a/program-config-files/sway.nix b/program-config-files/sway.nix
deleted file mode 100644
index ab75e13..0000000
--- a/program-config-files/sway.nix
+++ /dev/null
@@ -1,298 +0,0 @@
-{ config, pkgs, ... }:
-let
-  alacritty-conf = "${
-    (import ./alacritty.nix {
-      inherit config;
-      inherit pkgs;
-    })
-  }";
-  i3status-conf = "${pkgs.writeText "i3status-conf" ''
-    # It is important that this file is edited as UTF-8.
-    # The following line should contain a sharp s:
-    # ß
-    # If the above line is not correctly displayed, fix your editor first!
-
-    general {
-            output_format = "i3bar"
-            colors = true
-            interval = 1
-            color_good = "#2AA198"
-            color_bad = "#586E75"
-            color_degraded = "#DC322F"
-    }
-
-    order += "battery all"
-    order += "cpu_usage"
-    order += "memory"
-    order += "ipv6"
-    order += "ethernet _first_"
-    order += "wireless _first_"
-    order += "disk /"
-    order += "tztime local"
-    order += "tztime helsinki"
-
-    battery all {
-            format = " %status %percentage (%remaining @ %consumption) "
-            format_down = ""
-            last_full_capacity = true
-            integer_battery_capacity = true
-            low_threshold = 30
-            threshold_type = time
-    }
-
-    cpu_usage {
-            format = " CPU  %usage "
-    }
-
-    memory {
-            format = " RAM %used / %total "
-            threshold_degraded = "10%"
-    }
-
-    ipv6 {
-            format_up = " %iface: %ip "
-            format_down = " No IPv6 "
-    }
-
-    ethernet _first_ {
-            format_up = " LAN: %ip "
-            format_down = " No LAN "
-    }
-
-    wireless _first_ {
-            format_up = " %quality%essid: %ip "
-            format_down = " No WLAN "
-    }
-
-    disk "/" {
-            format = " ⛁ %avail "
-    }
-
-    tztime local {
-            format = " %d.%m. %H:%M "
-    }
-
-    tztime helsinki {
-            format = " (HEL %H:%M) "
-            timezone = "Europe/Helsinki"
-            hide_if_equals_localtime = true
-    }
-  ''}";
-
-  sway-conf = "${pkgs.writeText "sway-conf" ''
-    ### Output configuration
-    #
-    # Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)
-    # output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
-    #
-    # Example configuration:
-    #
-    #   output HDMI-A-1 resolution 1920x1080 position 1920,0
-    #
-    # You can get the names of your outputs by running: swaymsg -t get_outputs
-
-
-
-    # Set mod key (Mod1=<Alt>, Mod4=<Super>)
-    set $mod Mod1
-    set $secondary Mod4
-
-
-
-    exec --no-startup-id wlsunset -S 08:00 -s 22:00 -t 2800 -g 0.9
-    for_window [window_type="notification"] floating enable
-
-    # Screen brightness controls
-    bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
-    bindsym XF86MonBrightnessUp exec brightnessctl set 5%+
-
-    # Volume
-    bindsym XF86AudioRaiseVolume exec 'pactl set-sink-volume @DEFAULT_SINK@ +1%'
-    bindsym XF86AudioLowerVolume exec 'pactl set-sink-volume @DEFAULT_SINK@ -1%'
-    bindsym XF86AudioMute exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
-
-    bindsym $mod+Return exec "alacritty --config-file ${alacritty-conf}"
-    bindsym $mod+d exec --no-startup-id "rofi -theme 'Arc-Dark' -show combi -combi-modes 'run' -modes combi"
-
-    set $mode_system "(l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (S)hutdown"
-    bindsym $mod+Shift+p mode $mode_system
-    mode $mode_system {
-            bindsym l exec --no-startup-id swaylock, mode "default"
-            bindsym s exec --no-startup-id "swaylock; systemctl suspend", mode "default"
-            bindsym h exec --no-startup-id systemctl hibernate, mode "default"
-            bindsym r exec --no-startup-id systemctl reboot, mode "default"
-            bindsym e exec --no-startup-id loginctl terminate-session self, mode "default"
-            bindsym Shift+s exec --no-startup-id systemctl poweroff, mode "default"
-            bindsym Return mode "default"
-            bindsym Escape mode "default"
-    }
-
-
-
-    font xft:DejaVuSansMono-Book 14
-    default_border pixel 3
-    gaps inner 2
-
-    bar {
-            swaybar_command swaybar
-            status_command i3status -c ${i3status-conf}
-
-            colors {
-                    background #0f212f
-                    statusline #d0d0d0
-                    separator #d0d0d0
-
-                    #                  border  back.   text
-                    active_workspace   #303030 #505050 #d0d0d0
-            }
-    }
-
-
-
-    bindsym $mod+Shift+q kill
-
-    floating_modifier $mod
-
-    bindsym $mod+s split h
-    bindsym $mod+v split v
-
-    bindsym $mod+f fullscreen toggle
-    bindsym $mod+Shift+space floating toggle
-    bindsym $mod+space focus mode_toggle
-
-    bindsym $mod+Shift+c reload
-    bindsym $mod+Shift+r restart
-
-
-
-    bindsym $mod+h focus left
-    bindsym $mod+j focus down
-    bindsym $mod+k focus up
-    bindsym $mod+l focus right
-
-    bindsym $mod+Shift+h move left
-    bindsym $mod+Shift+j move down
-    bindsym $mod+Shift+k move up
-    bindsym $mod+Shift+l move right
-
-    bindsym $mod+r mode "resize"
-    mode "resize" {
-            bindsym h resize shrink width 5 px or 5 ppt
-            bindsym j resize grow height 5 px or 5 ppt
-            bindsym k resize shrink height 5 px or 5 ppt
-            bindsym l resize grow width 5 px or 5 ppt
-
-            bindsym Return mode "default"
-            bindsym Escape mode "default"
-    }
-
-
-
-    workspace 1 output primary
-    workspace 2 output primary
-    workspace 3 output primary
-    workspace 4 output primary
-    workspace 5 output primary
-    workspace 6 output primary
-    workspace 7 output primary
-    workspace 8 output primary
-    workspace 9 output primary
-    workspace 10 output primary
-    workspace 11 output eDP primary
-    workspace 12 output eDP primary
-    workspace 13 output eDP primary
-    workspace 14 output eDP primary
-    workspace 15 output eDP primary
-    workspace 16 output eDP primary
-    workspace 17 output eDP primary
-    workspace 18 output eDP primary
-
-    # switch to workspace
-    bindsym $mod+1 workspace 1
-    bindsym $mod+2 workspace 2
-    bindsym $mod+3 workspace 3
-    bindsym $mod+4 workspace 4
-    bindsym $mod+5 workspace 5
-    bindsym $mod+6 workspace 6
-    bindsym $mod+7 workspace 7
-    bindsym $mod+8 workspace 8
-    bindsym $mod+9 workspace 9
-    bindsym $mod+0 workspace 10
-    bindsym $mod+$secondary+1 workspace 11
-    bindsym $mod+$secondary+2 workspace 12
-    bindsym $mod+$secondary+3 workspace 13
-    bindsym $mod+$secondary+4 workspace 14
-    bindsym $mod+$secondary+5 workspace 15
-    bindsym $mod+$secondary+6 workspace 16
-    bindsym $mod+$secondary+7 workspace 17
-    bindsym $mod+$secondary+8 workspace 18
-    bindsym $mod+$secondary+9 workspace 19
-    bindsym $mod+$secondary+0 workspace 20
-
-    # Move focused container to workspace
-    bindsym $mod+Ctrl+1 move container to workspace 1
-    bindsym $mod+Ctrl+2 move container to workspace 2
-    bindsym $mod+Ctrl+3 move container to workspace 3
-    bindsym $mod+Ctrl+4 move container to workspace 4
-    bindsym $mod+Ctrl+5 move container to workspace 5
-    bindsym $mod+Ctrl+6 move container to workspace 6
-    bindsym $mod+Ctrl+7 move container to workspace 7
-    bindsym $mod+Ctrl+8 move container to workspace 8
-    bindsym $mod+Ctrl+9 move container to workspace 9
-    bindsym $mod+Ctrl+0 move container to workspace 10
-    bindsym $mod+$secondary+Ctrl+1 move container to workspace 11
-    bindsym $mod+$secondary+Ctrl+2 move container to workspace 12
-    bindsym $mod+$secondary+Ctrl+3 move container to workspace 13
-    bindsym $mod+$secondary+Ctrl+4 move container to workspace 14
-    bindsym $mod+$secondary+Ctrl+5 move container to workspace 15
-    bindsym $mod+$secondary+Ctrl+6 move container to workspace 16
-    bindsym $mod+$secondary+Ctrl+7 move container to workspace 17
-    bindsym $mod+$secondary+Ctrl+8 move container to workspace 18
-    bindsym $mod+$secondary+Ctrl+9 move container to workspace 19
-    bindsym $mod+$secondary+Ctrl+0 move container to workspace 20
-
-    # Move to workspace with focused container
-    bindsym $mod+Shift+1 move container to workspace 1; workspace 1
-    bindsym $mod+Shift+2 move container to workspace 2; workspace 2
-    bindsym $mod+Shift+3 move container to workspace 3; workspace 3
-    bindsym $mod+Shift+4 move container to workspace 4; workspace 4
-    bindsym $mod+Shift+5 move container to workspace 5; workspace 5
-    bindsym $mod+Shift+6 move container to workspace 6; workspace 6
-    bindsym $mod+Shift+7 move container to workspace 7; workspace 7
-    bindsym $mod+Shift+8 move container to workspace 8; workspace 8
-    bindsym $mod+Shift+9 move container to workspace 9; workspace 9
-    bindsym $mod+Shift+0 move container to workspace 10; workspace 10
-    bindsym $mod+$secondary+Shift+1 move container to workspace 11; workspace 11
-    bindsym $mod+$secondary+Shift+2 move container to workspace 12; workspace 12
-    bindsym $mod+$secondary+Shift+3 move container to workspace 13; workspace 13
-    bindsym $mod+$secondary+Shift+4 move container to workspace 14; workspace 14
-    bindsym $mod+$secondary+Shift+5 move container to workspace 15; workspace 15
-    bindsym $mod+$secondary+Shift+6 move container to workspace 16; workspace 16
-    bindsym $mod+$secondary+Shift+7 move container to workspace 17; workspace 17
-    bindsym $mod+$secondary+Shift+8 move container to workspace 18; workspace 18
-    bindsym $mod+$secondary+Shift+9 move container to workspace 19; workspace 19
-    bindsym $mod+$secondary+Shift+0 move container to workspace 20; workspace 20
-
-    include @sysconfdir@/sway/config.d/*
-  ''}";
-in
-{
-  environment.etc."sway/config".source = sway-conf;
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-    extraPackages = with pkgs; [
-      alacritty
-      brightnessctl
-      pavucontrol
-      pulseaudio
-      rofi-wayland
-      swaylock
-      swayrbar
-      wdisplays
-      wl-clipboard
-      wlsunset
-      i3status
-    ];
-  };
-}