diff --git a/docs/docs/configuration.md b/docs/docs/configuration.md
index 7975f0cedc27..2336336de92d 100644
--- a/docs/docs/configuration.md
+++ b/docs/docs/configuration.md
@@ -239,7 +239,6 @@ override or transparent background color using the segement's [foreground][fg] p
           "leading_diamond": "",
           "trailing_diamond": "\uE0B0",
           "properties": {
-            "user_info_separator": "@",
             "postfix": " "
           }
         },
diff --git a/docs/docs/segment-session.md b/docs/docs/segment-session.md
index f75e731296f0..307bd253159e 100644
--- a/docs/docs/segment-session.md
+++ b/docs/docs/segment-session.md
@@ -17,11 +17,7 @@ Show the current user and host name.
   "foreground": "#ffffff",
   "background": "#c386f1",
   "leading_diamond": "",
-  "trailing_diamond": "\uE0B0",
-  "properties": {
-    "user_info_separator": "@",
-    "postfix": " "
-  }
+  "trailing_diamond": "\uE0B0"
 }
 ```
 
diff --git a/themes/agnoster.json b/themes/agnoster.json
index ebee0881ff41..a1a8b6e4e11d 100644
--- a/themes/agnoster.json
+++ b/themes/agnoster.json
@@ -16,10 +16,7 @@
           "style": "powerline",
           "powerline_symbol": "\uE0B0",
           "foreground": "#100e23",
-          "background": "#ffffff",
-          "properties": {
-            "user_info_separator": "@"
-          }
+          "background": "#ffffff"
         },
         {
           "type": "path",
diff --git a/themes/agnosterplus.json b/themes/agnosterplus.json
index 5578f5a80f72..e59a536346e7 100644
--- a/themes/agnosterplus.json
+++ b/themes/agnosterplus.json
@@ -27,11 +27,7 @@
           "style": "powerline",
           "powerline_symbol": "\uE0B0",
           "foreground": "#100e23",
-          "background": "#ffffff",
-          "properties": {
-            "prefix": " ",
-            "user_info_separator": "@"
-          }
+          "background": "#ffffff"
         },
         {
           "type": "path",
diff --git a/themes/aliens.json b/themes/aliens.json
index 6ecfb930e817..5039a91ce426 100644
--- a/themes/aliens.json
+++ b/themes/aliens.json
@@ -10,11 +10,7 @@
           "foreground": "#ffffff",
           "background": "#61AFEF",
           "leading_diamond": "",
-          "trailing_diamond": "\uE0B0",
-          "properties": {
-            "user_info_separator": "@",
-            "postfix": " "
-          }
+          "trailing_diamond": "\uE0B0"
         },
         {
           "type": "path",
diff --git a/themes/fish.json b/themes/fish.json
index 60c958b2b5c5..0a1cf47a3002 100644
--- a/themes/fish.json
+++ b/themes/fish.json
@@ -20,10 +20,7 @@
         {
           "type": "session",
           "style": "plain",
-          "foreground": "#ffffff",
-          "properties": {
-            "user_info_separator": "@"
-          }
+          "foreground": "#ffffff"
         },
         {
           "type": "path",
diff --git a/themes/jandedobbeleer.json b/themes/jandedobbeleer.json
index db584b9bb8f9..9cf2f6f12828 100644
--- a/themes/jandedobbeleer.json
+++ b/themes/jandedobbeleer.json
@@ -10,11 +10,7 @@
           "foreground": "#ffffff",
           "background": "#c386f1",
           "leading_diamond": "",
-          "trailing_diamond": "\uE0B0",
-          "properties": {
-            "user_info_separator": "@",
-            "postfix": " "
-          }
+          "trailing_diamond": "\uE0B0"
         },
         {
           "type": "spotify",
diff --git a/themes/paradox.json b/themes/paradox.json
index 35793928d93a..424df6470ce1 100644
--- a/themes/paradox.json
+++ b/themes/paradox.json
@@ -16,10 +16,7 @@
           "style": "powerline",
           "powerline_symbol": "\uE0B0",
           "foreground": "#100e23",
-          "background": "#ffffff",
-          "properties": {
-            "user_info_separator": "@"
-          }
+          "background": "#ffffff"
         },
         {
           "type": "path",
diff --git a/themes/powerlevel10k_classic.json b/themes/powerlevel10k_classic.json
index a2ff2f29d1dd..92b43a92627a 100644
--- a/themes/powerlevel10k_classic.json
+++ b/themes/powerlevel10k_classic.json
@@ -62,7 +62,6 @@
           "background": "#546E7A",
           "leading_diamond": "",
           "properties": {
-            "user_info_separator": "@",
             "postfix": " <#26C6DA></> "
           }
         },
diff --git a/themes/powerline.json b/themes/powerline.json
index 3f4a0bf61859..9fe56ae958ed 100644
--- a/themes/powerline.json
+++ b/themes/powerline.json
@@ -12,10 +12,7 @@
         {
           "type": "session",
           "style": "plain",
-          "foreground": "#ffffff",
-          "properties": {
-            "user_info_separator": "@"
-          }
+          "foreground": "#ffffff"
         },
         {
           "type": "path",
diff --git a/themes/sorin.json b/themes/sorin.json
index e6f3d0a8d0a4..5424eadde222 100644
--- a/themes/sorin.json
+++ b/themes/sorin.json
@@ -17,10 +17,7 @@
         {
           "type": "session",
           "style": "plain",
-          "foreground": "#FFFFFF",
-          "properties": {
-            "user_info_separator": "@"
-          }
+          "foreground": "#FFFFFF"
         },
         {
           "type": "path",