diff --git a/private_dot_config/nushell/config.nu b/private_dot_config/nushell/config.nu
index 6b91292..426c00f 100644
--- a/private_dot_config/nushell/config.nu
+++ b/private_dot_config/nushell/config.nu
@@ -239,41 +239,65 @@ let light_theme = {
 
 # The default config record. This is where much of your global configuration is setup.
 let-env config = {
-  external_completer: $nothing # check 'carapace_completer' above to as example
-  filesize_metric: false
-  table_mode: rounded # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other
-  use_ls_colors: true
-  rm_always_trash: false
-  color_config: $dark_theme   # if you want a light theme, replace `$dark_theme` to `$light_theme`
   use_grid_icons: true
+  color_config: $dark_theme   # if you want a light theme, replace `$dark_theme` to `$light_theme`
   footer_mode: "25" # always, never, number_of_rows, auto
-  quick_completions: true  # set this to false to prevent auto-selecting completions when only one remains
-  partial_completions: true  # set this to false to prevent partial filling of the prompt
-  completion_algorithm: "prefix"  # prefix, fuzzy
   float_precision: 2
   # buffer_editor: "emacs" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL
   use_ansi_coloring: true
-  filesize_format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, zb, zib, auto
   edit_mode: emacs # emacs, vi
-  max_history_size: 10000 # Session has to be reloaded for this to take effect
-  sync_history_on_enter: true # Enable to share the history between multiple sessions, else you have to close the session to persist history to file
-  history_file_format: "plaintext" # "sqlite" or "plaintext"
   shell_integration: true # enables terminal markers and a workaround to arrow keys stop working issue
   # disable_table_indexes: false # set to true to remove the index column from tables
-  cd_with_abbreviations: false # set to true to allow you to do things like cd s/o/f and nushell expand it to cd some/other/folder
-  case_sensitive_completions: false # set to true to enable case-sensitive completions
-  enable_external_completion: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up my be very slow
-  max_external_completion_results: 100 # setting it lower can improve completion performance at the cost of omitting some options
-  # A strategy of managing table view in case of limited space.
-  table_trim: {
-    methodology: wrapping, # truncating
-    # A strategy which will be used by 'wrapping' methodology
-    wrapping_try_keep_words: true,
-    # A suffix which will be used with 'truncating' methodology
-    # truncating_suffix: "..."
+  # settings for the ls command
+  ls: {
+    use_ls_colors: true
+    clickable_links: true # true or false to enable or disable clickable links in the ls listing. your terminal has to support links.
+  }
+  # settings for the rm command
+  rm: {
+    always_trash: false
+  }
+  # settings for the cd command
+  cd: {
+    abbreviations: false # set to true to allow you to do things like cd s/o/f and nushell expand it to cd some/other/folder
+  }
+  # history settings
+  history: {
+    max_size: 10000 # Session has to be reloaded for this to take effect
+    sync_on_enter: true # Enable to share the history between multiple sessions, else you have to close the session to persist history to file
+    file_format: "plaintext" # "sqlite" or "plaintext"
+  }
+  # filesize settings
+  filesize: {
+    metric: false
+    format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, zb, zib, auto
+  }
+  # completion settings
+  completions: {
+    case_sensitive: false # set to true to enable case-sensitive completions
+    quick: true  # set this to false to prevent auto-selecting completions when only one remains
+    partial: true  # set this to false to prevent partial filling of the prompt
+    algorithm: "prefix"  # prefix, fuzzy
+    external: {
+      enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up my be very slow
+      max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options
+      completer: $nothing # check 'carapace_completer' above to as example
+    }
+  }
+  # table settings
+  table: {
+    mode: rounded # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other
+    index_mode: auto
+    # A strategy of managing table view in case of limited space.
+    trim: {
+      methodology: wrapping, # truncating
+      # A strategy which will be used by 'wrapping' methodology
+      wrapping_try_keep_words: true,
+      # A suffix which will be used with 'truncating' methodology
+      # truncating_suffix: "..."
+    }
   }
   show_banner: false # true or false to enable or disable the banner
-  show_clickable_links_in_ls: true # true or false to enable or disable clickable links in the ls listing. your terminal has to support links.
 
   hooks: {
     pre_prompt: [{