diff --git a/dbms/src/Server/Client.cpp b/dbms/src/Server/Client.cpp
index 229167763e9..a13dd195eff 100644
--- a/dbms/src/Server/Client.cpp
+++ b/dbms/src/Server/Client.cpp
@@ -468,12 +468,43 @@ private:
     const String prompt() const
     {
         std::map<String, String> colors = {
+            /* Foreground */
+            { "black",   "30" },
             { "red",     "31" },
             { "green",   "32" },
             { "yellow",  "33" },
             { "blue",    "34" },
             { "magenta", "35" },
             { "cyan",    "36" },
+            { "white",   "97" },
+
+            { "light gray",    "37" },
+            { "dark gray",     "90" },
+            { "light red",     "91" },
+            { "light green",   "92" },
+            { "light yellow",  "93" },
+            { "light blue",    "94" },
+            { "light magenta", "95" },
+            { "light cyan",    "96" },
+    
+            /* Background*/
+            { "background black",   "40" },
+            { "background red",     "41" },
+            { "background green",   "42" },
+            { "background yellow",  "43" },
+            { "background blue",    "44" },
+            { "background magenta", "45" },
+            { "background cyan",    "46" },
+            { "background white",   "107" },
+
+            { "background light gray",    "47" },
+            { "background dark gray",     "100" },
+            { "background light red",     "101" },
+            { "background light green",   "102" },
+            { "background light yellow",  "103" },
+            { "background light blue",    "104" },
+            { "background light magenta", "105" },
+            { "background light cyan",    "106" },
         };
 
         String pattern = prompt_by_server_display_name;
@@ -489,6 +520,7 @@ private:
 
         std::map<String, String> environment = {
             {"host",         config().getString("host", "localhost")},
+            {"port",         config().getString("port", "9000")},
             {"display_name", server_display_name},
             {"user",         config().getString("user",     "default")},
             {"database",     config().getString("database", "default")},