diff --git a/README.md b/README.md
index 7a4ea0f..e2395d4 100644
--- a/README.md
+++ b/README.md
@@ -17,10 +17,11 @@
 - [exa](https://github.com/ogham/exa)
 - [bottom](https://github.com/ClementTsang/bottom)
 - [lf](https://github.com/gokcehan/lf)
-- [lazygit](https://github.com/jesseduffield/lazygit)
+- [gitui](https://github.com/extrawurst/gitui)
+  ~~- [lazygit](https://github.com/jesseduffield/lazygit)~~
 - [bat](https://github.com/sharkdp/bat)
 - [trashy](https://github.com/oberblastmeister/trashy)
-- [tldr](https://github.com/tldr-pages/tldr)
+- [tealdeer](https://github.com/dbrgn/tealdeer)
 - [fzf](https://github.com/junegunn/fzf)
 - [ripgrep](https://github.com/BurntSushi/ripgrep)
 - [dust](https://github.com/bootandy/dust)
diff --git a/dot_config/lf/lfrc b/dot_config/lf/lfrc
index c15dc7b..603b8fd 100644
--- a/dot_config/lf/lfrc
+++ b/dot_config/lf/lfrc
@@ -1,34 +1,13 @@
 #! /bin/bash
 
-# file preview
 set previewer ~/.config/lf/pistol
-
-# interpreter for shell commands
 set shell bash
-
-# set '-eu' options for shell commands
-# These options are used to have safer shell commands. Option '-e' is used to
-# exit on error and option '-u' is used to give error for unset variables.
-# Option '-f' disables pathname expansion which can be useful when $f, $fs, and
-# $fx variables contain names with '*' or '?' characters. However, this option
-# is used selectively within individual commands as it can be limiting at
-# times.
 set shellopts '-eu'
-
-# set internal field separator (IFS) to "\n" for shell commands
-# This is useful to automatically split file names in $fs and $fx properly
-# since default file separator used in these variables (i.e. 'filesep' option)
-# is newline. You need to consider the values of these options and create your
-# commands accordingly.
 set ifs "\n"
-
-# leave some space at the top and the bottom of the screen
 set scrolloff 10
-
-# enable icons
 set icons
-# enable borders
 set drawbox
+set ratios "2:5:5"
 
 # use enter for shell commands
 map <enter> shell
diff --git a/dot_config/macchina/macchina.toml b/dot_config/macchina/macchina.toml
new file mode 100644
index 0000000..b66a689
--- /dev/null
+++ b/dot_config/macchina/macchina.toml
@@ -0,0 +1,48 @@
+# Specifies the network interface to use for the LocalIP readout
+interface = "wlan0"
+
+# Lengthen uptime output
+long_uptime = false
+
+# Lengthen shell output
+long_shell = false
+
+# Lengthen kernel output
+long_kernel = false
+
+# Toggle between displaying the current shell or your user's default one.
+current_shell = true
+
+# Toggle between displaying the number of physical or logical cores of your
+# processor.
+physical_cores = true 
+
+# Themes need to be placed in "$XDG_CONFIG_DIR/macchina/themes" beforehand.
+# e.g.:
+#  if theme path is /home/foo/.config/macchina/themes/Sodium.toml
+#  theme should be uncommented and set to "Sodium"
+#
+theme = "riiku"
+
+# Displays only the specified readouts.
+# Accepted values (case-sensitive):
+  # - Host
+  # - Machine
+  # - Kernel
+  # - Distribution
+  # - OperatingSystem
+  # - DesktopEnvironment
+  # - WindowManager
+  # - Resolution
+  # - Backlight
+  # - Packages
+  # - LocalIP
+  # - Terminal
+  # - Shell
+  # - Uptime
+  # - Processor
+  # - ProcessorLoad
+  # - Memory
+  # - Battery
+# Example:
+  show = ["Host", "Kernel", "Distribution", "Packages", "Shell", "Uptime", "Memory"]
diff --git a/dot_config/macchina/themes/Beryllium.toml b/dot_config/macchina/themes/Beryllium.toml
new file mode 100644
index 0000000..df0ba58
--- /dev/null
+++ b/dot_config/macchina/themes/Beryllium.toml
@@ -0,0 +1,26 @@
+# Beryllium
+
+spacing         = 3
+hide_ascii      = true
+key_color       = "#7067CF"
+separator       = ""
+
+[box]
+border          = "plain"
+visible         = true
+
+[palette]
+glyph           = "○  "
+visible         = true
+
+[bar]
+glyph           = "○"
+hide_delimiters = true
+visible         = true
+
+[box.inner_margin]
+x               = 2
+y               = 1
+
+[custom_ascii]
+color           = "#FF7001"
diff --git a/dot_config/macchina/themes/Helium.toml b/dot_config/macchina/themes/Helium.toml
new file mode 100644
index 0000000..d239475
--- /dev/null
+++ b/dot_config/macchina/themes/Helium.toml
@@ -0,0 +1,51 @@
+# Helium
+
+hide_ascii      = false
+spacing         = 2
+padding         = 0
+separator       = "->"
+key_color       = "Blue"
+separator_color = "Yellow"
+
+[bar]
+glyph           = "o"
+symbol_open     = "("
+symbol_close    = ")"
+hide_delimiters = false
+visible         = false
+
+[box]
+title           = " Helium "
+border          = "rounded"
+visible         = false
+
+[box.inner_margin]
+x               = 2
+y               = 1
+
+[custom_ascii]
+color           = "Yellow"
+
+[randomize]
+key_color       = false
+separator_color = false
+
+[keys]
+host            = "Host"
+kernel          = "Kernel"
+battery         = "Battery"
+os              = "OS"
+de              = "DE"
+wm              = "WM"
+distro          = "Distro"
+terminal        = "Terminal"
+shell           = "Shell"
+packages        = "Packages"
+uptime          = "Uptime"
+memory          = "Memory"
+machine         = "Machine"
+local_ip        = "IP"
+backlight       = "Brightness"
+resolution      = "Resolution"
+cpu_load        = "CPU Load"
+cpu             = "CPU"
diff --git a/dot_config/macchina/themes/Hydrogen.toml b/dot_config/macchina/themes/Hydrogen.toml
new file mode 100644
index 0000000..5280ec2
--- /dev/null
+++ b/dot_config/macchina/themes/Hydrogen.toml
@@ -0,0 +1,51 @@
+# Hydrogen
+
+spacing         = 2
+padding         = 0
+hide_ascii      = true
+separator       = ">"
+key_color       = "Cyan"
+separator_color = "White"
+
+[palette]
+type = "Full"
+visible = false
+
+[bar]
+glyph           = "ߋ"
+symbol_open     = '['
+symbol_close    = ']'
+hide_delimiters = true
+visible         = true
+
+[box]
+border          = "plain"
+visible         = true
+
+[box.inner_margin]
+x               = 1
+y               = 0
+
+[randomize]
+key_color       = false
+separator_color = false
+
+[keys]
+host            = "Host"
+kernel          = "Kernel"
+battery         = "Battery"
+os              = "OS"
+de              = "DE"
+wm              = "WM"
+distro          = "Distro"
+terminal        = "Terminal"
+shell           = "Shell"
+packages        = "Packages"
+uptime          = "Uptime"
+memory          = "Memory"
+machine         = "Machine"
+local_ip        = "Local IP"
+backlight       = "Brightness"
+resolution      = "Resolution"
+cpu_load        = "CPU Load"
+cpu             = "CPU"
diff --git a/dot_config/macchina/themes/Lithium.toml b/dot_config/macchina/themes/Lithium.toml
new file mode 100644
index 0000000..e7ba993
--- /dev/null
+++ b/dot_config/macchina/themes/Lithium.toml
@@ -0,0 +1,57 @@
+# Lithium
+
+spacing         = 1
+padding         = 2
+hide_ascii      = true
+separator       = " "
+key_color       = "Yellow"
+separator_color = "Yellow"
+
+[palette]
+type            = "Light"
+glyph           = " ● "
+visible         = true
+
+[bar]
+glyph           = "●"
+symbol_open     = '('
+symbol_close    = ')'
+visible         = false
+hide_delimiters = true
+
+[box]
+title           = " Spooky  "
+border          = "plain"
+visible         = true
+
+[box.inner_margin]
+x               = 2
+y               = 0
+
+[custom_ascii]
+color           = "Yellow"
+
+[randomize]
+key_color       = false
+separator_color = false
+pool            = "base"
+
+[keys]
+host            = "Host"
+kernel          = "Kernel"
+battery         = "Battery"
+os              = "OS"
+de              = "DE"
+wm              = "WM"
+distro          = "Distro"
+terminal        = "Terminal"
+shell           = "Shell"
+packages        = "Packages"
+uptime          = "Uptime"
+memory          = "Memory"
+machine         = "Machine"
+local_ip        = "IP"
+backlight       = "Brightness"
+resolution      = "Resolution"
+cpu_load        = "CPU Load"
+cpu             = "CPU"
diff --git a/dot_config/macchina/themes/riiku.toml b/dot_config/macchina/themes/riiku.toml
new file mode 100644
index 0000000..8c1c38d
--- /dev/null
+++ b/dot_config/macchina/themes/riiku.toml
@@ -0,0 +1,55 @@
+# Riiku
+
+spacing         = 1
+padding         = 2
+hide_ascii      = true
+separator       = " "
+key_color       = "Magenta"
+separator_color = "Magenta"
+prefer_small_ascii = true
+
+[palette]
+type            = "Light"
+glyph           = " ● "
+visible         = true
+
+[bar]
+glyph           = "●"
+symbol_open     = '('
+symbol_close    = ')'
+visible         = false
+hide_delimiters = true
+
+[box]
+title           = " Riiku  "
+border          = "rounded"
+visible         = true
+
+[box.inner_margin]
+x               = 0
+y               = 0
+
+[randomize]
+key_color       = false
+separator_color = false
+pool            = "base"
+
+[keys]
+host            = ""
+kernel          = ""
+battery         = "Battery"
+os              = "OS"
+de              = "DE"
+wm              = "WM"
+distro          = ""
+terminal        = "Term"
+shell           = ""
+packages        = ""
+uptime          = ""
+memory          = ""
+machine         = "Machine"
+local_ip        = "IP"
+backlight       = "Brightness"
+resolution      = "Resolution"
+cpu_load        = "CPU Load"
+cpu             = "CPU"
diff --git a/dot_config/private_fish/config.fish b/dot_config/private_fish/config.fish
index 46cdf2d..8e6c37c 100644
--- a/dot_config/private_fish/config.fish
+++ b/dot_config/private_fish/config.fish
@@ -42,7 +42,6 @@ end
     abbr -a lsa                       'exa --icons --group-directories-first -a'
     abbr -a ll                        'exa --icons --group-directories-first -lh'
     abbr -a lla                       'exa --icons --group-directories-first -lha'
-    abbr -a rm                        'trash'
     abbr -a q                         'exit'
     abbr -a r                         'ranger'
     abbr -a tm                        'tmux'
diff --git a/dot_config/private_fish/fish_variables b/dot_config/private_fish/fish_variables
index 67cbfcc..bd4a4da 100644
--- a/dot_config/private_fish/fish_variables
+++ b/dot_config/private_fish/fish_variables
@@ -26,7 +26,6 @@ SETUVAR _fish_abbr_mc:mkdir\x2dcd
 SETUVAR _fish_abbr_q:exit
 SETUVAR _fish_abbr_r:ranger
 SETUVAR _fish_abbr_re:restore
-SETUVAR _fish_abbr_rm:trash
 SETUVAR _fish_abbr_tarc:tar\x20\x2dcvf
 SETUVAR _fish_abbr_tard:tar\x20\x2dxvf
 SETUVAR _fish_abbr_tb:nc\x20termbin\x2ecom\x209999