diff --git a/core/src/gui/dialogs/credits.cpp b/core/src/gui/dialogs/credits.cpp
index fd8abc40..b54ad315 100644
--- a/core/src/gui/dialogs/credits.cpp
+++ b/core/src/gui/dialogs/credits.cpp
@@ -22,7 +22,7 @@ namespace credits {
         ImGui::BeginPopupModal("Credits", NULL, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove);
 
         ImGui::PushFont(style::hugeFont);
-        ImGui::Text("SDR++          ");
+        ImGui::TextUnformatted("SDR++          ");
         ImGui::PopFont();
         ImGui::SameLine();
         ImGui::Image(icons::LOGO, ImVec2(128, 128));
@@ -30,29 +30,29 @@ namespace credits {
         ImGui::Spacing();
         ImGui::Spacing();
 
-        ImGui::Text("This software is brought to you by Alexandre Rouma (ON5RYZ) with the help of\n\n");
+        ImGui::TextUnformatted("This software is brought to you by Alexandre Rouma (ON5RYZ) with the help of\n\n");
 
         ImGui::Columns(4, "CreditColumns", true);
 
-        ImGui::Text("Contributors");
+        ImGui::TextUnformatted("Contributors");
         for (int i = 0; i < sdrpp_credits::contributorCount; i++) {
             ImGui::BulletText("%s", sdrpp_credits::contributors[i]);
         }
 
         ImGui::NextColumn();
-        ImGui::Text("Libraries");
+        ImGui::TextUnformatted("Libraries");
         for (int i = 0; i < sdrpp_credits::libraryCount; i++) {
             ImGui::BulletText("%s", sdrpp_credits::libraries[i]);
         }
 
         ImGui::NextColumn();
-        ImGui::Text("Hardware Donators");
+        ImGui::TextUnformatted("Hardware Donators");
         for (int i = 0; i < sdrpp_credits::hardwareDonatorCount; i++) {
             ImGui::BulletText("%s", sdrpp_credits::hardwareDonators[i]);
         }
 
         ImGui::NextColumn();
-        ImGui::Text("Patrons");
+        ImGui::TextUnformatted("Patrons");
         for (int i = 0; i < sdrpp_credits::patronCount; i++) {
             ImGui::BulletText("%s", sdrpp_credits::patrons[i]);
         }
@@ -62,7 +62,7 @@ namespace credits {
         ImGui::Spacing();
         ImGui::Spacing();
         ImGui::Spacing();
-        ImGui::Text("SDR++ v" VERSION_STR " (Built at " __TIME__ ", " __DATE__ ")");
+        ImGui::TextUnformatted("SDR++ v" VERSION_STR " (Built at " __TIME__ ", " __DATE__ ")");
 
         ImGui::EndPopup();
         ImGui::PopStyleColor();
diff --git a/core/src/gui/dialogs/loading_screen.cpp b/core/src/gui/dialogs/loading_screen.cpp
index 14b73ad2..909cf173 100644
--- a/core/src/gui/dialogs/loading_screen.cpp
+++ b/core/src/gui/dialogs/loading_screen.cpp
@@ -30,40 +30,11 @@ namespace LoadingScreen {
         ImGui::BeginPopupModal("Credits", NULL, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBackground);
 
         ImGui::PushFont(style::hugeFont);
-        ImGui::Text("SDR++    ");
+        ImGui::TextUnformatted("SDR++    ");
         ImGui::PopFont();
         ImGui::SameLine();
         ImGui::Image(icons::LOGO, ImVec2(128, 128));
-        // ImGui::Spacing();
-        // ImGui::Spacing();
-        // ImGui::Spacing();
 
-        // ImGui::Text("This software is brought to you by\n\n");
-
-        // ImGui::Columns(3, "CreditColumns", true);
-
-        // ImGui::Text("Contributors");
-        // for (int i = 0; i < sdrpp_credits::contributorCount; i++) {
-        //     ImGui::BulletText("%s", sdrpp_credits::contributors[i]);
-        // }
-
-        // ImGui::NextColumn();
-        // ImGui::Text("Libraries");
-        // for (int i = 0; i < sdrpp_credits::libraryCount; i++) {
-        //     ImGui::BulletText("%s", sdrpp_credits::libraries[i]);
-        // }
-
-        // ImGui::NextColumn();
-        // ImGui::Text("Patrons");
-        // for (int i = 0; i < sdrpp_credits::patronCount; i++) {
-        //     ImGui::BulletText("%s", sdrpp_credits::patrons[i]);
-        // }
-
-        // ImGui::Columns(1, "CreditColumnsEnd", true);
-
-        // ImGui::Spacing();
-        // ImGui::Spacing();
-        // ImGui::Spacing();
         ImVec2 origPos = ImGui::GetCursorPos();
         ImGui::SetCursorPosY(origPos.y + 50);
         ImGui::Text("%s", msg.c_str());
diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp
index 58a9010c..fde2f738 100644
--- a/core/src/gui/main_window.cpp
+++ b/core/src/gui/main_window.cpp
@@ -601,7 +601,7 @@ void MainWindow::draw() {
     ImGui::BeginChild("WaterfallControls");
 
     ImGui::SetCursorPosX((ImGui::GetWindowSize().x / 2.0) - (ImGui::CalcTextSize("Zoom").x / 2.0));
-    ImGui::Text("Zoom");
+    ImGui::TextUnformatted("Zoom");
     ImGui::SetCursorPosX((ImGui::GetWindowSize().x / 2.0) - 10);
     if (ImGui::VSliderFloat("##_7_", ImVec2(20.0, 150.0), &bw, 1.0, 0.0, "")) {
         double factor = (double)bw * (double)bw;
@@ -620,7 +620,7 @@ void MainWindow::draw() {
     ImGui::NewLine();
 
     ImGui::SetCursorPosX((ImGui::GetWindowSize().x / 2.0) - (ImGui::CalcTextSize("Max").x / 2.0));
-    ImGui::Text("Max");
+    ImGui::TextUnformatted("Max");
     ImGui::SetCursorPosX((ImGui::GetWindowSize().x / 2.0) - 10);
     if (ImGui::VSliderFloat("##_8_", ImVec2(20.0, 150.0), &fftMax, 0.0, -160.0f, "")) {
         fftMax = std::max<float>(fftMax, fftMin + 10);
@@ -632,7 +632,7 @@ void MainWindow::draw() {
     ImGui::NewLine();
 
     ImGui::SetCursorPosX((ImGui::GetWindowSize().x / 2.0) - (ImGui::CalcTextSize("Min").x / 2.0));
-    ImGui::Text("Min");
+    ImGui::TextUnformatted("Min");
     ImGui::SetCursorPosX((ImGui::GetWindowSize().x / 2.0) - 10);
     if (ImGui::VSliderFloat("##_9_", ImVec2(20.0, 150.0), &fftMin, 0.0, -160.0f, "")) {
         fftMin = std::min<float>(fftMax - 10, fftMin);
diff --git a/core/src/gui/menus/module_manager.cpp b/core/src/gui/menus/module_manager.cpp
index d7350809..9ecdb494 100644
--- a/core/src/gui/menus/module_manager.cpp
+++ b/core/src/gui/menus/module_manager.cpp
@@ -56,7 +56,7 @@ namespace module_manager_menu {
                     confirmOpened = true;
                 }
                 ImGui::SetCursorPos(ImVec2(origPos.x + 2, origPos.y - 5));
-                ImGui::Text("_");
+                ImGui::TextUnformatted("_");
             }
             ImGui::EndTable();
         }
diff --git a/core/src/gui/smgui.cpp b/core/src/gui/smgui.cpp
index d1710c24..7bdee147 100644
--- a/core/src/gui/smgui.cpp
+++ b/core/src/gui/smgui.cpp
@@ -668,7 +668,7 @@ namespace SmGui {
     }
 
     void Text(const char* str) {
-        if (!options::opts.serverMode) { ImGui::Text("%s", str); return; }
+        if (!options::opts.serverMode) { ImGui::TextUnformatted(str); return; }
         if (rdl) {
             rdl->pushStep(DRAW_STEP_TEXT, false);
             rdl->pushString(str);
diff --git a/core/src/gui/widgets/waterfall.cpp b/core/src/gui/widgets/waterfall.cpp
index a0cbe683..c80cded1 100644
--- a/core/src/gui/widgets/waterfall.cpp
+++ b/core/src/gui/widgets/waterfall.cpp
@@ -449,8 +449,8 @@ namespace ImGui {
                             ImGui::Text("SNR: %0.1fdB", snr);
                         }
                         else {
-                            ImGui::Text("Strength: ---.-dBFS");
-                            ImGui::Text("SNR: ---.-dB");
+                            ImGui::TextUnformatted("Strength: ---.-dBFS");
+                            ImGui::TextUnformatted("SNR: ---.-dB");
                         }
                     }
 
diff --git a/decoder_modules/m17_decoder/src/main.cpp b/decoder_modules/m17_decoder/src/main.cpp
index e5e07026..ca4fd84f 100644
--- a/decoder_modules/m17_decoder/src/main.cpp
+++ b/decoder_modules/m17_decoder/src/main.cpp
@@ -160,62 +160,62 @@ private:
             if (!_this->lsf.valid) {
                 ImGui::TableNextRow();
                 ImGui::TableSetColumnIndex(0);
-                ImGui::Text("Source");
+                ImGui::TextUnformatted("Source");
                 ImGui::TableSetColumnIndex(1);
-                ImGui::Text("--");
+                ImGui::TextUnformatted("--");
 
                 ImGui::TableNextRow();
                 ImGui::TableSetColumnIndex(0);
-                ImGui::Text("Destination");
+                ImGui::TextUnformatted("Destination");
                 ImGui::TableSetColumnIndex(1);
-                ImGui::Text("--");
+                ImGui::TextUnformatted("--");
 
                 ImGui::TableNextRow();
                 ImGui::TableSetColumnIndex(0);
-                ImGui::Text("Data Type");
+                ImGui::TextUnformatted("Data Type");
                 ImGui::TableSetColumnIndex(1);
-                ImGui::Text("--");
+                ImGui::TextUnformatted("--");
 
                 ImGui::TableNextRow();
                 ImGui::TableSetColumnIndex(0);
-                ImGui::Text("Encryption");
+                ImGui::TextUnformatted("Encryption");
                 ImGui::TableSetColumnIndex(1);
-                ImGui::Text("-- (Subtype --)");
+                ImGui::TextUnformatted("-- (Subtype --)");
 
                 ImGui::TableNextRow();
                 ImGui::TableSetColumnIndex(0);
-                ImGui::Text("CAN");
+                ImGui::TextUnformatted("CAN");
                 ImGui::TableSetColumnIndex(1);
-                ImGui::Text("--");
+                ImGui::TextUnformatted("--");
             }
             else {
                 ImGui::TableNextRow();
                 ImGui::TableSetColumnIndex(0);
-                ImGui::Text("Source");
+                ImGui::TextUnformatted("Source");
                 ImGui::TableSetColumnIndex(1);
                 ImGui::TextUnformatted(_this->lsf.src.c_str());
 
                 ImGui::TableNextRow();
                 ImGui::TableSetColumnIndex(0);
-                ImGui::Text("Destination");
+                ImGui::TextUnformatted("Destination");
                 ImGui::TableSetColumnIndex(1);
                 ImGui::TextUnformatted(_this->lsf.dst.c_str());
 
                 ImGui::TableNextRow();
                 ImGui::TableSetColumnIndex(0);
-                ImGui::Text("Data Type");
+                ImGui::TextUnformatted("Data Type");
                 ImGui::TableSetColumnIndex(1);
                 ImGui::TextUnformatted(M17DataTypesTxt[_this->lsf.dataType]);
 
                 ImGui::TableNextRow();
                 ImGui::TableSetColumnIndex(0);
-                ImGui::Text("Encryption");
+                ImGui::TextUnformatted("Encryption");
                 ImGui::TableSetColumnIndex(1);
                 ImGui::Text("%s (Subtype %d)", M17EncryptionTypesTxt[_this->lsf.encryptionType], _this->lsf.encryptionSubType);
 
                 ImGui::TableNextRow();
                 ImGui::TableSetColumnIndex(0);
-                ImGui::Text("CAN");
+                ImGui::TextUnformatted("CAN");
                 ImGui::TableSetColumnIndex(1);
                 ImGui::Text("%d", _this->lsf.channelAccessNum);
             }
diff --git a/decoder_modules/meteor_demodulator/src/main.cpp b/decoder_modules/meteor_demodulator/src/main.cpp
index 63bb4fcc..559a46f1 100644
--- a/decoder_modules/meteor_demodulator/src/main.cpp
+++ b/decoder_modules/meteor_demodulator/src/main.cpp
@@ -157,7 +157,7 @@ private:
             if (ImGui::Button(CONCAT("Record##_recorder_rec_", _this->name), ImVec2(menuWidth, 0))) {
                 _this->startRecording();
             }
-            ImGui::Text("Idle --.--MB");
+            ImGui::TextUnformatted("Idle --.--MB");
         }
 
         if (!_this->folderSelect.pathIsValid() && _this->enabled) { style::endDisabled(); }
diff --git a/misc_modules/frequency_manager/src/main.cpp b/misc_modules/frequency_manager/src/main.cpp
index 2b39889e..37f8d314 100644
--- a/misc_modules/frequency_manager/src/main.cpp
+++ b/misc_modules/frequency_manager/src/main.cpp
@@ -478,7 +478,7 @@ private:
         // Bookmark delete confirm dialog
         // List delete confirmation
         if (ImGui::GenericDialog(("freq_manager_del_list_confirm" + _this->name).c_str(), _this->deleteBookmarksOpen, GENERIC_DIALOG_BUTTONS_YES_NO, [_this]() {
-                ImGui::Text("Deleting selected bookmaks. Are you sure?");
+                ImGui::TextUnformatted("Deleting selected bookmaks. Are you sure?");
             }) == GENERIC_DIALOG_BUTTON_YES) {
             for (auto& _name : selectedNames) { _this->bookmarks.erase(_name); }
             _this->saveByName(_this->selectedListName);
diff --git a/misc_modules/rigctl_server/src/main.cpp b/misc_modules/rigctl_server/src/main.cpp
index 85d970eb..87315596 100644
--- a/misc_modules/rigctl_server/src/main.cpp
+++ b/misc_modules/rigctl_server/src/main.cpp
@@ -183,7 +183,7 @@ private:
             _this->startServer();
         }
 
-        ImGui::Text("Status:");
+        ImGui::TextUnformatted("Status:");
         ImGui::SameLine();
         if (_this->client && _this->client->isOpen()) {
             ImGui::TextColored(ImVec4(0.0, 1.0, 0.0, 1.0), "Connected");
@@ -192,7 +192,7 @@ private:
             ImGui::TextColored(ImVec4(1.0, 1.0, 0.0, 1.0), "Listening");
         }
         else {
-            ImGui::Text("Idle");
+            ImGui::TextUnformatted("Idle");
         }
     }
 
diff --git a/misc_modules/scheduler/src/main.cpp b/misc_modules/scheduler/src/main.cpp
index 16ae853e..e5227467 100644
--- a/misc_modules/scheduler/src/main.cpp
+++ b/misc_modules/scheduler/src/main.cpp
@@ -114,7 +114,7 @@ private:
                 }
 
                 ImGui::TableSetColumnIndex(1);
-                ImGui::Text("todo");
+                ImGui::TextUnformatted("todo");
             }
             ImGui::EndTable();
         }
diff --git a/misc_modules/scheduler/src/sched_task.h b/misc_modules/scheduler/src/sched_task.h
index 6f9eeaa6..41a11de9 100644
--- a/misc_modules/scheduler/src/sched_task.h
+++ b/misc_modules/scheduler/src/sched_task.h
@@ -60,7 +60,7 @@ public:
             // Fill rows here
             ImGui::TableNextRow();
             ImGui::TableSetColumnIndex(0);
-            ImGui::Text("Every day at 00:00:00");
+            ImGui::TextUnformatted("Every day at 00:00:00");
 
             ImGui::EndTable();
         }
diff --git a/sink_modules/network_sink/src/main.cpp b/sink_modules/network_sink/src/main.cpp
index daa38269..d714bc78 100644
--- a/sink_modules/network_sink/src/main.cpp
+++ b/sink_modules/network_sink/src/main.cpp
@@ -182,7 +182,7 @@ public:
             config.release(true);
         }
 
-        ImGui::Text("Status:");
+        ImGui::TextUnformatted("Status:");
         ImGui::SameLine();
         if (conn && conn->isOpen()) {
             ImGui::TextColored(ImVec4(0.0, 1.0, 0.0, 1.0), (modeId == SINK_MODE_TCP) ? "Connected" : "Sending");
@@ -191,7 +191,7 @@ public:
             ImGui::TextColored(ImVec4(1.0, 1.0, 0.0, 1.0), "Listening");
         }
         else {
-            ImGui::Text("Idle");
+            ImGui::TextUnformatted("Idle");
         }
     }
 
diff --git a/source_modules/sdrpp_server_source/src/main.cpp b/source_modules/sdrpp_server_source/src/main.cpp
index 85552824..0210ba61 100644
--- a/source_modules/sdrpp_server_source/src/main.cpp
+++ b/source_modules/sdrpp_server_source/src/main.cpp
@@ -147,7 +147,7 @@ private:
         gui::mainWindow.playButtonLocked = !connected;
 
         ImGui::GenericDialog("##sdrpp_srv_src_err_dialog", _this->serverBusy, GENERIC_DIALOG_BUTTONS_OK, [=](){
-            ImGui::Text("This server is already in use.");
+            ImGui::TextUnformatted("This server is already in use.");
         });
 
         if (connected) { style::beginDisabled(); }
@@ -210,7 +210,7 @@ private:
                 _this->client->bytes = 0;
             }
 
-            ImGui::Text("Status:");
+            ImGui::TextUnformatted("Status:");
             ImGui::SameLine();
             ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Connected (%.3f Mbit/s)", _this->datarate);
 
@@ -219,9 +219,9 @@ private:
             _this->client->showMenu();
         }
         else {
-            ImGui::Text("Status:");
+            ImGui::TextUnformatted("Status:");
             ImGui::SameLine();
-            ImGui::Text("Not connected (--.--- Mbit/s)");
+            ImGui::TextUnformatted("Not connected (--.--- Mbit/s)");
         }
     }