diff --git a/home/default.nix b/home/default.nix
index 6b4b9f42..c0df6c5b 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -147,7 +147,6 @@ in {
   home = {
     packages = builtins.attrValues my-pkgs.home-pkgs;
     sessionVariables = {
-      GITSTATUS_DAEMON = "${my-pkgs.gitstatus}/bin/gitstatusd";
       PATH =
         "$HOME/.cargo/bin:/etc/profiles/per-user/${config.home.username}/bin:$HOME/.nix-profile/bin:$PATH";
       BROWSER = "${pkgs.firefox}/bin/firefox";
@@ -189,6 +188,7 @@ in {
           "RUST_BACKTRACE=1 PATH=${pkgs.nix}/bin:${pkgs.coreutils}/bin";
         ExecStart = "${lorri}/bin/lorri daemon";
       };
+      Install = { WantedBy = [ "graphical-session.target" ]; };
     };
   };
 
diff --git a/home/desktop/i3.nix b/home/desktop/i3.nix
index 563cb575..a68257ed 100644
--- a/home/desktop/i3.nix
+++ b/home/desktop/i3.nix
@@ -13,7 +13,7 @@ let
     draw_shades = false,
     double_buffer = true,
     use_xft = true,
-    font = 'Roboto Mono Nerd Font:size=8',
+    font = 'Source Code Pro For Powerline:size=8',
     gap_x = 0,
     gap_y = 0,
     minimum_width = 316,
@@ -38,8 +38,8 @@ let
     }
 
     conky.text = [[
-    ''${font Roboto Mono Nerd Font:bold:size=14}''${color #8888ff}$alignc''${exec date '+%a %_d. %B, %H:%M:%S'}
-    ''${font Roboto Mono Nerd Font:size=12}
+    ''${font Source Code Pro For Powerline:bold:size=14}''${color #8888ff}$alignc''${exec date '+%a %_d. %B, %H:%M:%S'}
+    ''${font Source Code Pro For Powerline:size=12}
     ''${color #d0d0d0}''${execpi 60 ${pkgs.gcal}/bin/gcal -K -s1 --iso-week-number=yes | sed -e 's|5\d/1|01|' | sed -ne '3,10p' | sed -e 's/</ ''${color 8888ff}/'| sed -e 's/>/ ''${color}/' | sed 's/^/$alignc/'}
     $font
     $hr
@@ -79,7 +79,7 @@ in {
         gaps right 320
       '';
       package = (import <unstable> { }).i3-gaps;
-      config = let fonts = [ "Inconsolata Nerd Font 13" ];
+      config = let fonts = [ "Source Code Pro For Powerline 9" ];
       in {
         startup = [
           {
diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index edec37de..f4ce6dfc 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }: {
 
-  programs = {
+  programs = let my-pkgs = import ../../pkgs;
+  in {
     zsh = {
       enable = true;
       enableAutosuggestions = true;
@@ -9,9 +10,12 @@
         save = 100000;
         size = 100000;
       };
-      initExtra = builtins.readFile ./zshrc;
-      oh-my-zsh = let my-pkgs = import ../../pkgs;
-      in {
+      initExtra = builtins.readFile ./zshrc + ''
+        GITSTATUS_DAEMON=${my-pkgs.gitstatus}/bin/gitstatusd source ${
+          ./p10k.zsh
+        }
+      '';
+      oh-my-zsh = {
         enable = true;
         plugins = [ "colored-man-pages" ];
         theme = "powerlevel10k";
diff --git a/home/zsh/zshrc b/home/zsh/zshrc
index 0eda6594..a7b6173c 100644
--- a/home/zsh/zshrc
+++ b/home/zsh/zshrc
@@ -7,24 +7,10 @@ if [[ -z "$TMUX" ]] {
 	}
 }
 
-# Prompt
-function default_host () {
-	H="${HOST}%{%}:"
-	REPLY=${H/apollo%{%}:/}
-	REPLY=${REPLY/fb04217/hephaistos}
-	echo $REPLY
-}
-function default_user () {
-	U=${USER}@
-	REPLY=${U/maralorn@/}
-	echo $REPLY
-}
-
 mkdir -p /var/run/user/$UID/tmp/downloads
 
 setopt prompt_subst
 autoload -U colors && colors # Enable colors in prompt
-PROMPT='%{%F{red}%}$(default_user)$(default_host)%{%F{blue}%}%~%{%}> %{%f%}'
 
 precmd() {
 	if hash eventc 2> /dev/null;
diff --git a/nix/sources.json b/nix/sources.json
index 807b6515..a4328711 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -1,4 +1,16 @@
 {
+    "ate": {
+        "branch": "master",
+        "description": "awesome terminal emulator",
+        "homepage": null,
+        "owner": "andir",
+        "repo": "ate",
+        "rev": "4536fc5972d90e9719418d9752e1f7a720be123f",
+        "sha256": "0iapbb8fxkks55lqn2s3nab0j4q3hn8pb7sx29sy3pkq068yx5a4",
+        "type": "tarball",
+        "url": "https://github.com/andir/ate/archive/744efd87524497a335f4b041a9c646f3cb166dee.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "cachix": {
         "branch": "master",
         "description": "Command line client for Nix binary cache hosting:",
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 85ef3823..6b9011ae 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -3,6 +3,8 @@ let
   inherit (my-lib)
     pkgs unstable sources writeHaskellScript gcRetentionDays unBreak;
 in rec {
+  ate = pkgs.callPackage (import sources.ate) { };
+
   gitstatus = pkgs.callPackage ./powerlevel10k/gitstatus.nix {
     libgit2 = pkgs.libgit2.overrideAttrs (attrs: {
       src = pkgs.fetchFromGitHub {
@@ -71,7 +73,7 @@ in rec {
     inherit (pkgs.pythonPackages) qrcode;
     inherit (pkgs)
       git-crypt htop tree pwgen borgbackup inotifyTools direnv socat nmap
-      tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle;
+      tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat;
   };
   gw2wrapper = writeHaskellScript {
     name = "gw2wrapper";
@@ -181,14 +183,15 @@ in rec {
   };
   urxvt = pkgs.rxvt_unicode-with-plugins;
   terminal = pkgs.writeShellScriptBin "terminal" ''
-     ${urxvt}/bin/urxvtc "$@"
-     if [ $? -eq 2 ]; then
-    ${urxvt}/bin/urxvtd -q -o -f
-    ${urxvt}/bin/urxvtc "$@"
-     fi
+    if [ -z "$@" ]; then
+      ${ate}/bin/ate
+    else
+      shift
+      ${ate}/bin/ate /usr/bin/env $@
+    fi
   '';
   desktop-pkgs = {
-    inherit urxvt tasktree terminal;
+    inherit urxvt tasktree terminal ate;
     inherit (pkgs) xautolock;
     inherit (pkgs.gnome3) dconf;
   };
diff --git a/pkgs/powerlevel10k/zsh-powerlevel10k.nix b/pkgs/powerlevel10k/zsh-powerlevel10k.nix
index a4a8421a..c0a8defb 100644
--- a/pkgs/powerlevel10k/zsh-powerlevel10k.nix
+++ b/pkgs/powerlevel10k/zsh-powerlevel10k.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
-    rev = "b451b7a75821afedba6e9fa3c422e8eca9f8dedc";
-    sha256 = "0gb27ml1ypi3j5xilvv38b73agqcf2y6ll532zkcv4lwha3ldhmy";
+    rev = "2218060b2d8b4ca7edf1299c65871cdf700898e3";
+    sha256 = "0m08x0fbj7x800i79nib0km3yx80rrg9f1rh7i24x5kla8k98sgj";
   };
 
   installPhase = ''