diff --git a/aerc/.config/aerc/aerc.conf b/aerc/.config/aerc/aerc.conf
index 82d3d94..4f68fc0 100644
--- a/aerc/.config/aerc/aerc.conf
+++ b/aerc/.config/aerc/aerc.conf
@@ -818,7 +818,7 @@ mail-received=notify-send "[$AERC_ACCOUNT/$AERC_FOLDER] New mail from $AERC_FROM
 #
 # Executed when aerc starts
 #aerc-startup=aerc :terminal calcurse && aerc :next-tab
-aerc-startup=aerc :terminal khal interactive && aerc :next-tab
+aerc-startup=aerc :terminal khal interactive && aerc :next-tab && aerc :terminal srss o && aerc :next-tab
 
 #
 # Executed when aerc shuts down.
diff --git a/conky/.config/conky/conky.conf b/conky/.config/conky/conky_status.conf
similarity index 88%
rename from conky/.config/conky/conky.conf
rename to conky/.config/conky/conky_status.conf
index 116c863..679cf33 100644
--- a/conky/.config/conky/conky.conf
+++ b/conky/.config/conky/conky_status.conf
@@ -38,7 +38,6 @@ conky.config = {
     font = 'Fira Code:size=10',
     gap_x = -1800,
     gap_y = 40,
-    minimum_height = 950,
     minimum_width = 300,
 
     net_avg_samples = 2,
@@ -160,9 +159,4 @@ ${color grey}Processes $hr
  ${color gray}Count: $color$processes
 ${color grey}Infos $hr
  $color${font FiraCode Nerd Font:size=10}${execi 1800 curl -s 'wttr.in/?format=4'}$font
- ${color gray}mto $color${new_mails /disks/TwoTO/Mails/minecraftonitch/INBOX/ 900} / ${mails /disks/TwoTO/Mails/minecraftonitch/INBOX/ 900} | ${color gray}d.t $color${new_mails /disks/TwoTO/Mails/d.tonitch/INBOX/ 900} / ${mails /disks/TwoTO/Mails/d.tonitch/INBOX/ 900} | ${color gray}d.a $color${new_mails /disks/TwoTO/Mails/debucquoy.anthony/INBOX/ 900} / ${mails /disks/TwoTO/Mails/debucquoy.anthony/INBOX/ 900}
-${color grey}TODO $hr
-$color${execi 60 todo list --sort priority}
-${color grey}CALENDAR $hr
-$color${execi 60 khal list}
 ]]
diff --git a/conky/.config/conky/conky_todo.conf b/conky/.config/conky/conky_todo.conf
new file mode 100644
index 0000000..b471237
--- /dev/null
+++ b/conky/.config/conky/conky_todo.conf
@@ -0,0 +1,80 @@
+-- Conky, a system monitor https://github.com/brndnmtthws/conky
+--
+-- This configuration file is Lua code. You can write code in here, and it will
+-- execute when Conky loads. You can use it to generate your own advanced
+-- configurations.
+--
+-- Try this (remove the `--`):
+--
+--   print("Loading Conky config")
+--
+-- For more on Lua, see:
+-- https://www.lua.org/pil/contents.html
+--
+-- Conky Lua API: https://conky.cc/lua
+
+-- Configuration settings: https://conky.cc/config_settings
+
+io.input("/etc/hostname")
+hostname = io.read()
+
+conky.config = {
+    alignment = 'top_left',
+    background = false,
+    border_width = 1,
+
+    cpu_avg_samples = 2,
+    double_buffer = true,
+    update_interval = 1.0,
+
+    default_color = 'green',
+    default_outline_color = 'green',
+    default_shade_color = 'dark green',
+    draw_borders = false,
+    draw_graph_borders = true,
+    draw_outline = false,
+    draw_shades = true,
+    extra_newline = false,
+    font = 'Fira Code:size=10',
+    gap_x = 1850,
+    gap_y = 40,
+    minimum_width = 300,
+
+    net_avg_samples = 2,
+    no_buffers = true,
+
+    out_to_console = false,
+    out_to_ncurses = false,
+    out_to_stderr = false,
+    out_to_wayland = false,
+    out_to_x = true,
+
+    own_window = true,
+    own_window_class = 'Conky',
+    own_window_type = 'desktop',
+    own_window_hints = 'undecorated,sticky,below,skip_taskbar,skip_pager',
+	own_window_argb_visual = true,
+	own_window_argb_value = 200,
+	own_window_colour = "#222222",
+
+    show_graph_range = false,
+    show_graph_scale = false,
+    stippled_borders = 0,
+    uppercase = false,
+    use_spacer = 'none',
+    use_xft = true,
+}
+
+
+if hostname == "minitonitchtop" then
+	conky.config.gap_x = 20
+    conky.config.font = 'Fira Code:size=14'
+end
+
+-- Variables: https://conky.cc/variables
+conky.text = [[
+${color grey}TODO $hr
+$color${execi 60 todo list --sort priority}
+${color grey}CALENDAR $hr
+$color${execi 60 khal list}
+]]