diff --git a/app/main.cpp b/app/main.cpp
index b260308..971581a 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -37,9 +37,6 @@ int main(int argc, char *argv[])
     // Some environmental variable are necessary on certain platforms.
     // Disable Connections slot warnings
     QLoggingCategory::setFilterRules("qt.qml.connections.warning=false");
-
-    // TODO FILIPPO... This should not be hardcoded but handled as a fallback of sort!
-    QQuickStyle::setStyle("Material");
     QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::Round);
 
 // #if defined (Q_OS_LINUX)
diff --git a/app/qml/AboutDialog.qml b/app/qml/AboutDialog.qml
index 22becce..d10a396 100644
--- a/app/qml/AboutDialog.qml
+++ b/app/qml/AboutDialog.qml
@@ -22,7 +22,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.0
 
-Window {
+ApplicationWindow {
     id: dialogwindow
     title: qsTr("About")
     width: 600
@@ -37,6 +37,7 @@ Window {
         Text {
             Layout.alignment: Qt.AlignHCenter
             text: "cool-retro-term"
+            color: palette.text
             font {
                 bold: true
                 pointSize: 18
@@ -100,6 +101,7 @@ Window {
             Text {
                 Layout.alignment: Qt.AlignCenter
                 horizontalAlignment: Text.AlignHCenter
+                color: palette.text
                 text: appSettings.version + "\n" + qsTr(
                           "Author: ") + "Filippo Scognamiglio\n" + qsTr(
                           "Email: ") + "flscogna@gmail.com\n" + qsTr(
@@ -115,7 +117,8 @@ Window {
             TextArea {
                 readOnly: true
                 wrapMode: TextEdit.Wrap
-                text: "Copyright (c) 2013-2021 Filippo Scognamiglio <flscogna@gmail.com>\n\n"
+                color: palette.text
+                text: "Copyright (c) 2013-2025 Filippo Scognamiglio <flscogna@gmail.com>\n\n"
                       + "https://github.com/Swordfish90/cool-retro-term\n\n" +
                       "cool-retro-term is free software: you can redistribute it and/or modify "
                       + "it under the terms of the GNU General Public License as published by "
diff --git a/app/qml/SettingsWindow.qml b/app/qml/SettingsWindow.qml
index 4f3b6b5..688c068 100644
--- a/app/qml/SettingsWindow.qml
+++ b/app/qml/SettingsWindow.qml
@@ -24,7 +24,7 @@ import QtQuick.Window 2.1
 import QtQuick.Layouts 1.3
 import QtQuick.Dialogs
 
-Window {
+ApplicationWindow {
     id: settings_window
     title: qsTr("Settings")
     width: 640