diff --git a/install.sh b/install.sh
index f5e88eb..b3ec5c4 100755
--- a/install.sh
+++ b/install.sh
@@ -41,6 +41,7 @@ usage() {
helpify "--round, --roundedmaxwindow" "" "Set maximized window to rounded" "Default is square"
helpify "--right, --rightplacement" "" "Set Nautilus titlebutton placement to right" "Default is left"
helpify "--black, --blackfont" "" "Set panel font color to black" "Default is white"
+ helpify "--darker, --darkercolor" "" "Install darker '${THEME_NAME}' dark themes" ""
helpify "--dialog, --interactive" "" "Run this installer interactively, with dialogs" ""
helpify "--silent-mode" "" "Meant for developers: ignore any confirm prompt and params become more strict" ""
helpify "-r, --remove, -u, --uninstall" "" "Remove all installed ${THEME_NAME} themes" ""
@@ -66,7 +67,7 @@ while [[ $# -gt 0 ]]; do
# at once
case "${1}" in
- # Parameters that don't require value
+ # Parameters that don't require value
-r|--remove|-u|-uninstall)
uninstall='true'; shift ;;
--silent-mode)
@@ -81,11 +82,13 @@ while [[ $# -gt 0 ]]; do
max_round="true"; shift ;;
--black|--blackfont)
black_font="true"; shift ;;
+ --darker|--darkercolor)
+ darker="true"; shift ;;
-HD|--highdefinition)
compact="false"; shift ;;
-m|--monterey)
monterey="true"; shift ;;
- # Parameters that require value, single use
+ # Parameters that require value, single use
-b|--background)
check_param "${1}" "${1}" "${2}" "must" "must" "must" "false" && shift 2 || shift ;;
-d|--dest)
@@ -124,10 +127,14 @@ finalize_argument_parsing
#---------------------------START INSTALL THEMES-------------------------------#
if [[ "${uninstall}" == 'true' ]]; then
- prompt -i "Removing '${name}' themes in '${dest}'..."
- prompt -w "REMOVAL: Non file-related parameters will be ignored."; echo
+ prompt -i "Removing '${name}' gtk themes in '${dest}'... \n"
+ prompt -w "REMOVAL: Non file-related parameters will be ignored. \n"
remove_themes
- prompt -s "Done! All '${name}' themes has been removed."
+ prompt -s "Done! All '${name}' gtk themes in has been removed. \n"
+
+ if [[ -f "${MISC_GR_FILE}.bak" ]]; then
+ prompt -e "Find installed GDM theme, you need to run: 'sudo ./tweaks.sh -g -r' to remove it!"
+ fi
else
if [[ "${interactive}" == 'true' ]]; then
show_panel_opacity_dialog; show_sidebar_size_dialog; show_nautilus_style_dialog
@@ -136,7 +143,7 @@ else
show_needed_dialogs
fi
- prompt -w "Removing the old '${name}' themes..."
+ prompt -w "Removing the old '${name}' themes... \n"
remove_themes; customize_theme; avoid_variant_duplicates; echo
diff --git a/lib-flatpak.sh b/lib-flatpak.sh
index 9ad35ca..e206bab 100755
--- a/lib-flatpak.sh
+++ b/lib-flatpak.sh
@@ -48,11 +48,7 @@ pakitheme_gtk3() {
rm -rf "$build_dir"
mkdir -p "$build_dir/files"
- theme_gtk_version=$(ls -1d "$theme_path"/* 2>/dev/null | grep -Po 'gtk-3\.\K\d+$' | sort -nr | head -1)
- [[ -n "$theme_gtk_version" ]] || \
- die "Theme directory did not contain any recognized GTK themes."
-
- cp -a "$theme_path/gtk-3.$theme_gtk_version/"* "$build_dir/files"
+ cp -a "$theme_path/gtk-3.0/"* "$build_dir/files"
mkdir -p "$build_dir/files/share/appdata"
cat >"$build_dir/files/share/appdata/$gtk3_app_id.appdata.xml" <
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-12)" />
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,11.999996)" />
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,11.999992)" />
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-11.999996)" />
+ inkscape:window-width="1545"
+ inkscape:window-height="1017"
+ inkscape:window-x="31"
+ inkscape:window-y="33"
+ inkscape:window-maximized="0"
+ inkscape:pagecheckerboard="0"
+ inkscape:snap-global="true"
+ inkscape:snap-smooth-nodes="true">
+ inkscape:label="#g5228"
+ transform="translate(-12,5.1035156e-5)">
+ transform="rotate(90)" />
+ inkscape:label="#g5234"
+ transform="translate(7)">
+ y="-143.99998"
+ transform="rotate(90)" />
+ inkscape:label="#g5240"
+ transform="translate(-2.000003)">
+ y="-159.99998"
+ transform="rotate(90)" />
+ inkscape:label="#g5258"
+ transform="translate(-16.000004)">
+ inkscape:label="#g5252"
+ transform="translate(5.9999968)">
+ inkscape:label="#g5246"
+ transform="translate(-3.0000062)">
+ inkscape:label="#g1831"
+ transform="translate(-9)">
+ style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ inkscape:label="#g1951"
+ transform="translate(-9)">
+ style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ inkscape:label="#g1581"
+ transform="translate(-9)">