diff --git a/res/config.ini b/res/config.ini
index 8650bf0..a83ee41 100644
--- a/res/config.ini
+++ b/res/config.ini
@@ -1,6 +1,3 @@
-# The number of failed authentications before a special animation is played... ;)
-auth_fails = 10
-
 # The active animation
 # none   -> Nothing (default)
 # doom   -> PSX DOOM fire
@@ -12,28 +9,13 @@ animation = none
 # 1..2e12 -> Stop the animation after this many seconds
 animation_timeout_sec = 0
 
-# Format string for clock in top right corner (see strftime specification). Example: %c
-# If null, the clock won't be shown
-clock = null
-
-# Enable/disable big clock
-bigclock = false
-
 # The character used to mask the password
 # If null, the password will be hidden
 # Note: you can use a # by escaping it like so: \#
 asterisk = *
 
-# Erase password input on failure
-clear_password = false
-
-# Enable vi keybindings
-vi_mode = false
-
-# Default vi mode
-# normal   -> normal mode
-# insert   -> insert mode
-vi_default_mode = normal
+# The number of failed authentications before a special animation is played... ;)
+auth_fails = 10
 
 # The `fg` and `bg` color settings take a digit 0-8 corresponding to:
 #define TB_DEFAULT 0x00
@@ -57,88 +39,84 @@ vi_default_mode = normal
 # Background color id
 bg = 0
 
-# Foreground color id
-fg = 8
+# Enable/disable big clock
+bigclock = false
 
-# Background color errors
-error_bg = 0
+# Blank main box background
+# Setting to false will make it transparent
+blank_box = true
 
-# Foreground color errors
-# Default is red and bold: TB_RED | TB_BOLD
-error_fg = 258
-
-# CMatrix animation foreground color id
-cmatrix_fg = 3
-
-# Border color
+# Border foreground color id
 border_fg = 8
 
 # Title to show at the top of the main box
 # If set to null, none will be shown
 box_title = null
 
-# Initial text to show on the info line
-# If set to null, the info line defaults to the hostname
-initial_info_text = null
+# Brightness +/- percentage in one step
+brightness_change = 10
 
-# Blank main box background
-# Setting to false will make it transparent
-blank_box = true
+# Brightness decrease key
+brightness_down_key = F5
 
-# Remove main box borders
-hide_borders = false
+# Brightness increase key
+brightness_up_key = F6
 
-# Main box margins
-margin_box_h = 2
-margin_box_v = 1
+# Brightness control command
+brightnessctl = $PREFIX_DIRECTORY/bin/brightnessctl
 
-# Input boxes length
-input_len = 34
+# Erase password input on failure
+clear_password = false
+
+# Format string for clock in top right corner (see strftime specification). Example: %c
+# If null, the clock won't be shown
+clock = null
+
+# CMatrix animation foreground color id
+cmatrix_fg = 3
+
+# Console path
+console_dev = /dev/console
 
 # Input box active by default on startup
 # Available inputs: info_line, session, login, password
 default_input = login
 
-# Load the saved desktop and username
-load = true
+# Error background color id
+error_bg = 0
 
-# Save the current desktop and login as defaults
-save = true
+# Error foreground color id
+# Default is red and bold: TB_RED | TB_BOLD
+error_fg = 258
+
+# Foreground color id
+fg = 8
+
+# Remove main box borders
+hide_borders = false
 
 # Remove power management command hints
 hide_key_hints = false
 
-# Specifies the key used for shutdown (F1-F12)
-shutdown_key = F1
+# Initial text to show on the info line
+# If set to null, the info line defaults to the hostname
+initial_info_text = null
 
-# Specifies the key used for restart (F1-F12)
-restart_key = F2
-
-# Specifies the key used for sleep (F1-F12)
-sleep_key = F3
-
-# Command executed when pressing shutdown_key
-shutdown_cmd = /sbin/shutdown -a now
-
-# Command executed when pressing restart_key
-restart_cmd = /sbin/shutdown -r now
-
-# Command executed when pressing sleep key (can be null)
-sleep_cmd = null
+# Input boxes length
+input_len = 34
 
 # Active language
 # Available languages are found in $CONFIG_DIRECTORY/ly/lang/
 lang = en
 
-# TTY in use
-tty = $DEFAULT_TTY
+# Load the saved desktop and username
+load = true
 
-# Console path
-console_dev = /dev/console
+# Main box horizontal margin
+margin_box_h = 2
 
-# Default path
-# If null, ly doesn't set a path
-path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
+# Main box vertical margin
+margin_box_v = 1
 
 # Event timeout in milliseconds
 min_refresh_delta = 5
@@ -146,30 +124,60 @@ min_refresh_delta = 5
 # Set numlock on/off at startup
 numlock = false
 
+# Default path
+# If null, ly doesn't set a path
+path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
+
+# Command executed when pressing restart_key
+restart_cmd = /sbin/shutdown -r now
+
+# Specifies the key used for restart (F1-F12)
+restart_key = F2
+
+# Save the current desktop and login as defaults
+save = true
+
 # Service name (set to ly to use the provided pam config file)
 service_name = ly
 
 # Setup command
 setup_cmd = $CONFIG_DIRECTORY/ly/setup.sh
 
+# Command executed when pressing shutdown_key
+shutdown_cmd = /sbin/shutdown -a now
+
+# Specifies the key used for shutdown (F1-F12)
+shutdown_key = F1
+
+# Command executed when pressing sleep key (can be null)
+sleep_cmd = null
+
+# Specifies the key used for sleep (F1-F12)
+sleep_key = F3
+
+# TTY in use
+tty = $DEFAULT_TTY
+
+# Default vi mode
+# normal   -> normal mode
+# insert   -> insert mode
+vi_default_mode = normal
+
+# Enable vi keybindings
+vi_mode = false
+
 # Wayland desktop environments
 waylandsessions = $PREFIX_DIRECTORY/share/wayland-sessions
 
-# xinitrc
-# If null, the xinitrc session will be hidden
-xinitrc = ~/.xinitrc
-
 # Xorg server command
 x_cmd = $PREFIX_DIRECTORY/bin/X
 
 # Xorg xauthority edition tool
 xauth_cmd = $PREFIX_DIRECTORY/bin/xauth
 
+# xinitrc
+# If null, the xinitrc session will be hidden
+xinitrc = ~/.xinitrc
+
 # Xorg desktop environments
 xsessions = $PREFIX_DIRECTORY/share/xsessions
-
-# Brightness control
-brightness_down_key = F5
-brightness_up_key = F6
-brightnessctl = $PREFIX_DIRECTORY/bin/brightnessctl
-brightness_change = 10
diff --git a/src/config/Config.zig b/src/config/Config.zig
index cd87bbb..f77ea00 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -5,22 +5,27 @@ const Animation = enums.Animation;
 const Input = enums.Input;
 const ViMode = enums.ViMode;
 
-auth_fails: u64 = 10,
 animation: Animation = .none,
+animation_timeout_sec: u12 = 0,
 asterisk: ?u8 = '*',
+auth_fails: u64 = 10,
 bg: u16 = 0,
 bigclock: bool = false,
 blank_box: bool = true,
 border_fg: u16 = 8,
 box_title: ?[]const u8 = null,
+brightness_change: []const u8 = "10",
+brightness_down_key: []const u8 = "F5",
+brightness_up_key: []const u8 = "F6",
+brightnessctl: [:0]const u8 = build_options.prefix_directory ++ "/bin/brightnessctl",
 clear_password: bool = false,
 clock: ?[:0]const u8 = null,
+cmatrix_fg: u16 = 3,
 console_dev: []const u8 = "/dev/console",
 default_input: Input = .login,
 error_bg: u16 = 0,
 error_fg: u16 = 258,
 fg: u16 = 8,
-cmatrix_fg: u16 = 3,
 hide_borders: bool = false,
 hide_key_hints: bool = false,
 initial_info_text: ?[]const u8 = null,
@@ -42,15 +47,10 @@ shutdown_key: []const u8 = "F1",
 sleep_cmd: ?[]const u8 = null,
 sleep_key: []const u8 = "F3",
 tty: u8 = build_options.tty,
-vi_mode: bool = false,
 vi_default_mode: ViMode = .normal,
+vi_mode: bool = false,
 waylandsessions: []const u8 = build_options.prefix_directory ++ "/share/wayland-sessions",
 x_cmd: []const u8 = build_options.prefix_directory ++ "/bin/X",
-xinitrc: ?[]const u8 = "~/.xinitrc",
 xauth_cmd: []const u8 = build_options.prefix_directory ++ "/bin/xauth",
+xinitrc: ?[]const u8 = "~/.xinitrc",
 xsessions: []const u8 = build_options.prefix_directory ++ "/share/xsessions",
-brightness_down_key: []const u8 = "F5",
-brightness_up_key: []const u8 = "F6",
-brightnessctl: [:0]const u8 = build_options.prefix_directory ++ "/bin/brightnessctl",
-brightness_change: []const u8 = "10",
-animation_timeout_sec: u12 = 0,