diff --git a/.gitmodules b/.gitmodules
index 74d1049ce01..f9758a69956 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -140,7 +140,7 @@
 	url = https://github.com/ClickHouse-Extras/libc-headers.git
 [submodule "contrib/replxx"]
 	path = contrib/replxx
-	url = https://github.com/ClickHouse-Extras/replxx.git
+	url = https://github.com/AmokHuginnsson/replxx.git
 [submodule "contrib/avro"]
 	path = contrib/avro
 	url = https://github.com/ClickHouse-Extras/avro.git
diff --git a/contrib/replxx b/contrib/replxx
index f97765df14f..89abeea7516 160000
--- a/contrib/replxx
+++ b/contrib/replxx
@@ -1 +1 @@
-Subproject commit f97765df14f4a6236d69b8f14b53ef2051ebd95a
+Subproject commit 89abeea7516a2a9b6aad7bfecc132f608ff14a3d
diff --git a/src/Client/ClientBaseHelpers.cpp b/src/Client/ClientBaseHelpers.cpp
index a530e48ee35..e1c1481c5b4 100644
--- a/src/Client/ClientBaseHelpers.cpp
+++ b/src/Client/ClientBaseHelpers.cpp
@@ -109,29 +109,29 @@ void highlight(const String & query, std::vector<replxx::Replxx::Color> & colors
             {TokenType::OpeningSquareBracket, Replxx::Color::BROWN},
             {TokenType::ClosingSquareBracket, Replxx::Color::BROWN},
             {TokenType::DoubleColon, Replxx::Color::BROWN},
-            {TokenType::OpeningCurlyBrace, Replxx::Color::INTENSE},
-            {TokenType::ClosingCurlyBrace, Replxx::Color::INTENSE},
+            {TokenType::OpeningCurlyBrace, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::ClosingCurlyBrace, replxx::color::bold(Replxx::Color::DEFAULT)},
 
-            {TokenType::Comma, Replxx::Color::INTENSE},
-            {TokenType::Semicolon, Replxx::Color::INTENSE},
-            {TokenType::Dot, Replxx::Color::INTENSE},
-            {TokenType::Asterisk, Replxx::Color::INTENSE},
+            {TokenType::Comma, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Semicolon, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Dot, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Asterisk, replxx::color::bold(Replxx::Color::DEFAULT)},
             {TokenType::HereDoc, Replxx::Color::CYAN},
-            {TokenType::Plus, Replxx::Color::INTENSE},
-            {TokenType::Minus, Replxx::Color::INTENSE},
-            {TokenType::Slash, Replxx::Color::INTENSE},
-            {TokenType::Percent, Replxx::Color::INTENSE},
-            {TokenType::Arrow, Replxx::Color::INTENSE},
-            {TokenType::QuestionMark, Replxx::Color::INTENSE},
-            {TokenType::Colon, Replxx::Color::INTENSE},
-            {TokenType::Equals, Replxx::Color::INTENSE},
-            {TokenType::NotEquals, Replxx::Color::INTENSE},
-            {TokenType::Less, Replxx::Color::INTENSE},
-            {TokenType::Greater, Replxx::Color::INTENSE},
-            {TokenType::LessOrEquals, Replxx::Color::INTENSE},
-            {TokenType::GreaterOrEquals, Replxx::Color::INTENSE},
-            {TokenType::Concatenation, Replxx::Color::INTENSE},
-            {TokenType::At, Replxx::Color::INTENSE},
+            {TokenType::Plus, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Minus, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Slash, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Percent, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Arrow, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::QuestionMark, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Colon, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Equals, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::NotEquals, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Less, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Greater, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::LessOrEquals, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::GreaterOrEquals, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::Concatenation, replxx::color::bold(Replxx::Color::DEFAULT)},
+            {TokenType::At, replxx::color::bold(Replxx::Color::DEFAULT)},
             {TokenType::DoubleAt, Replxx::Color::MAGENTA},
 
             {TokenType::EndOfStream, Replxx::Color::DEFAULT},
@@ -142,7 +142,7 @@ void highlight(const String & query, std::vector<replxx::Replxx::Color> & colors
             {TokenType::ErrorDoubleQuoteIsNotClosed, Replxx::Color::RED},
             {TokenType::ErrorSinglePipeMark, Replxx::Color::RED},
             {TokenType::ErrorWrongNumber, Replxx::Color::RED},
-            { TokenType::ErrorMaxQuerySizeExceeded, Replxx::Color::RED }};
+            {TokenType::ErrorMaxQuerySizeExceeded, Replxx::Color::RED}};
 
     const Replxx::Color unknown_token_color = Replxx::Color::RED;