From 9f3c16ff37fca31ec0d5020b75fb13d07bb73d0e Mon Sep 17 00:00:00 2001
From: EMH-Mark-I <EMH_Mark_I@protonmail.com>
Date: Sun, 28 Jun 2020 13:54:06 -0500
Subject: [PATCH 01/16] Remove broken symlink #129

---
 Icons/Chicago95-tux/apps/48/cd | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 Icons/Chicago95-tux/apps/48/cd

diff --git a/Icons/Chicago95-tux/apps/48/cd b/Icons/Chicago95-tux/apps/48/cd
deleted file mode 120000
index a25ec00..0000000
--- a/Icons/Chicago95-tux/apps/48/cd
+++ /dev/null
@@ -1 +0,0 @@
-/home/aidan/xfce4-panel-menu.png
\ No newline at end of file

From 8cd2cb51a9dfcf72f0ce0d1891fa545cb0a4c2a8 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Sun, 28 Jun 2020 17:34:50 -0400
Subject: [PATCH 02/16] WIP: improve Makefile installation

   Remove the webkit greeter elements as that is not really supported.
   Add initial installation commands for Plus! script.
   Still need to troubleshoot gtk directory permissions issues.
---
 .gitignore |  2 ++
 Makefile   | 43 +++++++++++++++++++++++++++++++++----------
 2 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..809104c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.*.swp
+debian
diff --git a/Makefile b/Makefile
index 2e43561..231f41f 100644
--- a/Makefile
+++ b/Makefile
@@ -50,20 +50,31 @@ xargsbin   :=$(shell which xargs)
 
 .PHONY: clean install install_files build_man uninstall list deplist deplist_opts
 
+all:
+	@${echobin} "No compilation for this project."
+
 list:
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | ${awkbin} -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | ${sortbin} | ${grepbin} -E -v -e '^[^[:alnum:]]' -e '^$@$$'
 
 install: install_all
 
-install_all: install_cursors install_doc install_fonts install_greeter install_gtk_theme install_icons install_login_sound install_boot_screen
+install_all: install_cursors install_doc install_fonts install_gtk_theme install_icons install_login_sound install_boot_screen install_plus
 
 install_cursors:
-	${installbin} -dm0755 ${ICONSDIR}/Chicago95_Cursor_Black \
+	${installbin} -dm0755 \
+		${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors \
+		${ICONSDIR}/Chicago95_Cursor_Black \
 		${ICONSDIR}/Chicago95_Cursor_White \
-		${ICONSDIR}/Chicago95_Emerald
+		${ICONSDIR}/Chicago95_Emerald \
+		${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black \
+		${ICONSDIR}/Chicago95\ Standard\ Cursors \
+
 	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Cursor_Black/* ${ICONSDIR}/Chicago95_Cursor_Black
 	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Cursor_White/* ${ICONSDIR}/Chicago95_Cursor_White
 	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Emerald/* ${ICONSDIR}/Chicago95_Emerald
+	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Animated\ Hourglass\ Cursors/* ${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors
+	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors/* ${ICONSDIR}/Chicago95\ Standard\ Cursors
+	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors\ Black/* ${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black
 	${findbin} ${ICONSDIR}/Chicago95* ! -type d -exec ${chmodbin} 0644 {} +
 
 install_doc:
@@ -77,16 +88,12 @@ install_fonts:
 	${installbin} -dm0755 ${FONTDIR}/truetype
 	${installbin} -m0644 -t ${FONTDIR}/truetype ${SRCDIR}/Fonts/vga_font/*ttf
 
-install_greeter:
-	${installbin} -dm0755 ${SHAREDIR}/lightdm-webkit/themes
-	${cpbin} -pr ${SRCDIR}/Lightdm/Chicago95 ${SHAREDIR}/lightdm-webkit/themes/
-	${findbin} ${SHAREDIR}/lightdm-webkit/themes/Chicago95 ! -type d -exec ${chmodbin} 0644 {} +
-
 install_gtk_theme:
 	${installbin} -dm0755 ${THEMESDIR}
 	${cpbin} -pr ${SRCDIR}/Theme/Chicago95 ${THEMESDIR}
 	${rmbin} -r ${THEMESDIR}/Chicago95/misc
 	${findbin} ${THEMESDIR}/Chicago95 ! -type d -exec ${chmodbin} 0644 {} +
+	${findbin} ${THEMESDIR}/Chicago95 -type d -exec ${chmodbin} 0755 {} +
 	@# xfce4-terminal theme
 	${installbin} -dm0755 ${SHAREDIR}/xfce4/terminal/colorschemes
 	${installbin} -m0644 -t ${SHAREDIR}/xfce4/terminal/colorschemes ${SRCDIR}/Extras/Chicago95.theme
@@ -108,10 +115,24 @@ install_boot_screen:
 	${installbin} -m0644 -t ${SHAREDIR}/plymouth/themes/Chicago95 ${SRCDIR}/Plymouth/Chicago95/*
 	${installbin} -m0644 -t ${SHAREDIR}/plymouth/themes/RetroTux ${SRCDIR}/Plymouth/RetroTux/*
 
+install_plus:
+	${installbin} -dm0755 ${SHAREDIR}/chicago95-theme-plus/assets ${BINDIR} ${LIBEXECDIR}/chicago95-theme-plus ${DOCDIR}/demo
+	${installbin} -m0755 -t ${SHAREDIR}/chicago95-theme-plus/assets ${SRCDIR}/Plus/assets/*
+	${installbin} -m0755 ${SRCDIR}/Plus/ChicagoPlus.py ${BINDIR}/ChicagoPlus
+	${installbin} -m0755 ${SRCDIR}/Plus/PlusGUI.py ${BINDIR}/PlusGUI
+	${installbin} -m0644 -t ${LIBEXECDIR}/chicago95-theme-plus ${SRCDIR}/Plus/pluslib.py ${SRCDIR}/Plus/plus.glade
+	${installbin} -m0644 ${SRCDIR}/Plus/README.MD ${DOCDIR}/Plus-README.MD
+	${installbin} -m0644 -t ${DOCDIR} ${SRCDIR}/Plus/*.png
+	${installbin} -m0644 -t ${DOCDIR}/demo ${SRCDIR}/Plus/demo/*
+
 uninstall:
-	${rmbin} -r ${ICONSDIR}/Chicago95_Cursor_Black \
+	${rmbin} -rf \
+		${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors \
+		${ICONSDIR}/Chicago95_Cursor_Black \
 		${ICONSDIR}/Chicago95_Cursor_White \
 		${ICONSDIR}/Chicago95_Emerald \
+		${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black \
+		${ICONSDIR}/Chicago95\ Standard\ Cursors \
 		${DOCDIR} \
 		${FONTDIR}/truetype/LessPerfectDOSVGA.ttf \
 		${FONTDIR}/truetype/MorePerfectDOSVGA.ttf \
@@ -119,7 +140,9 @@ uninstall:
 		${THEMESDIR}/Chicago95 ${SHAREDIR}/xfce4/terminal/colorschemes/Chicago95.theme \
 		${ICONSDIR}/Chicago95 ${ICONSDIR}/Chicago95-tux \
 		${SOUNDSDIR}/Chicago95 \
-		${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux 2>/dev/null || :
+		${LIBEXECDIR}/chicago95-theme-plus ${BINDIR}/ChicagoPlus ${BINDIR}/PlusGUI \
+		${SHAREDIR}/chicago95-theme-plus \
+		${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux
 
 clean:
 	-@${echobin} "target $@ not implemented yet! Gotta say unh." && ${falsebin}

From 52c5eb8ed1ebde4498c07c58eb51e6306f04e774 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Mon, 29 Jun 2020 09:07:30 -0400
Subject: [PATCH 03/16] improve installation

   Add use_underscores so dpkg deployment works.
   Add startup sound .desktop file for xdg/autostart.
---
 Makefile                         | 45 ++++++++++++++++++++------------
 sounds/chicago95-startup.desktop |  8 ++++++
 2 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 sounds/chicago95-startup.desktop

diff --git a/Makefile b/Makefile
index 231f41f..6a26fae 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,12 @@
 # History:
 # Usage:
 # Reference:
+#    spaces and underscores https://ftp.gnu.org/old-gnu/Manuals/make-3.79.1/html_chapter/make_6.html
 # Improve:
 # Dependencies:
 
 APPNAME    = chicago95
-APPVERSION = 0.0.2beta
+APPVERSION = 0.0.2
 SRCDIR     = $(CURDIR)
 prefix     = /usr
 SYSCONFDIR = $(DESTDIR)/etc
@@ -48,8 +49,16 @@ truebin    :=$(shell which true)
 uniqbin    :=$(shell which uniq)
 xargsbin   :=$(shell which xargs)
 
+use_underscores ?= NO
+
 .PHONY: clean install install_files build_man uninstall list deplist deplist_opts
 
+nullstring :=
+space :=\ $(nullstring)# end of the line
+ifeq ($(use_underscores),YES)
+space = _
+endif
+
 all:
 	@${echobin} "No compilation for this project."
 
@@ -58,23 +67,23 @@ list:
 
 install: install_all
 
-install_all: install_cursors install_doc install_fonts install_gtk_theme install_icons install_login_sound install_boot_screen install_plus
+install_all: install_cursors install_doc install_fonts install_gtk_theme install_icons install_sounds install_login_sound install_boot_screen install_plus
 
 install_cursors:
 	${installbin} -dm0755 \
-		${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors \
+		${ICONSDIR}/Chicago95$(space)Animated$(space)Hourglass$(space)Cursors \
 		${ICONSDIR}/Chicago95_Cursor_Black \
 		${ICONSDIR}/Chicago95_Cursor_White \
 		${ICONSDIR}/Chicago95_Emerald \
-		${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black \
-		${ICONSDIR}/Chicago95\ Standard\ Cursors \
+		${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors$(space)Black \
+		${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors \
 
+	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Animated\ Hourglass\ Cursors/* ${ICONSDIR}/Chicago95$(space)Animated$(space)Hourglass$(space)Cursors
 	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Cursor_Black/* ${ICONSDIR}/Chicago95_Cursor_Black
 	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Cursor_White/* ${ICONSDIR}/Chicago95_Cursor_White
 	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95_Emerald/* ${ICONSDIR}/Chicago95_Emerald
-	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Animated\ Hourglass\ Cursors/* ${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors
-	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors/* ${ICONSDIR}/Chicago95\ Standard\ Cursors
-	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors\ Black/* ${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black
+	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors/* ${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors
+	${cpbin} -pr ${SRCDIR}/Cursors/Chicago95\ Standard\ Cursors\ Black/* ${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors$(space)Black
 	${findbin} ${ICONSDIR}/Chicago95* ! -type d -exec ${chmodbin} 0644 {} +
 
 install_doc:
@@ -92,8 +101,8 @@ install_gtk_theme:
 	${installbin} -dm0755 ${THEMESDIR}
 	${cpbin} -pr ${SRCDIR}/Theme/Chicago95 ${THEMESDIR}
 	${rmbin} -r ${THEMESDIR}/Chicago95/misc
-	${findbin} ${THEMESDIR}/Chicago95 ! -type d -exec ${chmodbin} 0644 {} +
-	${findbin} ${THEMESDIR}/Chicago95 -type d -exec ${chmodbin} 0755 {} +
+	${findbin} ${THEMESDIR}/Chicago95 ! -type d -exec ${chmodbin} 0644 {} + || :
+	${findbin} ${THEMESDIR}/Chicago95 -type d -exec ${chmodbin} 0755 {} + || :
 	@# xfce4-terminal theme
 	${installbin} -dm0755 ${SHAREDIR}/xfce4/terminal/colorschemes
 	${installbin} -m0644 -t ${SHAREDIR}/xfce4/terminal/colorschemes ${SRCDIR}/Extras/Chicago95.theme
@@ -103,12 +112,16 @@ install_icons:
 	${cpbin} -pr ${SRCDIR}/Icons/* ${ICONSDIR}/
 	${findbin} ${ICONSDIR}/Chicago95* ! -type d ! -type l -exec ${chmodbin} 0644 {} +
 
+install_sounds:
+	${installbin} -dm0755 ${SOUNDSDIR}/Chicago95/stereo
+	${installbin} -m0644 -t ${SOUNDSDIR}/Chicago95/stereo ${SRCDIR}/sounds/Chicago95/stereo/*
+	${installbin} -m0644 -t ${SOUNDSDIR}/Chicago95 ${SRCDIR}/sounds/Chicago95/index.theme
+
 install_login_sound:
-	${installbin} -dm0755 ${SOUNDSDIR}/Chicago95
-	# pending addition of debian/chicago95-startup.desktop to source ${XDGAUTODIR}
+	${installbin} -dm0755 ${SOUNDSDIR}/Chicago95 ${XDGAUTODIR}
 	${installbin} -m0644 ${SRCDIR}/Extras/Microsoft\ Windows\ 95\ Startup\ Sound.ogg ${SOUNDSDIR}/Chicago95/startup.ogg
 	# pending addition of debian/chicago95-startup.desktop to source ${XDGAUTODIR}
-	#${installbin} -m0644 -t ${XDGAUTODIR} ${SRCDIR}/Extras/chicago95-startup.desktop
+	${installbin} -m0644 -t ${XDGAUTODIR} ${SRCDIR}/sounds/chicago95-startup.desktop
 
 install_boot_screen:
 	${installbin} -dm0755 ${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux
@@ -127,12 +140,12 @@ install_plus:
 
 uninstall:
 	${rmbin} -rf \
-		${ICONSDIR}/Chicago95\ Animated\ Hourglass\ Cursors \
+		${ICONSDIR}/Chicago95$(space)Animated$(space)Hourglass$(space)Cursors \
 		${ICONSDIR}/Chicago95_Cursor_Black \
 		${ICONSDIR}/Chicago95_Cursor_White \
 		${ICONSDIR}/Chicago95_Emerald \
-		${ICONSDIR}/Chicago95\ Standard\ Cursors\ Black \
-		${ICONSDIR}/Chicago95\ Standard\ Cursors \
+		${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors$(space)Black \
+		${ICONSDIR}/Chicago95$(space)Standard$(space)Cursors \
 		${DOCDIR} \
 		${FONTDIR}/truetype/LessPerfectDOSVGA.ttf \
 		${FONTDIR}/truetype/MorePerfectDOSVGA.ttf \
diff --git a/sounds/chicago95-startup.desktop b/sounds/chicago95-startup.desktop
new file mode 100644
index 0000000..2253c2b
--- /dev/null
+++ b/sounds/chicago95-startup.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Chicago95 startup sound
+Exec=play /usr/share/sounds/Chicago95/startup.ogg
+NoDisplay=true
+Terminal=false
+Categories=
+GenericName=startup sound

From 945aef0dd4d54de1c72ecc8afd954ba24e989571 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Mon, 29 Jun 2020 09:14:55 -0400
Subject: [PATCH 04/16] remove outdated comment

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6a26fae..335d100 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,6 @@ install_sounds:
 install_login_sound:
 	${installbin} -dm0755 ${SOUNDSDIR}/Chicago95 ${XDGAUTODIR}
 	${installbin} -m0644 ${SRCDIR}/Extras/Microsoft\ Windows\ 95\ Startup\ Sound.ogg ${SOUNDSDIR}/Chicago95/startup.ogg
-	# pending addition of debian/chicago95-startup.desktop to source ${XDGAUTODIR}
 	${installbin} -m0644 -t ${XDGAUTODIR} ${SRCDIR}/sounds/chicago95-startup.desktop
 
 install_boot_screen:

From b41148cf11134083b9b49f903401235f164e422b Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Mon, 29 Jun 2020 16:08:59 -0400
Subject: [PATCH 05/16] Makefile: improve docs and add panel theme

---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 335d100..dddc532 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,7 @@ install_doc:
 	@# rename a few files
 	${installbin} -m0644 ${SRCDIR}/Plymouth/Readme.md ${DOCDIR}/Plymouth-readme.md
 	${installbin} -m0644 ${SRCDIR}/Lightdm/Chicago95/README.md ${DOCDIR}/Lightdm-readme.md
+	${installbin} -m0644 -t ${DOCDIR} ${SRCDIR}/Extras/post_install.txt
 
 install_fonts:
 	${installbin} -dm0755 ${FONTDIR}/truetype
@@ -106,6 +107,9 @@ install_gtk_theme:
 	@# xfce4-terminal theme
 	${installbin} -dm0755 ${SHAREDIR}/xfce4/terminal/colorschemes
 	${installbin} -m0644 -t ${SHAREDIR}/xfce4/terminal/colorschemes ${SRCDIR}/Extras/Chicago95.theme
+	@# panel profile
+	${installbin} -dm0755 ${SHAREDIR}/xfce4-panel-profiles/layouts
+	${installbin} -m0644 -t ${SHAREDIR}/xfce4-panel-profiles/layouts ${SRCDIR}/Extras/Chicago95_Panel_Preferences.tar.bz2
 
 install_icons:
 	${installbin} -dm0755 ${ICONSDIR}
@@ -150,11 +154,13 @@ uninstall:
 		${FONTDIR}/truetype/MorePerfectDOSVGA.ttf \
 		${SHAREDIR}/lightdm-webkit/themes/Chicago95 \
 		${THEMESDIR}/Chicago95 ${SHAREDIR}/xfce4/terminal/colorschemes/Chicago95.theme \
+		${SHAREDIR}/xfce4-panel-profiles/layouts/Chicago95_Panel_Preferences.tar.bz2 \
 		${ICONSDIR}/Chicago95 ${ICONSDIR}/Chicago95-tux \
 		${SOUNDSDIR}/Chicago95 \
 		${LIBEXECDIR}/chicago95-theme-plus ${BINDIR}/ChicagoPlus ${BINDIR}/PlusGUI \
 		${SHAREDIR}/chicago95-theme-plus \
-		${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux
+		${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux \
+		${XDGAUTODIR}/chicago95-startup.desktop
 
 clean:
 	-@${echobin} "target $@ not implemented yet! Gotta say unh." && ${falsebin}

From 938f472a2fa987071b9b29d19507922a8c847ce2 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Mon, 29 Jun 2020 17:00:15 -0400
Subject: [PATCH 06/16] plus: add directory vars

   These directory variables are useful when packaging PlusGUI
   and ChicagoPlus.
---
 Plus/ChicagoPlus.py |   2 +-
 Plus/PlusGUI.py     | 104 ++++++++++++++++++++++++--------------------
 2 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/Plus/ChicagoPlus.py b/Plus/ChicagoPlus.py
index 397aa45..65a7133 100755
--- a/Plus/ChicagoPlus.py
+++ b/Plus/ChicagoPlus.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
+import sys
 from pluslib import ChicagoPlus
 import argparse
 import logging
 import os
 from pathlib import Path
-import sys
 
 def main():
 	
diff --git a/Plus/PlusGUI.py b/Plus/PlusGUI.py
index f266cf2..8c52edc 100755
--- a/Plus/PlusGUI.py
+++ b/Plus/PlusGUI.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
+import sys
 from pluslib import ChicagoPlus
 import logging
-import sys
 from pathlib import Path
 from PIL import Image, ImageFont, ImageDraw, ImageEnhance, ImageOps
 from pprint import pprint
@@ -21,6 +21,16 @@ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GdkPixbuf, GLib
 
 running_folder = os.path.dirname(os.path.abspath(__file__))
+share_dir = running_folder
+libexec_dir = running_folder
+work_dir = running_folder
+if not os.path.exists(work_dir):
+    os.makedirs(work_dir)
+
+c95_packaged_cursor_path=str(Path.home())+"/.icons/Chicago95_Cursor_Black"
+c95_packaged_theme_path=str(Path.home())+"/.themes/Chicago95"
+c95_packaged_icons_path=str(Path.home())+"/.icons/Chicago95"
+
 #print("Font List...", end=' ', flush=True)
 fonts_output = subprocess.check_output(['convert', '-list', 'font'])
 fonts = fonts_output.decode().split('\n')
@@ -141,18 +151,18 @@ class MakePreview:
 		print("[MakePreview] Preview Generated")
 
 	def return_preview(self):
-		self.preview_window.save(running_folder+"/preview.png", "PNG")
-		return(running_folder+"/preview.png")
+		self.preview_window.save(work_dir+"/preview.png", "PNG")
+		return(work_dir+"/preview.png")
 		
 	def return_preview_double(self):
-		self.preview_window.save(running_folder+"/preview_double.png", "PNG")
-		return(running_folder+"/preview_double.png")
+		self.preview_window.save(work_dir+"/preview_double.png", "PNG")
+		return(work_dir+"/preview_double.png")
 
 	def delete_preview(self):
-		os.remove(running_folder+"/preview.png")
+		os.remove(work_dir+"/preview.png")
 
 	def delete_preview_double(self):
-		os.remove(running_folder+"/preview_double.png")
+		os.remove(work_dir+"/preview_double.png")
 
 	def set_fonts(self):
 		print("[MakePreview] Fonts...", end=' ')
@@ -239,7 +249,7 @@ class MakePreview:
 					draw.line([(button_width - 6, 4),(button_width - 6, button_height-5)],fill=colors['buttontext'], width=1)
 					self.max_button = img
 				elif button == 'close':
-					X = Image.open(running_folder+"/assets/X.png").convert('RGBA')
+					X = Image.open(share_dir+"/assets/X.png").convert('RGBA')
 					pixels = X.load()
 					rgb = struct.unpack('BBB',bytes.fromhex(colors['buttontext'].lstrip('#')))
 					for i in range(X.size[0]):
@@ -305,17 +315,17 @@ class MakePreview:
 			if self.plus.theme_config['icons']['my_computer']:
 				self.my_computer = self.make_icons(self.plus,'my_computer')
 			else:
-				self.my_computer = Image.open(running_folder+"/assets/my_computer~.png").convert('RGBA')
+				self.my_computer = Image.open(share_dir+"/assets/my_computer~.png").convert('RGBA')
 
 			if self.plus.theme_config['icons']['network_neighborhood']:
 				self.network_neighborhood= self.make_icons(self.plus,'network_neighborhood')
 			else:
-				self.network_neighborhood = Image.open(running_folder+"/assets/network_neighborhood~.png").convert('RGBA')
+				self.network_neighborhood = Image.open(share_dir+"/assets/network_neighborhood~.png").convert('RGBA')
 
 			if self.plus.theme_config['icons']['recycle_bin_empty']:
 				self.recycle_bin_empty = self.make_icons(self.plus,'recycle_bin_empty')
 			else:
-				self.recycle_bin_empty = Image.open(running_folder+"/assets/recycle_bin_empty~.png").convert('RGBA')
+				self.recycle_bin_empty = Image.open(share_dir+"/assets/recycle_bin_empty~.png").convert('RGBA')
 			
 			if self.plus.theme_config['icons']['my_documents']:
 				self.my_documents = self.make_icons(self.plus,'my_documents')
@@ -704,7 +714,7 @@ class MakePreview:
 
 	def make_icons(self, plus, ico_name):
 
-		icon = running_folder+"/assets/" + ico_name+"~"+".png"
+		icon = share_dir+"/assets/" + ico_name+"~"+".png"
 
 		if plus.theme_config['icons'][ico_name]['type'] in ['dll', 'icl']:
 			index = plus.theme_config['icons'][ico_name]['index']
@@ -713,12 +723,12 @@ class MakePreview:
 				icon_filename, icon_file = plus.get_icons_size_dll(icon_files, index)
 
 				if icon_filename:
-					f = open(running_folder+"/tmp/tmp_"+icon_filename,"wb")
+					f = open(work_dir+"/tmp_"+icon_filename,"wb")
 					f.write(icon_file)
 					f.close()
-					icon = running_folder+"/tmp/tmp_"+icon_filename
+					icon = work_dir+"/tmp_"+icon_filename
 				else:
-					icon = running_folder+"/assets/" + ico_name+"~"+".png"
+					icon = share_dir+"/assets/" + ico_name+"~"+".png"
 		else:
 			icon_files = plus.extract_ico(plus.theme_config['icons'][ico_name]['path'])
 			
@@ -741,7 +751,7 @@ class MakePreview:
 			icon_image =  Image.open(ico_name+".png").convert('RGBA')
 			os.remove(ico_name+".png")
 		except subprocess.CalledProcessError:
-			icon_image =  Image.open(running_folder+"/assets/" + ico_name+"~.png").convert('RGBA')
+			icon_image =  Image.open(share_dir+"/assets/" + ico_name+"~.png").convert('RGBA')
 		
 		return icon_image
 
@@ -752,9 +762,9 @@ class MakePreview:
 class plusGTK:
 	def __init__(self, themefile=False, colors=32, overlap=1, 
 			squaresize=20, installdir=os.getcwd(), 
-			chicago95_cursor_path=str(Path.home())+"/.icons/Chicago95_Cursor_Black",
-			chicago95_theme_path=str(Path.home())+"/.themes/Chicago95",
-			chicago95_icons_path=str(Path.home())+"/.icons/Chicago95",
+			chicago95_cursor_path=c95_packaged_cursor_path,
+			chicago95_theme_path=c95_packaged_theme_path,
+			chicago95_icons_path=c95_packaged_icons_path,
 			loglevel=logging.WARNING,
 			logfile='plus.log'):
 
@@ -798,7 +808,7 @@ class plusGTK:
 		
 		# GTK Initialization
 		self.builder = builder = Gtk.Builder()
-		self.builder.add_from_file(running_folder+"/plus.glade")
+		self.builder.add_from_file(libexec_dir+"/plus.glade")
 		self.window = self.builder.get_object("Main")
 		self.preview = self.builder.get_object("preview")
 		self.builder.connect_signals(self.handlers)
@@ -943,22 +953,22 @@ class plusGTK:
 
 
 	def other_previews(self, button):
-		checkmark = GdkPixbuf.Pixbuf.new_from_file(running_folder+"/assets/check.png")
-		nocheckmark = GdkPixbuf.Pixbuf.new_from_file(running_folder+"/assets/blank-check.png")
+		checkmark = GdkPixbuf.Pixbuf.new_from_file(share_dir+"/assets/check.png")
+		nocheckmark = GdkPixbuf.Pixbuf.new_from_file(share_dir+"/assets/blank-check.png")
 		self.previews_window = self.builder.get_object("Preview Window")
 		
 		self.cursor_preview = self.builder.get_object("cursor_preview")
-		self.cursor_preview.set_from_file(running_folder+"/assets/blank-check.png")
+		self.cursor_preview.set_from_file(share_dir+"/assets/blank-check.png")
 
 		self.icon_preview = self.builder.get_object("icon_preview")
-		self.icon_preview.set_from_file(running_folder+"/assets/blank-check.png")
+		self.icon_preview.set_from_file(share_dir+"/assets/blank-check.png")
 
 		self.sound_preview = self.builder.get_object("sound_preview")
-		self.sound_preview.set_from_file(running_folder+"/assets/blank-check.png")
+		self.sound_preview.set_from_file(share_dir+"/assets/blank-check.png")
 
 
 		self.cursor_preview = self.builder.get_object("cursor_preview")
-		self.cursor_preview.set_from_file(running_folder+"/assets/blank-check.png")
+		self.cursor_preview.set_from_file(share_dir+"/assets/blank-check.png")
 
 		# Populate cursor preview
 		self.cursor_store = self.builder.get_object("cursor_list")
@@ -992,40 +1002,40 @@ class plusGTK:
 							for icon in ani_file_config['icon']:
 								if icon['index'] == sequence:
 									cur_filename = current_cursor+"_"+str(sequence)
-									f = open(running_folder+"/tmp/"+cur_filename+".cur","wb")
+									f = open(work_dir+"/"+cur_filename+".cur","wb")
 									f.write(icon['ico_file'])
 									f.close()
 									convert_args.append("-delay")
 									convert_args.append("{}x60".format(rate))
-									convert_args.append(running_folder+"/tmp/"+cur_filename+".cur")
+									convert_args.append(work_dir+"/"+cur_filename+".cur")
 					else:
 						for icon in ani_file_config['icon']:
 							rate = ani_file_config['anih']['iDispRate'] + 5
 							cur_filename = current_cursor+"_"+str(icon['index'])
-							f = open(running_folder+"/tmp/"+cur_filename+".cur","wb")
+							f = open(work_dir+"/"+cur_filename+".cur","wb")
 							f.write(icon['ico_file'])
 							f.close()
 							convert_args.append("-delay")
 							convert_args.append("{}x60".format(rate))
-							convert_args.append(running_folder+"/tmp/"+cur_filename+".cur")
+							convert_args.append(work_dir+"/"+cur_filename+".cur")
 					convert_args.append("-loop")
 					convert_args.append("0")
-					convert_args.append(running_folder+"/tmp/"+current_cursor+".gif")
+					convert_args.append(work_dir+"/"+current_cursor+".gif")
 #					pprint(convert_args)
 					try:
 						subprocess.check_call(convert_args)
 					except:
-						copyfile(running_folder+"/assets/blank-check.png", running_folder+"/tmp/"+current_cursor+".gif")
+						copyfile(share_dir+"/assets/blank-check.png", work_dir+"/"+current_cursor+".gif")
 				else:
 					cursor_file_config = self.theme.extract_cur(filename)
 					icon_file = cursor_file_config['icon'][0]['ico_file']
-					f = open(running_folder+"/tmp/"+current_cursor+".cur","wb")
+					f = open(work_dir+"/"+current_cursor+".cur","wb")
 					f.write(icon_file)
 					f.close()
 					try:
-						subprocess.check_call(['convert', running_folder+"/tmp/"+current_cursor+".cur", running_folder+"/tmp/"+current_cursor+".gif"])
+						subprocess.check_call(['convert', work_dir+"/"+current_cursor+".cur", work_dir+"/"+current_cursor+".gif"])
 					except:
-						copyfile(running_folder+"/assets/blank-check.png", running_folder+"/tmp/"+current_cursor+".gif")
+						copyfile(share_dir+"/assets/blank-check.png", work_dir+"/"+current_cursor+".gif")
 
 				if not self.in_store(self.cursor_store, pointers[current_cursor]):
 					self.cursor_store.append([checkmark,pointers[current_cursor]])
@@ -1062,7 +1072,7 @@ class plusGTK:
 					self.icon_store[loc][0] = nocheckmark
 			else:
 				icon_image = self.preview_image.make_icons(self.theme, icon)
-				icon_image.save(running_folder+"/tmp/"+icon+".png", "PNG")
+				icon_image.save(work_dir+"/"+icon+".png", "PNG")
 				if not self.in_store(self.icon_store, icons[icon]):
 					self.icon_store.append([checkmark,icons[icon]])
 				else:
@@ -1116,10 +1126,10 @@ class plusGTK:
 		for cursor in pointers:
 			if pointers[cursor] == model[row][1]:
 				if cursor in self.theme_config['cursors'] and self.theme_config['cursors'][cursor] is not False:				
-					self.cursor_preview.set_from_file(running_folder+"/tmp/"+cursor+".gif")
+					self.cursor_preview.set_from_file(work_dir+"/"+cursor+".gif")
 					self.cursor_text_path.set_text(self.theme_config['cursors'][cursor]['path'])
 				else:
-					self.cursor_preview.set_from_file(running_folder+"/assets/blank-check.png")
+					self.cursor_preview.set_from_file(share_dir+"/assets/blank-check.png")
 					self.cursor_text_path.set_text("")
 				break
 
@@ -1131,27 +1141,27 @@ class plusGTK:
 		if model[row][1] == "Wallpaper bitmap":
 			if self.theme_config['wallpaper'] and self.theme_config['wallpaper']['theme_wallpaper']:
 				self.icon_text_path.set_text(self.theme_config['wallpaper']['theme_wallpaper']['path'])
-				self.icon_preview.set_from_file(running_folder+"/assets/blank-check.png")
+				self.icon_preview.set_from_file(share_dir+"/assets/blank-check.png")
 			else:
-				self.icon_preview.set_from_file(running_folder+"/assets/blank-check.png")
+				self.icon_preview.set_from_file(share_dir+"/assets/blank-check.png")
 				self.icon_text_path.set_text("")
 			return
 		if model[row][1] == "Screen saver":
 			if self.theme_config['screensaver'] :
 				self.icon_text_path.set_text(self.theme_config['screensaver'])
-				self.icon_preview.set_from_file(running_folder+"/assets/blank-check.png")
+				self.icon_preview.set_from_file(share_dir+"/assets/blank-check.png")
 			else:
-				self.icon_preview.set_from_file(running_folder+"/assets/blank-check.png")
+				self.icon_preview.set_from_file(share_dir+"/assets/blank-check.png")
 				self.icon_text_path.set_text("")
 			return
 		for icon in icons:
 			#print(icon, icons[icon], model[row][1])
 			if icons[icon] == model[row][1]:
 				if self.theme_config['icons'][icon] is not False:				
-					self.icon_preview.set_from_file(running_folder+"/tmp/"+icon+".png")
+					self.icon_preview.set_from_file(work_dir+"/"+icon+".png")
 					self.icon_text_path.set_text(self.theme_config['icons'][icon]['path'])
 				else:
-					self.icon_preview.set_from_file(running_folder+"/assets/blank-check.png")
+					self.icon_preview.set_from_file(share_dir+"/assets/blank-check.png")
 					self.icon_text_path.set_text("")
 				break
 
@@ -1239,9 +1249,9 @@ def main():
 	arg_parser.add_argument('-c', '--colors', help='How many colors before skipping Inkscape fix/merge for SVGs. Set to 1 to speed up conversion. WARNING: This may result in transparent icons!', default=32, type=int)
 	arg_parser.add_argument('-o', '--overlap', help='Pixel overlap for SVG icons', default=1, type=int)	
 	arg_parser.add_argument('-s', '--squaresize', help='Square size for SVG icons', default=20, type=int)
-	arg_parser.add_argument('--cursorfolder', help="Chicago95 cursor folder to convert to new theme", default=str(Path.home())+"/.icons/Chicago95_Cursor_Black")
-	arg_parser.add_argument('--themefolder', help="Chicago95 theme folder to convert to new theme", default=str(Path.home())+"/.themes/Chicago95")
-	arg_parser.add_argument('--iconsfolder', help="Chicago95 icons folder to convert to new theme", default=str(Path.home())+"/.icons/Chicago95")
+	arg_parser.add_argument('--cursorfolder', help="Chicago95 cursor folder to convert to new theme", default=c95_packaged_cursor_path)
+	arg_parser.add_argument('--themefolder', help="Chicago95 theme folder to convert to new theme", default=c95_packaged_theme_path)
+	arg_parser.add_argument('--iconsfolder', help="Chicago95 icons folder to convert to new theme", default=c95_packaged_icons_path)
 	arg_parser.add_argument("--installdir", help="Folder to create new theme in, default is current working directory", default=os.getcwd())
 	arg_parser.add_argument("--logfile", help="Filename for debug logging", default="chicago95_plus.log")
 	arg_parser.add_argument("theme_file", help="Microsoft Windows 95/98/ME .theme file", nargs="?",default=False)

From 16e605cceea4eb1a162aeac97264b39b87bae510 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Mon, 29 Jun 2020 17:25:11 -0400
Subject: [PATCH 07/16] plus: add desktop file and mimetype

---
 Makefile                      |  5 ++++-
 Plus/PlusGUI.desktop          | 14 ++++++++++++++
 Plus/chicago95-plus-theme.xml | 11 +++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 Plus/PlusGUI.desktop
 create mode 100644 Plus/chicago95-plus-theme.xml

diff --git a/Makefile b/Makefile
index dddc532..9a09797 100644
--- a/Makefile
+++ b/Makefile
@@ -132,7 +132,7 @@ install_boot_screen:
 	${installbin} -m0644 -t ${SHAREDIR}/plymouth/themes/RetroTux ${SRCDIR}/Plymouth/RetroTux/*
 
 install_plus:
-	${installbin} -dm0755 ${SHAREDIR}/chicago95-theme-plus/assets ${BINDIR} ${LIBEXECDIR}/chicago95-theme-plus ${DOCDIR}/demo
+	${installbin} -dm0755 ${SHAREDIR}/chicago95-theme-plus/assets ${BINDIR} ${LIBEXECDIR}/chicago95-theme-plus ${DOCDIR}/demo ${APPSDIR} ${MIMEDIR}
 	${installbin} -m0755 -t ${SHAREDIR}/chicago95-theme-plus/assets ${SRCDIR}/Plus/assets/*
 	${installbin} -m0755 ${SRCDIR}/Plus/ChicagoPlus.py ${BINDIR}/ChicagoPlus
 	${installbin} -m0755 ${SRCDIR}/Plus/PlusGUI.py ${BINDIR}/PlusGUI
@@ -140,6 +140,8 @@ install_plus:
 	${installbin} -m0644 ${SRCDIR}/Plus/README.MD ${DOCDIR}/Plus-README.MD
 	${installbin} -m0644 -t ${DOCDIR} ${SRCDIR}/Plus/*.png
 	${installbin} -m0644 -t ${DOCDIR}/demo ${SRCDIR}/Plus/demo/*
+	${installbin} -m0644 -t ${APPSDIR} ${SRCDIR}/Plus/*.desktop
+	${installbin} -m0644 -t ${MIMEDIR} ${SRCDIR}/Plus/chicago95-plus-theme.xml
 
 uninstall:
 	${rmbin} -rf \
@@ -159,6 +161,7 @@ uninstall:
 		${SOUNDSDIR}/Chicago95 \
 		${LIBEXECDIR}/chicago95-theme-plus ${BINDIR}/ChicagoPlus ${BINDIR}/PlusGUI \
 		${SHAREDIR}/chicago95-theme-plus \
+		${APPSDIR}/PlusGUI.desktop ${MIMEDIR}/chicago95-plus-theme.xml \
 		${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux \
 		${XDGAUTODIR}/chicago95-startup.desktop
 
diff --git a/Plus/PlusGUI.desktop b/Plus/PlusGUI.desktop
new file mode 100644
index 0000000..3cdeab8
--- /dev/null
+++ b/Plus/PlusGUI.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Categories=Settings;DesktopSettings;
+Comment=Import Windows .theme files
+Exec=/usr/bin/PlusGUI %f
+GenericName=Windows theme importer
+Icon=desktop-preferences
+Keywords=theme;import;
+MimeType=application/x-plus-theme;
+Name=Chicago95 Plus!
+Path=/tmp
+StartupNotify=true
+Terminal=false
+Type=Application
+Version=1.0
diff --git a/Plus/chicago95-plus-theme.xml b/Plus/chicago95-plus-theme.xml
new file mode 100644
index 0000000..b143c9e
--- /dev/null
+++ b/Plus/chicago95-plus-theme.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+   <mime-type type="application/x-plus-theme">
+      <sub-class-of type="application/x-theme">
+      <magic priority="75">
+         <match type="string" value="[Control Panel\Colors]" offset="0"/>
+      </magic>
+      <comment>Chicago95 Plus! theme</comment>
+      <glob pattern="*.theme"/>
+   </mime-type>
+</mime-info>

From 5b9e3cfb6ec787eb9ef6ed6824f8907138ca593b Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Tue, 30 Jun 2020 07:39:41 -0400
Subject: [PATCH 08/16] desktop file fixes

   Set icon, and also improve mimetype.
---
 Makefile                      | 2 +-
 Plus/PlusGUI.desktop          | 2 +-
 Plus/chicago95-plus-theme.xml | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9a09797..18d9c4f 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ DOCDIR     = $(SHAREDIR)/doc/$(APPNAME)
 APPDIR     = $(SHAREDIR)/$(APPNAME)
 APPSDIR    = $(SHAREDIR)/applications
 ICONSDIR   = $(SHAREDIR)/icons
-MIMEDIR    = $(SHAREDIR)/mime
+MIMEDIR    = $(SHAREDIR)/mime/packages
 MANDIR     = $(SHAREDIR)/man
 XDGAUTODIR = $(SYSCONFDIR)/xdg/autostart
 FONTDIR    = $(SHAREDIR)/fonts
diff --git a/Plus/PlusGUI.desktop b/Plus/PlusGUI.desktop
index 3cdeab8..e8bb919 100644
--- a/Plus/PlusGUI.desktop
+++ b/Plus/PlusGUI.desktop
@@ -3,7 +3,7 @@ Categories=Settings;DesktopSettings;
 Comment=Import Windows .theme files
 Exec=/usr/bin/PlusGUI %f
 GenericName=Windows theme importer
-Icon=desktop-preferences
+Icon=preferences-desktop-theme
 Keywords=theme;import;
 MimeType=application/x-plus-theme;
 Name=Chicago95 Plus!
diff --git a/Plus/chicago95-plus-theme.xml b/Plus/chicago95-plus-theme.xml
index b143c9e..2b73ba3 100644
--- a/Plus/chicago95-plus-theme.xml
+++ b/Plus/chicago95-plus-theme.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
    <mime-type type="application/x-plus-theme">
-      <sub-class-of type="application/x-theme">
+      <sub-class-of type="application/x-theme"/>
       <magic priority="75">
-         <match type="string" value="[Control Panel\Colors]" offset="0"/>
+         <match type="string" value="[Control Panel\Colors]" offset="0:32767"/>
       </magic>
       <comment>Chicago95 Plus! theme</comment>
       <glob pattern="*.theme"/>
+      <generic-icon name="desktop-preferences"/>
    </mime-type>
 </mime-info>

From 431a2a9fa0f18bdc23c2bc8ccc6083b9c0ef3357 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Tue, 30 Jun 2020 07:44:29 -0400
Subject: [PATCH 09/16] fix icon for .theme file

---
 Plus/chicago95-plus-theme.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plus/chicago95-plus-theme.xml b/Plus/chicago95-plus-theme.xml
index 2b73ba3..48308e0 100644
--- a/Plus/chicago95-plus-theme.xml
+++ b/Plus/chicago95-plus-theme.xml
@@ -7,6 +7,6 @@
       </magic>
       <comment>Chicago95 Plus! theme</comment>
       <glob pattern="*.theme"/>
-      <generic-icon name="desktop-preferences"/>
+      <generic-icon name="preferences-desktop-theme"/>
    </mime-type>
 </mime-info>

From 4a7e7637266efdbda659e99f19b8adda60284d71 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Tue, 30 Jun 2020 13:22:39 -0400
Subject: [PATCH 10/16] Makefile: add verb install_backgrounds

---
 Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 18d9c4f..b84a9e7 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # Dependencies:
 
 APPNAME    = chicago95
-APPVERSION = 0.0.2
+APPVERSION = 2.0.1
 SRCDIR     = $(CURDIR)
 prefix     = /usr
 SYSCONFDIR = $(DESTDIR)/etc
@@ -31,6 +31,7 @@ XDGAUTODIR = $(SYSCONFDIR)/xdg/autostart
 FONTDIR    = $(SHAREDIR)/fonts
 THEMESDIR  = $(SHAREDIR)/themes
 SOUNDSDIR  = $(SHAREDIR)/sounds
+BKGDSDIR   = $(SHAREDIR)/backgrounds/Chicago95
 
 awkbin     :=$(shell which awk)
 chmodbin   :=$(shell which chmod)
@@ -67,7 +68,8 @@ list:
 
 install: install_all
 
-install_all: install_cursors install_doc install_fonts install_gtk_theme install_icons install_sounds install_login_sound install_boot_screen install_plus
+.PHONY: install_cursors install_doc install_fonts install_gtk_theme install_icons install_sounds install_login_sound install_boot_screen install_plus install_backgrounds
+install_all: install_cursors install_doc install_fonts install_gtk_theme install_icons install_sounds install_login_sound install_boot_screen install_plus install_backgrounds
 
 install_cursors:
 	${installbin} -dm0755 \
@@ -143,6 +145,11 @@ install_plus:
 	${installbin} -m0644 -t ${APPSDIR} ${SRCDIR}/Plus/*.desktop
 	${installbin} -m0644 -t ${MIMEDIR} ${SRCDIR}/Plus/chicago95-plus-theme.xml
 
+install_backgrounds:
+	${installbin} -dm0755 ${BKGDSDIR}/patterns ${BKGDSDIR}/wallpapers
+	${installbin} -m0644 -t ${BKGDSDIR}/patterns ${SRCDIR}/Extras/Backgrounds/Patterns/*
+	${installbin} -m0644 -t ${BKGDSDIR}/wallpapers ${SRCDIR}/Extras/Backgrounds/Wallpaper/*
+
 uninstall:
 	${rmbin} -rf \
 		${ICONSDIR}/Chicago95$(space)Animated$(space)Hourglass$(space)Cursors \
@@ -163,6 +170,7 @@ uninstall:
 		${SHAREDIR}/chicago95-theme-plus \
 		${APPSDIR}/PlusGUI.desktop ${MIMEDIR}/chicago95-plus-theme.xml \
 		${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux \
+		${BKGDSDIR} \
 		${XDGAUTODIR}/chicago95-startup.desktop
 
 clean:

From 532e1ea0a9aefe6badf3e65d9d32138b23dbe63b Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Tue, 30 Jun 2020 15:54:50 -0400
Subject: [PATCH 11/16] add manpages for Plus!

---
 .gitignore             |  1 +
 Makefile               | 22 +++++++++++++++------
 Plus/ChicagoPlus.1.txt | 45 ++++++++++++++++++++++++++++++++++++++++++
 Plus/PlusGUI.1.txt     | 33 +++++++++++++++++++++++++++++++
 4 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 Plus/ChicagoPlus.1.txt
 create mode 100644 Plus/PlusGUI.1.txt

diff --git a/.gitignore b/.gitignore
index 809104c..e32aaed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .*.swp
 debian
+/*.[0-9].gz
diff --git a/Makefile b/Makefile
index b84a9e7..392b588 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,12 @@
 #    spaces and underscores https://ftp.gnu.org/old-gnu/Manuals/make-3.79.1/html_chapter/make_6.html
 # Improve:
 # Dependencies:
+#    build-dpkg: txt2man
 
 APPNAME    = chicago95
 APPVERSION = 2.0.1
 SRCDIR     = $(CURDIR)
+BUILDDIR   = $(CURDIR)
 prefix     = /usr
 SYSCONFDIR = $(DESTDIR)/etc
 DEFAULTDIR = $(DESTDIR)/etc/sysconfig # for debian use '$(DESTDIR)/etc/default'
@@ -49,10 +51,11 @@ sortbin    :=$(shell which sort)
 truebin    :=$(shell which true)
 uniqbin    :=$(shell which uniq)
 xargsbin   :=$(shell which xargs)
+txt2manbin :=$(shell which txt2man)
 
 use_underscores ?= NO
 
-.PHONY: clean install install_files build_man uninstall list deplist deplist_opts
+.PHONY: clean install install_files build_man uninstall list deplist deplist_opts build_man
 
 nullstring :=
 space :=\ $(nullstring)# end of the line
@@ -60,12 +63,17 @@ ifeq ($(use_underscores),YES)
 space = _
 endif
 
-all:
-	@${echobin} "No compilation for this project."
+all: build_man
 
 list:
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | ${awkbin} -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | ${sortbin} | ${grepbin} -E -v -e '^[^[:alnum:]]' -e '^$@$$'
 
+build_man:
+	@# these man pages are installed with install_plus
+	@test -d ${BUILDDIR} || mkdir -p ${BUILDDIR}
+	${txt2manbin} -P chicago95-theme-plus -r chicago95-theme-plus -d "June 2020" -t "PlusGUI" -s 1 -v "General Commands Manual" < ${SRCDIR}/Plus/PlusGUI.1.txt | ${gzipbin} > ${BUILDDIR}/PlusGUI.1.gz
+	${txt2manbin} -P chicago95-theme-plus -r chicago95-theme-plus -d "June 2020" -t "Chicago95" -s 1 -v "General Commands Manual" < ${SRCDIR}/Plus/ChicagoPlus.1.txt | ${gzipbin} > ${BUILDDIR}/ChicagoPlus.1.gz
+
 install: install_all
 
 .PHONY: install_cursors install_doc install_fonts install_gtk_theme install_icons install_sounds install_login_sound install_boot_screen install_plus install_backgrounds
@@ -134,8 +142,8 @@ install_boot_screen:
 	${installbin} -m0644 -t ${SHAREDIR}/plymouth/themes/RetroTux ${SRCDIR}/Plymouth/RetroTux/*
 
 install_plus:
-	${installbin} -dm0755 ${SHAREDIR}/chicago95-theme-plus/assets ${BINDIR} ${LIBEXECDIR}/chicago95-theme-plus ${DOCDIR}/demo ${APPSDIR} ${MIMEDIR}
-	${installbin} -m0755 -t ${SHAREDIR}/chicago95-theme-plus/assets ${SRCDIR}/Plus/assets/*
+	${installbin} -dm0755 ${SHAREDIR}/chicago95-theme-plus/assets ${BINDIR} ${LIBEXECDIR}/chicago95-theme-plus ${DOCDIR}/demo ${APPSDIR} ${MIMEDIR} ${MANDIR}/man1
+	${installbin} -m0644 -t ${SHAREDIR}/chicago95-theme-plus/assets ${SRCDIR}/Plus/assets/*
 	${installbin} -m0755 ${SRCDIR}/Plus/ChicagoPlus.py ${BINDIR}/ChicagoPlus
 	${installbin} -m0755 ${SRCDIR}/Plus/PlusGUI.py ${BINDIR}/PlusGUI
 	${installbin} -m0644 -t ${LIBEXECDIR}/chicago95-theme-plus ${SRCDIR}/Plus/pluslib.py ${SRCDIR}/Plus/plus.glade
@@ -144,6 +152,7 @@ install_plus:
 	${installbin} -m0644 -t ${DOCDIR}/demo ${SRCDIR}/Plus/demo/*
 	${installbin} -m0644 -t ${APPSDIR} ${SRCDIR}/Plus/*.desktop
 	${installbin} -m0644 -t ${MIMEDIR} ${SRCDIR}/Plus/chicago95-plus-theme.xml
+	${installbin} -m0644 -t ${MANDIR}/man1 ${BUILDDIR}/*.1.gz
 
 install_backgrounds:
 	${installbin} -dm0755 ${BKGDSDIR}/patterns ${BKGDSDIR}/wallpapers
@@ -169,9 +178,10 @@ uninstall:
 		${LIBEXECDIR}/chicago95-theme-plus ${BINDIR}/ChicagoPlus ${BINDIR}/PlusGUI \
 		${SHAREDIR}/chicago95-theme-plus \
 		${APPSDIR}/PlusGUI.desktop ${MIMEDIR}/chicago95-plus-theme.xml \
+		${MANDIR}/man1/ChicagoPlus.1.gz ${MANDIR}/man1/PlusGUI.1.gz \
 		${SHAREDIR}/plymouth/themes/Chicago95 ${SHAREDIR}/plymouth/themes/RetroTux \
 		${BKGDSDIR} \
 		${XDGAUTODIR}/chicago95-startup.desktop
 
 clean:
-	-@${echobin} "target $@ not implemented yet! Gotta say unh." && ${falsebin}
+	-${rmbin} ${BUILDDIR}/*.1.gz
diff --git a/Plus/ChicagoPlus.1.txt b/Plus/ChicagoPlus.1.txt
new file mode 100644
index 0000000..672075e
--- /dev/null
+++ b/Plus/ChicagoPlus.1.txt
@@ -0,0 +1,45 @@
+NAME
+  ChicagoPlus - convert Windows 95 theme to Xfce theme
+SYNOPSIS
+  ChicagoPlus [options] _filename_
+OPTIONS
+  <filename>            Theme file to convert
+  -h, --help            show help message and exit
+  -d, --debug           Print lots of debugging statements (default: 30)
+  -v, --verbose         Be verbose (default: None)
+  --noinstall           Do not place folders nor change theme (default: False)
+  --info                Prints the json conversion of the theme file (default: False)
+
+  -c COLORS, --colors COLORS  How many colors before skipping Inkscape fix/merge for SVGs. Set to 1 to speed up conversion. WARNING: This may result in transparent icons! (default: 32)
+
+  -o OVERLAP, --overlap OVERLAP  Pixel overlap for SVG icons (default: 1)
+
+  -s SQUARESIZE, --squaresize SQUARESIZE  Square size for SVG icons (default: 20)
+
+  --cursorfolder CURSORFOLDER  Chicago95 cursor folder to convert to new theme (default: ~/.icons/Chicago95_Cursor_Black)
+
+  --themefolder THEMEFOLDER  Chicago95 theme folder to convert to new theme (default: ~/.themes/Chicago95)
+
+  --iconsfolder ICONSFOLDER  Chicago95 icons folder to convert to new theme (default: ~/.icons/Chicago95)
+
+  --installdir INSTALLDIR  Folder to create new theme in, default is current working directory (default: . )
+
+  --logfile LOGFILE     Filename for debug logging (default: chicago95_plus.log)
+
+  SPECIFIC INSTALLS
+  --nocursors           Do not generate/install/enable the cursors (default: True)
+  --noicons             Do not generate/install/enable the icons (default: True)
+  --nowallpaper         Do not generate/install/enable the wallpaper (default: True)
+  --nosounds            Do not generate/install/enable the sounds (default: True)
+  --nocolors            Do not generate/install/enable the colors (default: True)
+  --nofonts             Do not generate/install/enable the fonts (default: True)
+  --noscreensaver       Do not generate/install the screensaver (default: True)
+DESCRIPTION
+  Chicago95 Plus! is a python script that can parse Windows 95/98/ME/XP theme files and create new Chicago95 themes.
+Chicago95 Plus! supports Icons, Cursors, Fonts, Wallpapers, Sounds and Theme colors! Use this against themes you can find on ThemeWorld or any site that have Microsoft Plus! Themes! This script can be called from any folder, execute it and provide it the path to a theme file (e.g. ChicagoPlus /home/bgates/Wicked/Wicked.theme) and your new theme will be created!
+AUTHOR
+  grassmunk, adapted as a manpage by bgstack15
+COPYRIGHT
+  GPL 3.0+
+SEE ALSO
+PlusGUI(1)
diff --git a/Plus/PlusGUI.1.txt b/Plus/PlusGUI.1.txt
new file mode 100644
index 0000000..e1ca8c9
--- /dev/null
+++ b/Plus/PlusGUI.1.txt
@@ -0,0 +1,33 @@
+NAME
+  PlusGUI - gtk frontend for converting Windows 95 theme to Xfce theme
+SYNOPSIS
+  PlusGUI [options] _filename_
+OPTIONS
+  <filename>            Theme file to convert
+  -h, --help            show help message and exit
+  -d, --debug           Print lots of debugging statements (default: 30)
+  -v, --verbose         Be verbose (default: None)
+
+  -c COLORS, --colors COLORS  How many colors before skipping Inkscape fix/merge for SVGs. Set to 1 to speed up conversion. WARNING: This may result in transparent icons! (default: 32)
+
+  -o OVERLAP, --overlap OVERLAP  Pixel overlap for SVG icons (default: 1)
+
+  -s SQUARESIZE, --squaresize SQUARESIZE  Square size for SVG icons (default: 20)
+
+  --cursorfolder CURSORFOLDER  Chicago95 cursor folder to convert to new theme (default: ~/.icons/Chicago95_Cursor_Black)
+
+  --themefolder THEMEFOLDER  Chicago95 theme folder to convert to new theme (default: ~/.themes/Chicago95)
+
+  --iconsfolder ICONSFOLDER  Chicago95 icons folder to convert to new theme (default: ~/.icons/Chicago95)
+
+  --installdir INSTALLDIR  Folder to create new theme in, default is current working directory (default: . )
+
+  --logfile LOGFILE     Filename for debug logging (default: chicago95_plus.log)
+DESCRIPTION
+  Display a graphical window to choose, preview, and build Xfce themes. PlusGUI looks identical to the Microsoft Plus! 95 "Desktop Themes" utility.
+AUTHOR
+  grassmunk, adapted as a manpage by bgstack15
+COPYRIGHT
+  GPL 3.0+
+SEE ALSO
+ChicagoPlus(1)

From b5fce80407e2b8cd18a238058dc1a1103f3f5b6d Mon Sep 17 00:00:00 2001
From: grassmunk <grassmunk@gmail.com>
Date: Fri, 3 Jul 2020 10:40:13 -0700
Subject: [PATCH 12/16] (hopefully) fixing pluslib for issue #135

Issue #135 was caused by the function `convert_icon` used a relative file location, it now uses an absolute location.

Also removed loop that creates icons for gtk-3.24 since that it just a symlink to 3.0.
---
 Plus/pluslib.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Plus/pluslib.py b/Plus/pluslib.py
index 1abbe0e..b69f953 100644
--- a/Plus/pluslib.py
+++ b/Plus/pluslib.py
@@ -38,6 +38,13 @@ from fontTools import ttLib
 from configparser import ConfigParser
 from PIL import BmpImagePlugin, PngImagePlugin, Image
 
+running_folder = os.path.dirname(os.path.abspath(__file__))
+share_dir = running_folder
+libexec_dir = running_folder
+work_dir = running_folder
+if not os.path.exists(work_dir):
+    os.makedirs(work_dir)
+
 SCREEN_SAVER_SCRIPT = '''#!/bin/sh
 
 # *** DEPENDS ON xprintidle AND wmctrl AND wine ***
@@ -1533,7 +1540,7 @@ class ChicagoPlus:
 				
 		self.logger.debug("{:<21} | Colors: ButtonDKShadow={}, ButtonLight={}, ButtonShadow={}, ButtonHilight={}, ButtonFace={}, ButtonText={} ".format("Colors",ButtonDKShadow, ButtonLight, ButtonShadow, ButtonHilight, ButtonFace, ButtonText))
 
-		for i in ['gtk-3.0/','gtk-3.24/']:
+		for i in ['gtk-3.0/']:
 			
 			folder = path + i + "buttons/"
 
@@ -2358,7 +2365,7 @@ class ChicagoPlus:
 		return cursor
 
 
-	def convert_icon(self, target_folder, icon_file_path, tmp_file="./chicago95_tmp_file.svg"):
+	def convert_icon(self, target_folder, icon_file_path, tmp_file=work_dir + "/chicago95_tmp_file.svg"):
 		## Converts Icons to PNG
 		# Input:
 		#  folder: svg file destination folder

From 699c5ffbec873a1ecffbc6f7276d3c4018a2fa17 Mon Sep 17 00:00:00 2001
From: Grassmunk <grassmunk@gmail.com>
Date: Fri, 3 Jul 2020 12:07:08 -0700
Subject: [PATCH 13/16] Adding the IE4 background image firefox theme as an
 extra

---
 Extras/chicago5_ie4-1.0-an+fx.xpi | Bin 0 -> 13148 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Extras/chicago5_ie4-1.0-an+fx.xpi

diff --git a/Extras/chicago5_ie4-1.0-an+fx.xpi b/Extras/chicago5_ie4-1.0-an+fx.xpi
new file mode 100644
index 0000000000000000000000000000000000000000..9da4bc6cd89fcc9db532e9c31e0009af021be2a0
GIT binary patch
literal 13148
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

literal 0
HcmV?d00001


From bfbc77f403f7b2d4493b78668885a730ae32c6d7 Mon Sep 17 00:00:00 2001
From: Grassmunk <grassmunk@gmail.com>
Date: Sun, 5 Jul 2020 10:14:06 -0700
Subject: [PATCH 14/16] Removing gtk-warning issue #137

---
 Icons/Chicago95-tux/index.theme | 4 ++--
 Icons/Chicago95/index.theme     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Icons/Chicago95-tux/index.theme b/Icons/Chicago95-tux/index.theme
index 838326e..a5f4bd5 100644
--- a/Icons/Chicago95-tux/index.theme
+++ b/Icons/Chicago95-tux/index.theme
@@ -6,9 +6,9 @@ Example=folder
 #Directory list
 
 # actions/symbolic
-# actions/22,actions/24
+# actions/22,actions/24,status/48
 
-Directories=actions/16,actions/32,actions/48,actions/22,actions/24,actions/scalable,animations/10,animations/16,animations/32,animations/48,animations/64,animations/128,apps/16,apps/22,apps/24,apps/32,apps/48,apps/256,apps/scalable,categories/16,categories/22,categories/24,categories/32,categories/48,categories/scalable,devices/16,devices/22,devices/24,devices/32,devices/48,devices/scalable,emblems/16,emblems/22,emblems/24,emblems/32,emblems/48,emblems/scalable,emotes/16,emotes/32,mimes/16,mimes/22,mimes/24,mimes/32,mimes/48,mimes/scalable,notifications/16,notifications/24,notifications/32,notifications/48,panel/16,panel/22,panel/24,panel/48,places/16,places/22,places/24,places/32,places/48,places/scalable,status/16,status/22,status/24,status/32,status/48,status/scalable,status/symbolic,stock/16,stock/22,stock/32,stock/48,stock/scalable,tools/22
+Directories=actions/16,actions/32,actions/48,actions/22,actions/24,actions/scalable,animations/10,animations/16,animations/32,animations/48,animations/64,animations/128,apps/16,apps/22,apps/24,apps/32,apps/48,apps/256,apps/scalable,categories/16,categories/22,categories/24,categories/32,categories/48,categories/scalable,devices/16,devices/22,devices/24,devices/32,devices/48,devices/scalable,emblems/16,emblems/22,emblems/24,emblems/32,emblems/48,emblems/scalable,emotes/16,emotes/32,mimes/16,mimes/22,mimes/24,mimes/32,mimes/48,mimes/scalable,notifications/16,notifications/24,notifications/32,notifications/48,panel/16,panel/22,panel/24,panel/48,places/16,places/22,places/24,places/32,places/48,places/scalable,status/16,status/22,status/24,status/32,status/scalable,status/symbolic,stock/16,stock/22,stock/32,stock/48,stock/scalable,tools/22
 
 [actions/16]
 Size=16
diff --git a/Icons/Chicago95/index.theme b/Icons/Chicago95/index.theme
index 838326e..4ae28c6 100644
--- a/Icons/Chicago95/index.theme
+++ b/Icons/Chicago95/index.theme
@@ -6,9 +6,9 @@ Example=folder
 #Directory list
 
 # actions/symbolic
-# actions/22,actions/24
+# actions/22,actions/24,status/48,
 
-Directories=actions/16,actions/32,actions/48,actions/22,actions/24,actions/scalable,animations/10,animations/16,animations/32,animations/48,animations/64,animations/128,apps/16,apps/22,apps/24,apps/32,apps/48,apps/256,apps/scalable,categories/16,categories/22,categories/24,categories/32,categories/48,categories/scalable,devices/16,devices/22,devices/24,devices/32,devices/48,devices/scalable,emblems/16,emblems/22,emblems/24,emblems/32,emblems/48,emblems/scalable,emotes/16,emotes/32,mimes/16,mimes/22,mimes/24,mimes/32,mimes/48,mimes/scalable,notifications/16,notifications/24,notifications/32,notifications/48,panel/16,panel/22,panel/24,panel/48,places/16,places/22,places/24,places/32,places/48,places/scalable,status/16,status/22,status/24,status/32,status/48,status/scalable,status/symbolic,stock/16,stock/22,stock/32,stock/48,stock/scalable,tools/22
+Directories=actions/16,actions/32,actions/48,actions/22,actions/24,actions/scalable,animations/10,animations/16,animations/32,animations/48,animations/64,animations/128,apps/16,apps/22,apps/24,apps/32,apps/48,apps/256,apps/scalable,categories/16,categories/22,categories/24,categories/32,categories/48,categories/scalable,devices/16,devices/22,devices/24,devices/32,devices/48,devices/scalable,emblems/16,emblems/22,emblems/24,emblems/32,emblems/48,emblems/scalable,emotes/16,emotes/32,mimes/16,mimes/22,mimes/24,mimes/32,mimes/48,mimes/scalable,notifications/16,notifications/24,notifications/32,notifications/48,panel/16,panel/22,panel/24,panel/48,places/16,places/22,places/24,places/32,places/48,places/scalable,status/16,status/22,status/24,status/32,status/scalable,status/symbolic,stock/16,stock/22,stock/32,stock/48,stock/scalable,tools/22
 
 [actions/16]
 Size=16

From 7501f789316f1cd18398fbf1051268d1b62d2b79 Mon Sep 17 00:00:00 2001
From: Grassmunk <grassmunk@gmail.com>
Date: Sun, 5 Jul 2020 11:34:39 -0700
Subject: [PATCH 15/16] Major changes to the commandline interface in Inkscape
 required a few functions to be rewritten/perform a check for which version is
 being used more infor here:
 https://wiki.inkscape.org/wiki/index.php/Release_notes/1.0#Command_Line. This
 resolves #135.

---
 Plus/pluslib.py | 99 ++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 74 insertions(+), 25 deletions(-)

diff --git a/Plus/pluslib.py b/Plus/pluslib.py
index b69f953..2a4219a 100644
--- a/Plus/pluslib.py
+++ b/Plus/pluslib.py
@@ -2458,42 +2458,91 @@ class ChicagoPlus:
 
 	def convert_to_proper_svg_with_inkscape(self, svg_out, svg_in):
 		self.logger.debug("{:<21} | Converting {} to {} with Inkscape".format("",svg_out, svg_in))
+		# this is a bit of a hack to support both version of inkscape
 		inkscape_path = subprocess.check_output(["which", "inkscape"]).strip()
-		args = [
-		inkscape_path,
-		"-l", svg_out, svg_in
-		]
-		subprocess.check_call(args, stdout=subprocess.DEVNULL)
+		inkscape_version_cmd = subprocess.check_output([inkscape_path, "--version"])
+		inkscape_version = inkscape_version_cmd.splitlines()[0].split()[1].decode().split(".")[0]
+
+		if int(inkscape_version) < 1:
+			self.logger.debug("{:<21} | Using Inkscape v0.9x command".format(''))
+			# Works with version 0.9x
+			args = [
+			inkscape_path,
+			"-l", svg_out, svg_in
+			]
+		else:
+			self.logger.debug("{:<21} | Using Inkscape v1.0 command".format(''))
+			#works with version 1.0
+			args = [
+			inkscape_path,
+			"-l", "-o", svg_out, svg_in
+			]
+
+		subprocess.check_call(args, stderr=subprocess.DEVNULL ,stdout=subprocess.DEVNULL)
+		
 
 	def fix_with_inkscape(self, color, tmpfile):
 		self.logger.debug("{:<21} | Combining {} in {}".format("",color, tmpfile))
 		inkscape_path = subprocess.check_output(["which", "inkscape"]).strip()
-		args = [
-		inkscape_path,
-		"--select="+color,
-		"--verb", "EditSelectSameFillColor",
-		"--verb", "SelectionCombine", 
-		"--verb", "SelectionUnion", 
-		"--verb", "FileSave", 
-		"--verb", "FileQuit",
-		tmpfile
-		]
+
+		inkscape_version_cmd = subprocess.check_output([inkscape_path, "--version"])
+		inkscape_version = inkscape_version_cmd.splitlines()[0].split()[1].decode().split(".")[0]
+
+		if int(inkscape_version) < 1:
+			args = [
+			inkscape_path,
+			"--select="+color,
+			"--verb", "EditSelectSameFillColor",
+			"--verb", "SelectionCombine", 
+			"--verb", "SelectionUnion", 
+			"--verb", "FileSave", 
+			"--verb", "FileQuit",
+			tmpfile
+			]
+		else:
+			args = [
+			inkscape_path,
+			"-g",
+			"--select="+color,
+			"--verb", "EditSelectSameFillColor;SelectionCombine;SelectionUnion;FileSave;FileQuit",
+			tmpfile
+			]
+
 		subprocess.check_call(args, stderr=subprocess.DEVNULL ,stdout=subprocess.DEVNULL)
 
+
 	def convert_to_png_with_inkscape(self, svg_in, size, png_out):
 		self.logger.debug("{:<21} | Converting {} to {} of size {}".format("", svg_in, png_out, size))
 		inkscape_path = subprocess.check_output(["which", "inkscape"]).strip()	
+
+		inkscape_version_cmd = subprocess.check_output([inkscape_path, "--version"])
+		inkscape_version = inkscape_version_cmd.splitlines()[0].split()[1].decode().split(".")[0]
+
 		size = str(size)
-		args = [
-		inkscape_path,
-		"--without-gui",
-		"-f", svg_in,
-		"--export-area-page",
-		"-w", size,
-		"-h", size,
-		"--export-png=" + png_out
-		]
-		subprocess.check_call(args, stdout=subprocess.DEVNULL)
+
+		if int(inkscape_version) < 1:
+			args = [
+			inkscape_path,
+			"--without-gui",
+			"-f", svg_in,
+			"--export-area-page",
+			"-w", size,
+			"-h", size,
+			"--export-png=" + png_out
+			]
+		else:
+			args = [
+			inkscape_path,
+			"--export-area-page",
+			"--export-type=png",
+			"-w", size,
+			"-h", size,
+			"-o", png_out,
+			svg_in
+			]
+
+
+		subprocess.check_call(args, stderr=subprocess.DEVNULL ,stdout=subprocess.DEVNULL)
 
 	def convert_ico_files(self, icon_filename, output_file_name):
 		self.logger.debug("{:<21} | Converting {} to {}".format("", icon_filename, output_file_name))

From 43421d49faf740fdf191e2ba5265bb242ae004c0 Mon Sep 17 00:00:00 2001
From: debounce <debounce>
Date: Tue, 7 Jul 2020 08:34:27 -0700
Subject: [PATCH 16/16] Set HiDPI GDK scale

---
 INSTALL.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 1c8a483..a4a13fe 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -606,6 +606,11 @@ Increase taskbar size
 
 #### Adjust settings for HiDPI
 
+Set GDK scale to 2x
+
+    echo 'export GDK_SCALE=2' >> ~/.profile
+    echo 'export GDK_DPI_SCALE=0.5' >> ~/.profile
+
 Make GTK icons bigger
 
     xfconf-query -c xsettings -p /Gtk/IconSizes -s "gtk-large-toolbar=32,32:gtk-small-toolbar=24,24:gtk-menu=32,32:gtk-dialog=88,88:gtk-button=32,32:gtk-dnd=32,32"
@@ -627,9 +632,8 @@ The cursors in the theme do not support HiDPI but [Hackneyed](https://www.gnome-
 
 - Set panel row size to 48
 - Application Menu: Check show button title and set it to 𝗦𝘁𝗮𝗿𝘁 (copy+paste)
-- Notification Area: Set maximum icon size to 32
-- Indicator Plugin: Check square icons
-- Status Notifier Plugin: Set maximum icon size to 32
+- Notification Area: Set maximum icon size to 44
+- Status Notifier Plugin: Set maximum icon size to 22
 - *(Optional)* Orage Panel Clock: Set width to 144 and font to Sans 9
 
 [[Return to Index]](#index)