Merge pull request #1599 from FreeRDP/ref_struct

Project folder refactoring following the GNOME guidelines. 1st batch.

260 files changed, 76 insertions, 31 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9c69a503..aff067316 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,6 +148,12 @@ if(NOT REMMINA_UIDIR)
         set(REMMINA_RUNTIME_UIDIR "${REMMINA_UIDIR}")
     endif()
 endif()
+if(NOT REMMINA_THEMEDIR)
+    set(REMMINA_THEMEDIR "${REMMINA_DATADIR}/remmina/theme")
+    if(NOT REMMINA_RUNTIME_THEMEDIR)
+        set(REMMINA_RUNTIME_THEMEDIR "${REMMINA_THEMEDIR}")
+    endif()
+endif()
 if(NOT REMMINA_EXTERNAL_TOOLS_DIR)
     set(REMMINA_EXTERNAL_TOOLS_DIR "${REMMINA_DATADIR}/remmina/external_tools")
     if(NOT REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR)
@@ -240,5 +246,16 @@ if(GTK_FOUND)
     add_subdirectory(plugins/secret)
 endif()
 
+find_package(Intl)
+if(INTL_FOUND AND "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
+    message(STATUS "FreeBSD detected, building with Intl")
+    include_directories(${Intl_INCLUDE_DIRS})
+    target_link_libraries(remmina ${Intl_LIBRARIES})
+endif()
+if(WITH_TRANSLATIONS)
+        add_subdirectory(po)
+endif()
+
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
     ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
diff --git a/config.h.in b/config.h.in
index ecac6c7a7..1c3a4c730 100644
--- a/config.h.in
+++ b/config.h.in
@@ -23,6 +23,7 @@
 #define REMMINA_RUNTIME_LOCALEDIR		"${REMMINA_RUNTIME_LOCALEDIR}"
 #define REMMINA_RUNTIME_PLUGINDIR		"${REMMINA_RUNTIME_PLUGINDIR}"
 #define REMMINA_RUNTIME_UIDIR			"${REMMINA_RUNTIME_UIDIR}"
+#define REMMINA_RUNTIME_THEMEDIR		"${REMMINA_RUNTIME_THEMEDIR}"
 #define REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR	"${REMMINA_RUNTIME_EXTERNAL_TOOLS_DIR}"
 #define REMMINA_RUNTIME_TERM_CS_DIR		"${REMMINA_TERM_CS_DIR}"
 
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 319bd7973..1abf6c4c4 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -30,4 +30,5 @@
 # version. If you delete this exception statement from all source
 # files in the program, then also delete it here.
 
-install(DIRECTORY term_colors DESTINATION "${REMMINA_DATADIR}/remmina")
+add_subdirectory(ui)
+add_subdirectory(theme)
diff --git a/data/term_colors/3024 Day.colors b/data/theme/3024 Day.colors
index ac9636cd8..ac9636cd8 100644
--- a/data/term_colors/3024 Day.colors
+++ b/data/theme/3024 Day.colors
diff --git a/data/term_colors/3024 Night.colors b/data/theme/3024 Night.colors
index 16b50283c..16b50283c 100644
--- a/data/term_colors/3024 Night.colors
+++ b/data/theme/3024 Night.colors
diff --git a/data/term_colors/AdventureTime.colors b/data/theme/AdventureTime.colors
index 59bf96c61..59bf96c61 100644
--- a/data/term_colors/AdventureTime.colors
+++ b/data/theme/AdventureTime.colors
diff --git a/data/term_colors/Afterglow.colors b/data/theme/Afterglow.colors
index 680fb1b24..680fb1b24 100644
--- a/data/term_colors/Afterglow.colors
+++ b/data/theme/Afterglow.colors
diff --git a/data/term_colors/AlienBlood.colors b/data/theme/AlienBlood.colors
index e89632814..e89632814 100644
--- a/data/term_colors/AlienBlood.colors
+++ b/data/theme/AlienBlood.colors
diff --git a/data/term_colors/Argonaut.colors b/data/theme/Argonaut.colors
index 12b5403ba..12b5403ba 100644
--- a/data/term_colors/Argonaut.colors
+++ b/data/theme/Argonaut.colors
diff --git a/data/term_colors/Arthur.colors b/data/theme/Arthur.colors
index a2aaee2c0..a2aaee2c0 100644
--- a/data/term_colors/Arthur.colors
+++ b/data/theme/Arthur.colors
diff --git a/data/term_colors/AtelierSulphurpool.colors b/data/theme/AtelierSulphurpool.colors
index c5159afe6..c5159afe6 100644
--- a/data/term_colors/AtelierSulphurpool.colors
+++ b/data/theme/AtelierSulphurpool.colors
diff --git a/data/term_colors/Atom.colors b/data/theme/Atom.colors
index 6681369ce..6681369ce 100644
--- a/data/term_colors/Atom.colors
+++ b/data/theme/Atom.colors
diff --git a/data/term_colors/AtomOneLight.colors b/data/theme/AtomOneLight.colors
index e33fbdbc5..e33fbdbc5 100644
--- a/data/term_colors/AtomOneLight.colors
+++ b/data/theme/AtomOneLight.colors
diff --git a/data/term_colors/Batman.colors b/data/theme/Batman.colors
index e80059e42..e80059e42 100644
--- a/data/term_colors/Batman.colors
+++ b/data/theme/Batman.colors
diff --git a/data/term_colors/Belafonte Day.colors b/data/theme/Belafonte Day.colors
index 33d7672f6..33d7672f6 100644
--- a/data/term_colors/Belafonte Day.colors
+++ b/data/theme/Belafonte Day.colors
diff --git a/data/term_colors/Belafonte Night.colors b/data/theme/Belafonte Night.colors
index 4851bc338..4851bc338 100644
--- a/data/term_colors/Belafonte Night.colors
+++ b/data/theme/Belafonte Night.colors
diff --git a/data/term_colors/BirdsOfParadise.colors b/data/theme/BirdsOfParadise.colors
index b93a11873..b93a11873 100644
--- a/data/term_colors/BirdsOfParadise.colors
+++ b/data/theme/BirdsOfParadise.colors
diff --git a/data/term_colors/Blazer.colors b/data/theme/Blazer.colors
index 788920146..788920146 100644
--- a/data/term_colors/Blazer.colors
+++ b/data/theme/Blazer.colors
diff --git a/data/term_colors/BlulocoDark.colors b/data/theme/BlulocoDark.colors
index 8a6b43a52..8a6b43a52 100644
--- a/data/term_colors/BlulocoDark.colors
+++ b/data/theme/BlulocoDark.colors
diff --git a/data/term_colors/BlulocoLight.colors b/data/theme/BlulocoLight.colors
index c426ccc1d..c426ccc1d 100644
--- a/data/term_colors/BlulocoLight.colors
+++ b/data/theme/BlulocoLight.colors
diff --git a/data/term_colors/Borland.colors b/data/theme/Borland.colors
index cc5d57764..cc5d57764 100644
--- a/data/term_colors/Borland.colors
+++ b/data/theme/Borland.colors
diff --git a/data/term_colors/Bright Lights.colors b/data/theme/Bright Lights.colors
index d7b0671c8..d7b0671c8 100644
--- a/data/term_colors/Bright Lights.colors
+++ b/data/theme/Bright Lights.colors
diff --git a/data/term_colors/Broadcast.colors b/data/theme/Broadcast.colors
index 3ba570ede..3ba570ede 100644
--- a/data/term_colors/Broadcast.colors
+++ b/data/theme/Broadcast.colors
diff --git a/data/term_colors/Brogrammer.colors b/data/theme/Brogrammer.colors
index 231e76e58..231e76e58 100644
--- a/data/term_colors/Brogrammer.colors
+++ b/data/theme/Brogrammer.colors
diff --git a/data/term_colors/Builtin Dark.colors b/data/theme/Builtin Dark.colors
index 27f2d5a77..27f2d5a77 100644
--- a/data/term_colors/Builtin Dark.colors
+++ b/data/theme/Builtin Dark.colors
diff --git a/data/term_colors/Builtin Light.colors b/data/theme/Builtin Light.colors
index 2e5a53b49..2e5a53b49 100644
--- a/data/term_colors/Builtin Light.colors
+++ b/data/theme/Builtin Light.colors
diff --git a/data/term_colors/Builtin Pastel Dark.colors b/data/theme/Builtin Pastel Dark.colors
index f0381c580..f0381c580 100644
--- a/data/term_colors/Builtin Pastel Dark.colors
+++ b/data/theme/Builtin Pastel Dark.colors
diff --git a/data/term_colors/Builtin Solarized Dark.colors b/data/theme/Builtin Solarized Dark.colors
index c92b78014..c92b78014 100644
--- a/data/term_colors/Builtin Solarized Dark.colors
+++ b/data/theme/Builtin Solarized Dark.colors
diff --git a/data/term_colors/Builtin Solarized Light.colors b/data/theme/Builtin Solarized Light.colors
index c2f7f0d0d..c2f7f0d0d 100644
--- a/data/term_colors/Builtin Solarized Light.colors
+++ b/data/theme/Builtin Solarized Light.colors
diff --git a/data/term_colors/Builtin Tango Dark.colors b/data/theme/Builtin Tango Dark.colors
index 4d43e43a8..4d43e43a8 100644
--- a/data/term_colors/Builtin Tango Dark.colors
+++ b/data/theme/Builtin Tango Dark.colors
diff --git a/data/term_colors/Builtin Tango Light.colors b/data/theme/Builtin Tango Light.colors
index d6001e9b4..d6001e9b4 100644
--- a/data/term_colors/Builtin Tango Light.colors
+++ b/data/theme/Builtin Tango Light.colors
diff --git a/data/term_colors/C64.colors b/data/theme/C64.colors
index 0585e776c..0585e776c 100644
--- a/data/term_colors/C64.colors
+++ b/data/theme/C64.colors
diff --git a/data/term_colors/CLRS.colors b/data/theme/CLRS.colors
index fd2526af0..fd2526af0 100644
--- a/data/term_colors/CLRS.colors
+++ b/data/theme/CLRS.colors
diff --git a/data/theme/CMakeLists.txt b/data/theme/CMakeLists.txt
new file mode 100644
index 000000000..0a26f368c
--- /dev/null
+++ b/data/theme/CMakeLists.txt
@@ -0,0 +1,37 @@
+# data/theme - The GTK+ Remote Desktop Client
+#
+# Copyright (C) 2014-2018 Antenore Gatta, Giovanni Panozzo
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301, USA.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
+
+file(GLOB TERM_COLOR_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.colors")
+foreach(ITEM ${TERM_COLOR_FILES})
+    list( APPEND FILES_TO_DEPLOY "${ITEM}" )
+endforeach()
+install( FILES ${FILES_TO_DEPLOY} DESTINATION "${REMMINA_THEMEDIR}" )
diff --git a/data/term_colors/Calamity.colors b/data/theme/Calamity.colors
index e29a5433d..e29a5433d 100644
--- a/data/term_colors/Calamity.colors
+++ b/data/theme/Calamity.colors
diff --git a/data/term_colors/Chalk.colors b/data/theme/Chalk.colors
index 1fc008371..1fc008371 100644
--- a/data/term_colors/Chalk.colors
+++ b/data/theme/Chalk.colors
diff --git a/data/term_colors/Chalkboard.colors b/data/theme/Chalkboard.colors
index e7b4389d1..e7b4389d1 100644
--- a/data/term_colors/Chalkboard.colors
+++ b/data/theme/Chalkboard.colors
diff --git a/data/term_colors/Ciapre.colors b/data/theme/Ciapre.colors
index d9c32889f..d9c32889f 100644
--- a/data/term_colors/Ciapre.colors
+++ b/data/theme/Ciapre.colors
diff --git a/data/term_colors/Cobalt Neon.colors b/data/theme/Cobalt Neon.colors
index be1b722fe..be1b722fe 100644
--- a/data/term_colors/Cobalt Neon.colors
+++ b/data/theme/Cobalt Neon.colors
diff --git a/data/term_colors/Cobalt2.colors b/data/theme/Cobalt2.colors
index 9788a7edf..9788a7edf 100644
--- a/data/term_colors/Cobalt2.colors
+++ b/data/theme/Cobalt2.colors
diff --git a/data/term_colors/CrayonPonyFish.colors b/data/theme/CrayonPonyFish.colors
index 15cf3c4ca..15cf3c4ca 100644
--- a/data/term_colors/CrayonPonyFish.colors
+++ b/data/theme/CrayonPonyFish.colors
diff --git a/data/term_colors/Dark Pastel.colors b/data/theme/Dark Pastel.colors
index 41d12ef35..41d12ef35 100644
--- a/data/term_colors/Dark Pastel.colors
+++ b/data/theme/Dark Pastel.colors
diff --git a/data/term_colors/Darkside.colors b/data/theme/Darkside.colors
index 4341bdb7b..4341bdb7b 100644
--- a/data/term_colors/Darkside.colors
+++ b/data/theme/Darkside.colors
diff --git a/data/term_colors/Desert.colors b/data/theme/Desert.colors
index 62178acda..62178acda 100644
--- a/data/term_colors/Desert.colors
+++ b/data/theme/Desert.colors
diff --git a/data/term_colors/DimmedMonokai.colors b/data/theme/DimmedMonokai.colors
index 883931461..883931461 100644
--- a/data/term_colors/DimmedMonokai.colors
+++ b/data/theme/DimmedMonokai.colors
diff --git a/data/term_colors/DotGov.colors b/data/theme/DotGov.colors
index 922433b94..922433b94 100644
--- a/data/term_colors/DotGov.colors
+++ b/data/theme/DotGov.colors
diff --git a/data/term_colors/Dracula.colors b/data/theme/Dracula.colors
index 97aa5f3fc..97aa5f3fc 100644
--- a/data/term_colors/Dracula.colors
+++ b/data/theme/Dracula.colors
diff --git a/data/term_colors/Duotone Dark.colors b/data/theme/Duotone Dark.colors
index 0d1d6e871..0d1d6e871 100644
--- a/data/term_colors/Duotone Dark.colors
+++ b/data/theme/Duotone Dark.colors
diff --git a/data/term_colors/ENCOM.colors b/data/theme/ENCOM.colors
index 5e76d4ddf..5e76d4ddf 100644
--- a/data/term_colors/ENCOM.colors
+++ b/data/theme/ENCOM.colors
diff --git a/data/term_colors/Earthsong.colors b/data/theme/Earthsong.colors
index 5bca42f05..5bca42f05 100644
--- a/data/term_colors/Earthsong.colors
+++ b/data/theme/Earthsong.colors
diff --git a/data/term_colors/Elemental.colors b/data/theme/Elemental.colors
index a649b2100..a649b2100 100644
--- a/data/term_colors/Elemental.colors
+++ b/data/theme/Elemental.colors
diff --git a/data/term_colors/Elementary.colors b/data/theme/Elementary.colors
index bb964b550..bb964b550 100644
--- a/data/term_colors/Elementary.colors
+++ b/data/theme/Elementary.colors
diff --git a/data/term_colors/Espresso Libre.colors b/data/theme/Espresso Libre.colors
index 9a3e54b7a..9a3e54b7a 100644
--- a/data/term_colors/Espresso Libre.colors
+++ b/data/theme/Espresso Libre.colors
diff --git a/data/term_colors/Espresso.colors b/data/theme/Espresso.colors
index dce8ef0b1..dce8ef0b1 100644
--- a/data/term_colors/Espresso.colors
+++ b/data/theme/Espresso.colors
diff --git a/data/term_colors/Fahrenheit.colors b/data/theme/Fahrenheit.colors
index 69a1587f9..69a1587f9 100644
--- a/data/term_colors/Fahrenheit.colors
+++ b/data/theme/Fahrenheit.colors
diff --git a/data/term_colors/Fideloper.colors b/data/theme/Fideloper.colors
index 2af16ba94..2af16ba94 100644
--- a/data/term_colors/Fideloper.colors
+++ b/data/theme/Fideloper.colors
diff --git a/data/term_colors/FirefoxDev.colors b/data/theme/FirefoxDev.colors
index 0f79e4b2f..0f79e4b2f 100644
--- a/data/term_colors/FirefoxDev.colors
+++ b/data/theme/FirefoxDev.colors
diff --git a/data/term_colors/Firewatch.colors b/data/theme/Firewatch.colors
index 66c6f70a3..66c6f70a3 100644
--- a/data/term_colors/Firewatch.colors
+++ b/data/theme/Firewatch.colors
diff --git a/data/term_colors/FishTank.colors b/data/theme/FishTank.colors
index 23202b238..23202b238 100644
--- a/data/term_colors/FishTank.colors
+++ b/data/theme/FishTank.colors
diff --git a/data/term_colors/Flat.colors b/data/theme/Flat.colors
index c9d6eaadd..c9d6eaadd 100644
--- a/data/term_colors/Flat.colors
+++ b/data/theme/Flat.colors
diff --git a/data/term_colors/Flatland.colors b/data/theme/Flatland.colors
index 391b92740..391b92740 100644
--- a/data/term_colors/Flatland.colors
+++ b/data/theme/Flatland.colors
diff --git a/data/term_colors/Floraverse.colors b/data/theme/Floraverse.colors
index 9171a809d..9171a809d 100644
--- a/data/term_colors/Floraverse.colors
+++ b/data/theme/Floraverse.colors
diff --git a/data/term_colors/ForestBlue.colors b/data/theme/ForestBlue.colors
index ded094ed6..ded094ed6 100644
--- a/data/term_colors/ForestBlue.colors
+++ b/data/theme/ForestBlue.colors
diff --git a/data/term_colors/FrontEndDelight.colors b/data/theme/FrontEndDelight.colors
index 6857e1069..6857e1069 100644
--- a/data/term_colors/FrontEndDelight.colors
+++ b/data/theme/FrontEndDelight.colors
diff --git a/data/term_colors/FunForrest.colors b/data/theme/FunForrest.colors
index 5193578fa..5193578fa 100644
--- a/data/term_colors/FunForrest.colors
+++ b/data/theme/FunForrest.colors
diff --git a/data/term_colors/Galaxy.colors b/data/theme/Galaxy.colors
index 8b73e774e..8b73e774e 100644
--- a/data/term_colors/Galaxy.colors
+++ b/data/theme/Galaxy.colors
diff --git a/data/term_colors/Github.colors b/data/theme/Github.colors
index e8d547a11..e8d547a11 100644
--- a/data/term_colors/Github.colors
+++ b/data/theme/Github.colors
diff --git a/data/term_colors/Glacier.colors b/data/theme/Glacier.colors
index 547d96e40..547d96e40 100644
--- a/data/term_colors/Glacier.colors
+++ b/data/theme/Glacier.colors
diff --git a/data/term_colors/Grape.colors b/data/theme/Grape.colors
index f4710a4ad..f4710a4ad 100644
--- a/data/term_colors/Grape.colors
+++ b/data/theme/Grape.colors
diff --git a/data/term_colors/Grass.colors b/data/theme/Grass.colors
index 726d10ca0..726d10ca0 100644
--- a/data/term_colors/Grass.colors
+++ b/data/theme/Grass.colors
diff --git a/data/term_colors/Gruvbox Dark.colors b/data/theme/Gruvbox Dark.colors
index 366070a33..366070a33 100644
--- a/data/term_colors/Gruvbox Dark.colors
+++ b/data/theme/Gruvbox Dark.colors
diff --git a/data/term_colors/Hacktober.colors b/data/theme/Hacktober.colors
index b10d10d5e..b10d10d5e 100644
--- a/data/term_colors/Hacktober.colors
+++ b/data/theme/Hacktober.colors
diff --git a/data/term_colors/Hardcore.colors b/data/theme/Hardcore.colors
index d7632b218..d7632b218 100644
--- a/data/term_colors/Hardcore.colors
+++ b/data/theme/Hardcore.colors
diff --git a/data/term_colors/Harper.colors b/data/theme/Harper.colors
index a00a90d11..a00a90d11 100644
--- a/data/term_colors/Harper.colors
+++ b/data/theme/Harper.colors
diff --git a/data/term_colors/Highway.colors b/data/theme/Highway.colors
index f3a733d7a..f3a733d7a 100644
--- a/data/term_colors/Highway.colors
+++ b/data/theme/Highway.colors
diff --git a/data/term_colors/Hipster Green.colors b/data/theme/Hipster Green.colors
index 0c52f08ad..0c52f08ad 100644
--- a/data/term_colors/Hipster Green.colors
+++ b/data/theme/Hipster Green.colors
diff --git a/data/term_colors/Homebrew.colors b/data/theme/Homebrew.colors
index eead27810..eead27810 100644
--- a/data/term_colors/Homebrew.colors
+++ b/data/theme/Homebrew.colors
diff --git a/data/term_colors/Hurtado.colors b/data/theme/Hurtado.colors
index e6087b816..e6087b816 100644
--- a/data/term_colors/Hurtado.colors
+++ b/data/theme/Hurtado.colors
diff --git a/data/term_colors/Hybrid.colors b/data/theme/Hybrid.colors
index 56eb8e9c7..56eb8e9c7 100644
--- a/data/term_colors/Hybrid.colors
+++ b/data/theme/Hybrid.colors
diff --git a/data/term_colors/IC_Green_PPL.colors b/data/theme/IC_Green_PPL.colors
index a68c504ee..a68c504ee 100644
--- a/data/term_colors/IC_Green_PPL.colors
+++ b/data/theme/IC_Green_PPL.colors
diff --git a/data/term_colors/IC_Orange_PPL.colors b/data/theme/IC_Orange_PPL.colors
index 6add03b64..6add03b64 100644
--- a/data/term_colors/IC_Orange_PPL.colors
+++ b/data/theme/IC_Orange_PPL.colors
diff --git a/data/term_colors/IR_Black.colors b/data/theme/IR_Black.colors
index fe3f8539c..fe3f8539c 100644
--- a/data/term_colors/IR_Black.colors
+++ b/data/theme/IR_Black.colors
diff --git a/data/term_colors/Jackie Brown.colors b/data/theme/Jackie Brown.colors
index d4356e5c8..d4356e5c8 100644
--- a/data/term_colors/Jackie Brown.colors
+++ b/data/theme/Jackie Brown.colors
diff --git a/data/term_colors/Japanesque.colors b/data/theme/Japanesque.colors
index 489183b9f..489183b9f 100644
--- a/data/term_colors/Japanesque.colors
+++ b/data/theme/Japanesque.colors
diff --git a/data/term_colors/Jellybeans.colors b/data/theme/Jellybeans.colors
index 687c81516..687c81516 100644
--- a/data/term_colors/Jellybeans.colors
+++ b/data/theme/Jellybeans.colors
diff --git a/data/term_colors/JetBrains Darcula.colors b/data/theme/JetBrains Darcula.colors
index 70e1fe4fd..70e1fe4fd 100644
--- a/data/term_colors/JetBrains Darcula.colors
+++ b/data/theme/JetBrains Darcula.colors
diff --git a/data/term_colors/Kibble.colors b/data/theme/Kibble.colors
index 15a77bbae..15a77bbae 100644
--- a/data/term_colors/Kibble.colors
+++ b/data/theme/Kibble.colors
diff --git a/data/term_colors/Later This Evening.colors b/data/theme/Later This Evening.colors
index a444ed3b5..a444ed3b5 100644
--- a/data/term_colors/Later This Evening.colors
+++ b/data/theme/Later This Evening.colors
diff --git a/data/term_colors/Lavandula.colors b/data/theme/Lavandula.colors
index c3f3ef766..c3f3ef766 100644
--- a/data/term_colors/Lavandula.colors
+++ b/data/theme/Lavandula.colors
diff --git a/data/term_colors/LiquidCarbon.colors b/data/theme/LiquidCarbon.colors
index f35cda17a..f35cda17a 100644
--- a/data/term_colors/LiquidCarbon.colors
+++ b/data/theme/LiquidCarbon.colors
diff --git a/data/term_colors/LiquidCarbonTransparent.colors b/data/theme/LiquidCarbonTransparent.colors
index 6900aa9f1..6900aa9f1 100644
--- a/data/term_colors/LiquidCarbonTransparent.colors
+++ b/data/theme/LiquidCarbonTransparent.colors
diff --git a/data/term_colors/LiquidCarbonTransparentInverse.colors b/data/theme/LiquidCarbonTransparentInverse.colors
index 6437a18ed..6437a18ed 100644
--- a/data/term_colors/LiquidCarbonTransparentInverse.colors
+++ b/data/theme/LiquidCarbonTransparentInverse.colors
diff --git a/data/term_colors/Man Page.colors b/data/theme/Man Page.colors
index 2f832e9c2..2f832e9c2 100644
--- a/data/term_colors/Man Page.colors
+++ b/data/theme/Man Page.colors
diff --git a/data/term_colors/Material.colors b/data/theme/Material.colors
index b67f3de1d..b67f3de1d 100644
--- a/data/term_colors/Material.colors
+++ b/data/theme/Material.colors
diff --git a/data/term_colors/MaterialDark.colors b/data/theme/MaterialDark.colors
index bfe97a43d..bfe97a43d 100644
--- a/data/term_colors/MaterialDark.colors
+++ b/data/theme/MaterialDark.colors
diff --git a/data/term_colors/Mathias.colors b/data/theme/Mathias.colors
index 835f2fc34..835f2fc34 100644
--- a/data/term_colors/Mathias.colors
+++ b/data/theme/Mathias.colors
diff --git a/data/term_colors/Medallion.colors b/data/theme/Medallion.colors
index 701607fe4..701607fe4 100644
--- a/data/term_colors/Medallion.colors
+++ b/data/theme/Medallion.colors
diff --git a/data/term_colors/Misterioso.colors b/data/theme/Misterioso.colors
index 3168a2a2a..3168a2a2a 100644
--- a/data/term_colors/Misterioso.colors
+++ b/data/theme/Misterioso.colors
diff --git a/data/term_colors/Molokai.colors b/data/theme/Molokai.colors
index 37e096086..37e096086 100644
--- a/data/term_colors/Molokai.colors
+++ b/data/theme/Molokai.colors
diff --git a/data/term_colors/MonaLisa.colors b/data/theme/MonaLisa.colors
index aeef69d30..aeef69d30 100644
--- a/data/term_colors/MonaLisa.colors
+++ b/data/theme/MonaLisa.colors
diff --git a/data/term_colors/Monokai Remastered.colors b/data/theme/Monokai Remastered.colors
index 7e10ed5f8..7e10ed5f8 100644
--- a/data/term_colors/Monokai Remastered.colors
+++ b/data/theme/Monokai Remastered.colors
diff --git a/data/term_colors/Monokai Soda.colors b/data/theme/Monokai Soda.colors
index 516781cdb..516781cdb 100644
--- a/data/term_colors/Monokai Soda.colors
+++ b/data/theme/Monokai Soda.colors
diff --git a/data/term_colors/Monokai Vivid.colors b/data/theme/Monokai Vivid.colors
index f95900119..f95900119 100644
--- a/data/term_colors/Monokai Vivid.colors
+++ b/data/theme/Monokai Vivid.colors
diff --git a/data/term_colors/N0tch2k.colors b/data/theme/N0tch2k.colors
index b8eea96f9..b8eea96f9 100644
--- a/data/term_colors/N0tch2k.colors
+++ b/data/theme/N0tch2k.colors
diff --git a/data/term_colors/Neopolitan.colors b/data/theme/Neopolitan.colors
index 8f98023a8..8f98023a8 100644
--- a/data/term_colors/Neopolitan.colors
+++ b/data/theme/Neopolitan.colors
diff --git a/data/term_colors/Neutron.colors b/data/theme/Neutron.colors
index c497a3053..c497a3053 100644
--- a/data/term_colors/Neutron.colors
+++ b/data/theme/Neutron.colors
diff --git a/data/term_colors/NightLion v1.colors b/data/theme/NightLion v1.colors
index 6b6be1046..6b6be1046 100644
--- a/data/term_colors/NightLion v1.colors
+++ b/data/theme/NightLion v1.colors
diff --git a/data/term_colors/NightLion v2.colors b/data/theme/NightLion v2.colors
index 2ec421ba8..2ec421ba8 100644
--- a/data/term_colors/NightLion v2.colors
+++ b/data/theme/NightLion v2.colors
diff --git a/data/term_colors/Novel.colors b/data/theme/Novel.colors
index 27f9ee2b7..27f9ee2b7 100644
--- a/data/term_colors/Novel.colors
+++ b/data/theme/Novel.colors
diff --git a/data/term_colors/Obsidian.colors b/data/theme/Obsidian.colors
index 7610b268e..7610b268e 100644
--- a/data/term_colors/Obsidian.colors
+++ b/data/theme/Obsidian.colors
diff --git a/data/term_colors/Ocean.colors b/data/theme/Ocean.colors
index 226e0c1f4..226e0c1f4 100644
--- a/data/term_colors/Ocean.colors
+++ b/data/theme/Ocean.colors
diff --git a/data/term_colors/OceanicMaterial.colors b/data/theme/OceanicMaterial.colors
index 50c76e6d6..50c76e6d6 100644
--- a/data/term_colors/OceanicMaterial.colors
+++ b/data/theme/OceanicMaterial.colors
diff --git a/data/term_colors/Ollie.colors b/data/theme/Ollie.colors
index e64e9f8a8..e64e9f8a8 100644
--- a/data/term_colors/Ollie.colors
+++ b/data/theme/Ollie.colors
diff --git a/data/term_colors/OneHalfDark.colors b/data/theme/OneHalfDark.colors
index c19872b3c..c19872b3c 100644
--- a/data/term_colors/OneHalfDark.colors
+++ b/data/theme/OneHalfDark.colors
diff --git a/data/term_colors/OneHalfLight.colors b/data/theme/OneHalfLight.colors
index 63d6a3502..63d6a3502 100644
--- a/data/term_colors/OneHalfLight.colors
+++ b/data/theme/OneHalfLight.colors
diff --git a/data/term_colors/Pandora.colors b/data/theme/Pandora.colors
index 01caaf6de..01caaf6de 100644
--- a/data/term_colors/Pandora.colors
+++ b/data/theme/Pandora.colors
diff --git a/data/term_colors/Paraiso Dark.colors b/data/theme/Paraiso Dark.colors
index 7903436c3..7903436c3 100644
--- a/data/term_colors/Paraiso Dark.colors
+++ b/data/theme/Paraiso Dark.colors
diff --git a/data/term_colors/Parasio Dark.colors b/data/theme/Parasio Dark.colors
index 7903436c3..7903436c3 100644
--- a/data/term_colors/Parasio Dark.colors
+++ b/data/theme/Parasio Dark.colors
diff --git a/data/term_colors/PaulMillr.colors b/data/theme/PaulMillr.colors
index ef79e17ff..ef79e17ff 100644
--- a/data/term_colors/PaulMillr.colors
+++ b/data/theme/PaulMillr.colors
diff --git a/data/term_colors/PencilDark.colors b/data/theme/PencilDark.colors
index 314653cad..314653cad 100644
--- a/data/term_colors/PencilDark.colors
+++ b/data/theme/PencilDark.colors
diff --git a/data/term_colors/PencilLight.colors b/data/theme/PencilLight.colors
index 7e95bdcc4..7e95bdcc4 100644
--- a/data/term_colors/PencilLight.colors
+++ b/data/theme/PencilLight.colors
diff --git a/data/term_colors/Piatto Light.colors b/data/theme/Piatto Light.colors
index 78602af6f..78602af6f 100644
--- a/data/term_colors/Piatto Light.colors
+++ b/data/theme/Piatto Light.colors
diff --git a/data/term_colors/Pnevma.colors b/data/theme/Pnevma.colors
index 783908a6e..783908a6e 100644
--- a/data/term_colors/Pnevma.colors
+++ b/data/theme/Pnevma.colors
diff --git a/data/term_colors/Pro Light.colors b/data/theme/Pro Light.colors
index 552cc5aa3..552cc5aa3 100644
--- a/data/term_colors/Pro Light.colors
+++ b/data/theme/Pro Light.colors
diff --git a/data/term_colors/Pro.colors b/data/theme/Pro.colors
index a2c009314..a2c009314 100644
--- a/data/term_colors/Pro.colors
+++ b/data/theme/Pro.colors
diff --git a/data/term_colors/Purple Rain.colors b/data/theme/Purple Rain.colors
index 241332d39..241332d39 100644
--- a/data/term_colors/Purple Rain.colors
+++ b/data/theme/Purple Rain.colors
diff --git a/data/term_colors/README.md b/data/theme/README.md
index 72df06b0e..72df06b0e 100644
--- a/data/term_colors/README.md
+++ b/data/theme/README.md
diff --git a/data/term_colors/Red Alert.colors b/data/theme/Red Alert.colors
index 1167afcb8..1167afcb8 100644
--- a/data/term_colors/Red Alert.colors
+++ b/data/theme/Red Alert.colors
diff --git a/data/term_colors/Red Planet.colors b/data/theme/Red Planet.colors
index 750a2aea3..750a2aea3 100644
--- a/data/term_colors/Red Planet.colors
+++ b/data/theme/Red Planet.colors
diff --git a/data/term_colors/Red Sands.colors b/data/theme/Red Sands.colors
index ed88a389e..ed88a389e 100644
--- a/data/term_colors/Red Sands.colors
+++ b/data/theme/Red Sands.colors
diff --git a/data/term_colors/Rippedcasts.colors b/data/theme/Rippedcasts.colors
index c79d5cbfa..c79d5cbfa 100644
--- a/data/term_colors/Rippedcasts.colors
+++ b/data/theme/Rippedcasts.colors
diff --git a/data/term_colors/Royal.colors b/data/theme/Royal.colors
index 3a31410da..3a31410da 100644
--- a/data/term_colors/Royal.colors
+++ b/data/theme/Royal.colors
diff --git a/data/term_colors/Ryuuko.colors b/data/theme/Ryuuko.colors
index 019b964e8..019b964e8 100644
--- a/data/term_colors/Ryuuko.colors
+++ b/data/theme/Ryuuko.colors
diff --git a/data/term_colors/SeaShells.colors b/data/theme/SeaShells.colors
index a7bfb4f6c..a7bfb4f6c 100644
--- a/data/term_colors/SeaShells.colors
+++ b/data/theme/SeaShells.colors
diff --git a/data/term_colors/Seafoam Pastel.colors b/data/theme/Seafoam Pastel.colors
index 1dd158355..1dd158355 100644
--- a/data/term_colors/Seafoam Pastel.colors
+++ b/data/theme/Seafoam Pastel.colors
diff --git a/data/term_colors/Seti.colors b/data/theme/Seti.colors
index 5e2533e1b..5e2533e1b 100644
--- a/data/term_colors/Seti.colors
+++ b/data/theme/Seti.colors
diff --git a/data/term_colors/Shaman.colors b/data/theme/Shaman.colors
index 9f3bff57e..9f3bff57e 100644
--- a/data/term_colors/Shaman.colors
+++ b/data/theme/Shaman.colors
diff --git a/data/term_colors/Slate.colors b/data/theme/Slate.colors
index 1bc60f2b1..1bc60f2b1 100644
--- a/data/term_colors/Slate.colors
+++ b/data/theme/Slate.colors
diff --git a/data/term_colors/Smyck.colors b/data/theme/Smyck.colors
index 81ae27b16..81ae27b16 100644
--- a/data/term_colors/Smyck.colors
+++ b/data/theme/Smyck.colors
diff --git a/data/term_colors/Snazzy.colors b/data/theme/Snazzy.colors
index 2ece0da1c..2ece0da1c 100644
--- a/data/term_colors/Snazzy.colors
+++ b/data/theme/Snazzy.colors
diff --git a/data/term_colors/SoftServer.colors b/data/theme/SoftServer.colors
index 9d6d31e2f..9d6d31e2f 100644
--- a/data/term_colors/SoftServer.colors
+++ b/data/theme/SoftServer.colors
diff --git a/data/term_colors/Solarized Darcula.colors b/data/theme/Solarized Darcula.colors
index 081a7c1a6..081a7c1a6 100644
--- a/data/term_colors/Solarized Darcula.colors
+++ b/data/theme/Solarized Darcula.colors
diff --git a/data/term_colors/Solarized Dark - Patched.colors b/data/theme/Solarized Dark - Patched.colors
index 0b5acde1a..0b5acde1a 100644
--- a/data/term_colors/Solarized Dark - Patched.colors
+++ b/data/theme/Solarized Dark - Patched.colors
diff --git a/data/term_colors/Solarized Dark Higher Contrast.colors b/data/theme/Solarized Dark Higher Contrast.colors
index 0daa86369..0daa86369 100644
--- a/data/term_colors/Solarized Dark Higher Contrast.colors
+++ b/data/theme/Solarized Dark Higher Contrast.colors
diff --git a/data/term_colors/Solarized Dark.colors b/data/theme/Solarized Dark.colors
index c92b78014..c92b78014 100644
--- a/data/term_colors/Solarized Dark.colors
+++ b/data/theme/Solarized Dark.colors
diff --git a/data/term_colors/Solarized Light.colors b/data/theme/Solarized Light.colors
index c2f7f0d0d..c2f7f0d0d 100644
--- a/data/term_colors/Solarized Light.colors
+++ b/data/theme/Solarized Light.colors
diff --git a/data/term_colors/SpaceGray Eighties Dull.colors b/data/theme/SpaceGray Eighties Dull.colors
index a00ad01cb..a00ad01cb 100644
--- a/data/term_colors/SpaceGray Eighties Dull.colors
+++ b/data/theme/SpaceGray Eighties Dull.colors
diff --git a/data/term_colors/SpaceGray Eighties.colors b/data/theme/SpaceGray Eighties.colors
index b7501b3b8..b7501b3b8 100644
--- a/data/term_colors/SpaceGray Eighties.colors
+++ b/data/theme/SpaceGray Eighties.colors
diff --git a/data/term_colors/SpaceGray.colors b/data/theme/SpaceGray.colors
index a912af002..a912af002 100644
--- a/data/term_colors/SpaceGray.colors
+++ b/data/theme/SpaceGray.colors
diff --git a/data/term_colors/Spacedust.colors b/data/theme/Spacedust.colors
index 89cde2721..89cde2721 100644
--- a/data/term_colors/Spacedust.colors
+++ b/data/theme/Spacedust.colors
diff --git a/data/term_colors/Spiderman.colors b/data/theme/Spiderman.colors
index a05a11a6f..a05a11a6f 100644
--- a/data/term_colors/Spiderman.colors
+++ b/data/theme/Spiderman.colors
diff --git a/data/term_colors/Spring.colors b/data/theme/Spring.colors
index 47c5a029a..47c5a029a 100644
--- a/data/term_colors/Spring.colors
+++ b/data/theme/Spring.colors
diff --git a/data/term_colors/Square.colors b/data/theme/Square.colors
index f808aa98d..f808aa98d 100644
--- a/data/term_colors/Square.colors
+++ b/data/theme/Square.colors
diff --git a/data/term_colors/Sundried.colors b/data/theme/Sundried.colors
index 62de86d89..62de86d89 100644
--- a/data/term_colors/Sundried.colors
+++ b/data/theme/Sundried.colors
diff --git a/data/term_colors/Symfonic.colors b/data/theme/Symfonic.colors
index 82781884b..82781884b 100644
--- a/data/term_colors/Symfonic.colors
+++ b/data/theme/Symfonic.colors
diff --git a/data/term_colors/Tango Adapted.colors b/data/theme/Tango Adapted.colors
index 84b20d862..84b20d862 100644
--- a/data/term_colors/Tango Adapted.colors
+++ b/data/theme/Tango Adapted.colors
diff --git a/data/term_colors/Tango Half Adapted.colors b/data/theme/Tango Half Adapted.colors
index d0477765e..d0477765e 100644
--- a/data/term_colors/Tango Half Adapted.colors
+++ b/data/theme/Tango Half Adapted.colors
diff --git a/data/term_colors/Teerb.colors b/data/theme/Teerb.colors
index a10674f0d..a10674f0d 100644
--- a/data/term_colors/Teerb.colors
+++ b/data/theme/Teerb.colors
diff --git a/data/term_colors/Terminal Basic.colors b/data/theme/Terminal Basic.colors
index 8077a0c94..8077a0c94 100644
--- a/data/term_colors/Terminal Basic.colors
+++ b/data/theme/Terminal Basic.colors
diff --git a/data/term_colors/Thayer Bright.colors b/data/theme/Thayer Bright.colors
index 0e41bb7f1..0e41bb7f1 100644
--- a/data/term_colors/Thayer Bright.colors
+++ b/data/theme/Thayer Bright.colors
diff --git a/data/term_colors/The Hulk.colors b/data/theme/The Hulk.colors
index cd00e890e..cd00e890e 100644
--- a/data/term_colors/The Hulk.colors
+++ b/data/theme/The Hulk.colors
diff --git a/data/term_colors/Tomorrow Night Blue.colors b/data/theme/Tomorrow Night Blue.colors
index dfc5c69a7..dfc5c69a7 100644
--- a/data/term_colors/Tomorrow Night Blue.colors
+++ b/data/theme/Tomorrow Night Blue.colors
diff --git a/data/term_colors/Tomorrow Night Bright.colors b/data/theme/Tomorrow Night Bright.colors
index 88b7edbe0..88b7edbe0 100644
--- a/data/term_colors/Tomorrow Night Bright.colors
+++ b/data/theme/Tomorrow Night Bright.colors
diff --git a/data/term_colors/Tomorrow Night Burns.colors b/data/theme/Tomorrow Night Burns.colors
index f98181edd..f98181edd 100644
--- a/data/term_colors/Tomorrow Night Burns.colors
+++ b/data/theme/Tomorrow Night Burns.colors
diff --git a/data/term_colors/Tomorrow Night Eighties.colors b/data/theme/Tomorrow Night Eighties.colors
index e4569a432..e4569a432 100644
--- a/data/term_colors/Tomorrow Night Eighties.colors
+++ b/data/theme/Tomorrow Night Eighties.colors
diff --git a/data/term_colors/Tomorrow Night.colors b/data/theme/Tomorrow Night.colors
index 041bf2738..041bf2738 100644
--- a/data/term_colors/Tomorrow Night.colors
+++ b/data/theme/Tomorrow Night.colors
diff --git a/data/term_colors/Tomorrow.colors b/data/theme/Tomorrow.colors
index 2f4810d53..2f4810d53 100644
--- a/data/term_colors/Tomorrow.colors
+++ b/data/theme/Tomorrow.colors
diff --git a/data/term_colors/ToyChest.colors b/data/theme/ToyChest.colors
index 42b10f430..42b10f430 100644
--- a/data/term_colors/ToyChest.colors
+++ b/data/theme/ToyChest.colors
diff --git a/data/term_colors/Treehouse.colors b/data/theme/Treehouse.colors
index aa05a402b..aa05a402b 100644
--- a/data/term_colors/Treehouse.colors
+++ b/data/theme/Treehouse.colors
diff --git a/data/term_colors/Twilight.colors b/data/theme/Twilight.colors
index b84f66fc9..b84f66fc9 100644
--- a/data/term_colors/Twilight.colors
+++ b/data/theme/Twilight.colors
diff --git a/data/term_colors/Ubuntu.colors b/data/theme/Ubuntu.colors
index b0be882a8..b0be882a8 100644
--- a/data/term_colors/Ubuntu.colors
+++ b/data/theme/Ubuntu.colors
diff --git a/data/term_colors/UnderTheSea.colors b/data/theme/UnderTheSea.colors
index eef0d1eb1..eef0d1eb1 100644
--- a/data/term_colors/UnderTheSea.colors
+++ b/data/theme/UnderTheSea.colors
diff --git a/data/term_colors/Urple.colors b/data/theme/Urple.colors
index 7198b2140..7198b2140 100644
--- a/data/term_colors/Urple.colors
+++ b/data/theme/Urple.colors
diff --git a/data/term_colors/Vaughn.colors b/data/theme/Vaughn.colors
index 837a5cad7..837a5cad7 100644
--- a/data/term_colors/Vaughn.colors
+++ b/data/theme/Vaughn.colors
diff --git a/data/term_colors/VibrantInk.colors b/data/theme/VibrantInk.colors
index dc1b6db67..dc1b6db67 100644
--- a/data/term_colors/VibrantInk.colors
+++ b/data/theme/VibrantInk.colors
diff --git a/data/term_colors/Violet Dark.colors b/data/theme/Violet Dark.colors
index 493b72e91..493b72e91 100644
--- a/data/term_colors/Violet Dark.colors
+++ b/data/theme/Violet Dark.colors
diff --git a/data/term_colors/Violet Light.colors b/data/theme/Violet Light.colors
index afc4cf398..afc4cf398 100644
--- a/data/term_colors/Violet Light.colors
+++ b/data/theme/Violet Light.colors
diff --git a/data/term_colors/WarmNeon.colors b/data/theme/WarmNeon.colors
index 77a3c5796..77a3c5796 100644
--- a/data/term_colors/WarmNeon.colors
+++ b/data/theme/WarmNeon.colors
diff --git a/data/term_colors/Wez.colors b/data/theme/Wez.colors
index 72cfe77f0..72cfe77f0 100644
--- a/data/term_colors/Wez.colors
+++ b/data/theme/Wez.colors
diff --git a/data/term_colors/WildCherry.colors b/data/theme/WildCherry.colors
index ebe2bdb12..ebe2bdb12 100644
--- a/data/term_colors/WildCherry.colors
+++ b/data/theme/WildCherry.colors
diff --git a/data/term_colors/Wombat.colors b/data/theme/Wombat.colors
index 9226cfa91..9226cfa91 100644
--- a/data/term_colors/Wombat.colors
+++ b/data/theme/Wombat.colors
diff --git a/data/term_colors/Wryan.colors b/data/theme/Wryan.colors
index 617b84a74..617b84a74 100644
--- a/data/term_colors/Wryan.colors
+++ b/data/theme/Wryan.colors
diff --git a/data/term_colors/Zenburn.colors b/data/theme/Zenburn.colors
index 2a553f8b8..2a553f8b8 100644
--- a/data/term_colors/Zenburn.colors
+++ b/data/theme/Zenburn.colors
diff --git a/data/term_colors/ayu.colors b/data/theme/ayu.colors
index c31e50298..c31e50298 100644
--- a/data/term_colors/ayu.colors
+++ b/data/theme/ayu.colors
diff --git a/data/term_colors/ayu_light.colors b/data/theme/ayu_light.colors
index a62710871..a62710871 100644
--- a/data/term_colors/ayu_light.colors
+++ b/data/theme/ayu_light.colors
diff --git a/data/term_colors/deep.colors b/data/theme/deep.colors
index 31b55f457..31b55f457 100644
--- a/data/term_colors/deep.colors
+++ b/data/theme/deep.colors
diff --git a/data/term_colors/idleToes.colors b/data/theme/idleToes.colors
index cfd05e641..cfd05e641 100644
--- a/data/term_colors/idleToes.colors
+++ b/data/theme/idleToes.colors
diff --git a/data/term_colors/purplepeter.colors b/data/theme/purplepeter.colors
index f4f52f7a8..f4f52f7a8 100644
--- a/data/term_colors/purplepeter.colors
+++ b/data/theme/purplepeter.colors
diff --git a/data/term_colors/synthwave.colors b/data/theme/synthwave.colors
index 92afe1c76..92afe1c76 100644
--- a/data/term_colors/synthwave.colors
+++ b/data/theme/synthwave.colors
diff --git a/remmina/ui/CMakeLists.txt b/data/ui/CMakeLists.txt
index 19c80635f..19c80635f 100644
--- a/remmina/ui/CMakeLists.txt
+++ b/data/ui/CMakeLists.txt
diff --git a/remmina/ui/remmina_about.glade b/data/ui/remmina_about.glade
index 551b0ae6a..551b0ae6a 100644
--- a/remmina/ui/remmina_about.glade
+++ b/data/ui/remmina_about.glade
diff --git a/remmina/ui/remmina_key_chooser.glade b/data/ui/remmina_key_chooser.glade
index 7a2516ad5..7a2516ad5 100644
--- a/remmina/ui/remmina_key_chooser.glade
+++ b/data/ui/remmina_key_chooser.glade
diff --git a/remmina/ui/remmina_main.glade b/data/ui/remmina_main.glade
index db214e88d..db214e88d 100644
--- a/remmina/ui/remmina_main.glade
+++ b/data/ui/remmina_main.glade
diff --git a/remmina/ui/remmina_mpc.glade b/data/ui/remmina_mpc.glade
index 3ab6087f2..3ab6087f2 100644
--- a/remmina/ui/remmina_mpc.glade
+++ b/data/ui/remmina_mpc.glade
diff --git a/remmina/ui/remmina_preferences.glade b/data/ui/remmina_preferences.glade
index 47b5d5be2..c2bf00f5b 100644
--- a/remmina/ui/remmina_preferences.glade
+++ b/data/ui/remmina_preferences.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0
+<!-- Generated with glade 3.22.1 
 
 Remmina Preferences Dialog -
 Copyright (C) Antenore Gatta & Giovanni Panozzo 2014-2018
@@ -43,6 +43,9 @@ Author: Antenore Gatta
     <property name="type_hint">dialog</property>
     <signal name="close" handler="remmina_pref_dialog_on_close_clicked" swapped="no"/>
     <signal name="destroy" handler="remmina_pref_on_dialog_destroy" swapped="no"/>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
@@ -1826,7 +1829,7 @@ Author: Antenore Gatta
                           <object class="GtkFileChooserButton" id="button_term_cs">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Chose a color scheme file, You can download one from https://github.com/mbadolato/iTerm2-Color-Schemes.</property>
+                            <property name="tooltip_text" translatable="yes">Chose a color scheme file, pre-installed themes are usually installed under /usr/share/remmina/theme. See https://github.com/mbadolato/iTerm2-Color-Schemes.</property>
                             <property name="title" translatable="yes">Terminal Color Scheme file chooser</property>
                             <signal name="file-set" handler="remmina_pref_on_color_scheme_selected" swapped="no"/>
                           </object>
@@ -1933,8 +1936,5 @@ Author: Antenore Gatta
         </child>
       </object>
     </child>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/remmina/ui/remmina_snap_info_dialog.glade b/data/ui/remmina_snap_info_dialog.glade
index 6cabd2d87..6cabd2d87 100644
--- a/remmina/ui/remmina_snap_info_dialog.glade
+++ b/data/ui/remmina_snap_info_dialog.glade
diff --git a/remmina/ui/remmina_spinner.glade b/data/ui/remmina_spinner.glade
index eef11badd..eef11badd 100644
--- a/remmina/ui/remmina_spinner.glade
+++ b/data/ui/remmina_spinner.glade
diff --git a/remmina/ui/remmina_string_list.glade b/data/ui/remmina_string_list.glade
index 60b577848..60b577848 100644
--- a/remmina/ui/remmina_string_list.glade
+++ b/data/ui/remmina_string_list.glade
diff --git a/remmina/po/CMakeLists.txt b/po/CMakeLists.txt
index c8acefd0e..c8acefd0e 100644
--- a/remmina/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
diff --git a/remmina/po/ChangeLog b/po/ChangeLog
index e69de29bb..e69de29bb 100644
--- a/remmina/po/ChangeLog
+++ b/po/ChangeLog
diff --git a/remmina/po/POTFILES.in b/po/POTFILES.in
index ca6bfebc8..ca6bfebc8 100644
--- a/remmina/po/POTFILES.in
+++ b/po/POTFILES.in
diff --git a/remmina/po/ar.po b/po/ar.po
index 579af3c8d..579af3c8d 100644
--- a/remmina/po/ar.po
+++ b/po/ar.po
diff --git a/remmina/po/ast.po b/po/ast.po
index 42cae12c1..42cae12c1 100644
--- a/remmina/po/ast.po
+++ b/po/ast.po
diff --git a/remmina/po/bg.po b/po/bg.po
index 8d5a0ec9f..8d5a0ec9f 100644
--- a/remmina/po/bg.po
+++ b/po/bg.po
diff --git a/remmina/po/bn.po b/po/bn.po
index 9122eacd0..9122eacd0 100644
--- a/remmina/po/bn.po
+++ b/po/bn.po
diff --git a/remmina/po/bs.po b/po/bs.po
index 0d03955ac..0d03955ac 100644
--- a/remmina/po/bs.po
+++ b/po/bs.po
diff --git a/remmina/po/ca.po b/po/ca.po
index 7008cdae1..7008cdae1 100644
--- a/remmina/po/ca.po
+++ b/po/ca.po
diff --git a/remmina/po/ca@valencia.po b/po/ca@valencia.po
index d0394d9cb..d0394d9cb 100644
--- a/remmina/po/ca@valencia.po
+++ b/po/ca@valencia.po
diff --git a/remmina/po/cs.po b/po/cs.po
index 7cde64c5f..7cde64c5f 100644
--- a/remmina/po/cs.po
+++ b/po/cs.po
diff --git a/remmina/po/da.po b/po/da.po
index 047e9a6a4..047e9a6a4 100644
--- a/remmina/po/da.po
+++ b/po/da.po
diff --git a/remmina/po/de.po b/po/de.po
index d4e2b0efb..d4e2b0efb 100644
--- a/remmina/po/de.po
+++ b/po/de.po
diff --git a/remmina/po/el.po b/po/el.po
index a67c3d08c..a67c3d08c 100644
--- a/remmina/po/el.po
+++ b/po/el.po
diff --git a/remmina/po/en_AU.po b/po/en_AU.po
index cf1ada790..cf1ada790 100644
--- a/remmina/po/en_AU.po
+++ b/po/en_AU.po
diff --git a/remmina/po/en_GB.po b/po/en_GB.po
index a4f333748..a4f333748 100644
--- a/remmina/po/en_GB.po
+++ b/po/en_GB.po
diff --git a/remmina/po/es.po b/po/es.po
index 9ac184095..9ac184095 100644
--- a/remmina/po/es.po
+++ b/po/es.po
diff --git a/remmina/po/es_ve b/po/es_ve
index d3c1c4abd..d3c1c4abd 100644
--- a/remmina/po/es_ve
+++ b/po/es_ve
diff --git a/remmina/po/et.po b/po/et.po
index e892749b5..e892749b5 100644
--- a/remmina/po/et.po
+++ b/po/et.po
diff --git a/remmina/po/eu.po b/po/eu.po
index a9405b684..a9405b684 100644
--- a/remmina/po/eu.po
+++ b/po/eu.po
diff --git a/remmina/po/fi.po b/po/fi.po
index 8557b0fc3..8557b0fc3 100644
--- a/remmina/po/fi.po
+++ b/po/fi.po
diff --git a/remmina/po/fr.po b/po/fr.po
index c3a789b21..c3a789b21 100644
--- a/remmina/po/fr.po
+++ b/po/fr.po
diff --git a/remmina/po/gl.po b/po/gl.po
index 2d03db2ba..2d03db2ba 100644
--- a/remmina/po/gl.po
+++ b/po/gl.po
diff --git a/remmina/po/he.po b/po/he.po
index 699dd3208..699dd3208 100644
--- a/remmina/po/he.po
+++ b/po/he.po
diff --git a/remmina/po/hr.po b/po/hr.po
index 9198a4bf3..9198a4bf3 100644
--- a/remmina/po/hr.po
+++ b/po/hr.po
diff --git a/remmina/po/hu.po b/po/hu.po
index 702e015ab..702e015ab 100644
--- a/remmina/po/hu.po
+++ b/po/hu.po
diff --git a/remmina/po/id.po b/po/id.po
index da00002a7..da00002a7 100644
--- a/remmina/po/id.po
+++ b/po/id.po
diff --git a/remmina/po/it.po b/po/it.po
index d2c95df15..d2c95df15 100644
--- a/remmina/po/it.po
+++ b/po/it.po
diff --git a/remmina/po/ja.po b/po/ja.po
index 898a68381..898a68381 100644
--- a/remmina/po/ja.po
+++ b/po/ja.po
diff --git a/remmina/po/kk.po b/po/kk.po
index 9c5a33ce0..9c5a33ce0 100644
--- a/remmina/po/kk.po
+++ b/po/kk.po
diff --git a/remmina/po/km.po b/po/km.po
index 722ff1845..722ff1845 100644
--- a/remmina/po/km.po
+++ b/po/km.po
diff --git a/remmina/po/kn.po b/po/kn.po
index 11372c157..11372c157 100644
--- a/remmina/po/kn.po
+++ b/po/kn.po
diff --git a/remmina/po/ko.po b/po/ko.po
index 5a96d7e0b..5a96d7e0b 100644
--- a/remmina/po/ko.po
+++ b/po/ko.po
diff --git a/remmina/po/lt.po b/po/lt.po
index c2c16ae2d..c2c16ae2d 100644
--- a/remmina/po/lt.po
+++ b/po/lt.po
diff --git a/remmina/po/lv.po b/po/lv.po
index 3c4fd532d..3c4fd532d 100644
--- a/remmina/po/lv.po
+++ b/po/lv.po
diff --git a/remmina/po/ms.po b/po/ms.po
index 275035806..275035806 100644
--- a/remmina/po/ms.po
+++ b/po/ms.po
diff --git a/remmina/po/my.po b/po/my.po
index 11f2f7cdc..11f2f7cdc 100644
--- a/remmina/po/my.po
+++ b/po/my.po
diff --git a/remmina/po/nb.po b/po/nb.po
index 3e22c31fa..3e22c31fa 100644
--- a/remmina/po/nb.po
+++ b/po/nb.po
diff --git a/remmina/po/nl.po b/po/nl.po
index 12d6b68ea..12d6b68ea 100644
--- a/remmina/po/nl.po
+++ b/po/nl.po
diff --git a/remmina/po/oc.po b/po/oc.po
index a5335a2e6..a5335a2e6 100644
--- a/remmina/po/oc.po
+++ b/po/oc.po
diff --git a/remmina/po/pl.po b/po/pl.po
index 5d0e41ef0..5d0e41ef0 100644
--- a/remmina/po/pl.po
+++ b/po/pl.po
diff --git a/remmina/po/pt.po b/po/pt.po
index efe382139..efe382139 100644
--- a/remmina/po/pt.po
+++ b/po/pt.po
diff --git a/remmina/po/pt_BR.po b/po/pt_BR.po
index 2f7be95cb..2f7be95cb 100644
--- a/remmina/po/pt_BR.po
+++ b/po/pt_BR.po
diff --git a/remmina/po/pt_PT.po b/po/pt_PT.po
index 22d98557b..22d98557b 100644
--- a/remmina/po/pt_PT.po
+++ b/po/pt_PT.po
diff --git a/remmina/po/ro.po b/po/ro.po
index cf1ef4bb9..cf1ef4bb9 100644
--- a/remmina/po/ro.po
+++ b/po/ro.po
diff --git a/remmina/po/ru.po b/po/ru.po
index 91598ea57..91598ea57 100644
--- a/remmina/po/ru.po
+++ b/po/ru.po
diff --git a/remmina/po/shn.po b/po/shn.po
index f9cb76e55..f9cb76e55 100644
--- a/remmina/po/shn.po
+++ b/po/shn.po
diff --git a/remmina/po/si.po b/po/si.po
index 55502091c..55502091c 100644
--- a/remmina/po/si.po
+++ b/po/si.po
diff --git a/remmina/po/sk.po b/po/sk.po
index c4e178522..c4e178522 100644
--- a/remmina/po/sk.po
+++ b/po/sk.po
diff --git a/remmina/po/sl.po b/po/sl.po
index 37643a51a..37643a51a 100644
--- a/remmina/po/sl.po
+++ b/po/sl.po
diff --git a/remmina/po/sq.po b/po/sq.po
index dba85f90a..dba85f90a 100644
--- a/remmina/po/sq.po
+++ b/po/sq.po
diff --git a/remmina/po/sr.po b/po/sr.po
index 209644914..209644914 100644
--- a/remmina/po/sr.po
+++ b/po/sr.po
diff --git a/remmina/po/sv.po b/po/sv.po
index 3347634a4..3347634a4 100644
--- a/remmina/po/sv.po
+++ b/po/sv.po
diff --git a/remmina/po/te.po b/po/te.po
index 5d5b33044..5d5b33044 100644
--- a/remmina/po/te.po
+++ b/po/te.po
diff --git a/remmina/po/th.po b/po/th.po
index dd404c91a..dd404c91a 100644
--- a/remmina/po/th.po
+++ b/po/th.po
diff --git a/remmina/po/tr.po b/po/tr.po
index f66ad4aa3..f66ad4aa3 100644
--- a/remmina/po/tr.po
+++ b/po/tr.po
diff --git a/remmina/po/ug.po b/po/ug.po
index 531e454e1..531e454e1 100644
--- a/remmina/po/ug.po
+++ b/po/ug.po
diff --git a/remmina/po/uk.po b/po/uk.po
index abae5d569..abae5d569 100644
--- a/remmina/po/uk.po
+++ b/po/uk.po
diff --git a/remmina/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 9d353250a..9d353250a 100644
--- a/remmina/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
diff --git a/remmina/po/zh_CN.po b/po/zh_CN.po
index f64e41d12..f64e41d12 100644
--- a/remmina/po/zh_CN.po
+++ b/po/zh_CN.po
diff --git a/remmina/po/zh_TW.po b/po/zh_TW.po
index 875128a48..875128a48 100644
--- a/remmina/po/zh_TW.po
+++ b/po/zh_TW.po
diff --git a/remmina/CMakeLists.txt b/remmina/CMakeLists.txt
index 406efe414..c0796cd44 100644
--- a/remmina/CMakeLists.txt
+++ b/remmina/CMakeLists.txt
@@ -149,7 +149,7 @@ if(AVAHI_FOUND)
         target_link_libraries(remmina ${AVAHI_LIBRARIES})
 endif()
 
-if (OPENSSL_FOUND)
+if(OPENSSL_FOUND)
         include_directories(${OPENSSL_INCLUDE_DIRS})
         target_link_libraries(remmina ${OPENSSL_LIBRARIES})
 endif()
@@ -184,35 +184,24 @@ if(GTK3_FOUND)
                 target_link_libraries(remmina ${APPINDICATOR_LIBRARIES})
         endif()
         find_required_package(JSONGLIB)
-        if (JSONGLIB_FOUND)
-			include_directories(${JSONGLIB_INCLUDE_DIRS})
-			target_link_libraries(remmina ${JSONGLIB_LIBRARIES})
-		else()
-			message(FATAL_ERROR "json-glib library not found")
-		endif()
-		find_required_package(LIBSOUP24)
-        if (LIBSOUP24_FOUND)
-			include_directories(${LIBSOUP24_INCLUDE_DIRS})
-			target_link_libraries(remmina ${LIBSOUP24_LIBRARIES})
-		else()
-			message(FATAL_ERROR "libsoup 2.4 library not found")
-		endif()
-endif()
-
-find_package(Intl)
-if(INTL_FOUND AND "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
-    message(STATUS "FreeBSD detected, building with Intl")
-    include_directories(${Intl_INCLUDE_DIRS})
-    target_link_libraries(remmina ${Intl_LIBRARIES})
-endif()
-if(WITH_TRANSLATIONS)
-        add_subdirectory(po)
+        if(JSONGLIB_FOUND)
+            include_directories(${JSONGLIB_INCLUDE_DIRS})
+            target_link_libraries(remmina ${JSONGLIB_LIBRARIES})
+        else()
+            message(FATAL_ERROR "json-glib library not found")
+        endif()
+        find_required_package(LIBSOUP24)
+        if(LIBSOUP24_FOUND)
+            include_directories(${LIBSOUP24_INCLUDE_DIRS})
+            target_link_libraries(remmina ${LIBSOUP24_LIBRARIES})
+        else()
+            message(FATAL_ERROR "libsoup 2.4 library not found")
+        endif()
 endif()
 
 add_subdirectory(icons)
 add_subdirectory(desktop)
 add_subdirectory(external_tools)
-add_subdirectory(ui)
 
 install(TARGETS remmina DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(DIRECTORY include/remmina/