Prepping for release

Updated documentation to include steps on installing Helvetica font to address MS Sans Serif issues. #194 #201 #218
Addressed #160 for Ubuntu MATE OSD volume trough visibility issues.
Addressed #223 by reducing width of the window XFWM window manager theme by 1px less. (Note: the xfwm_hidpi theme needs serious work.)
Updated screenshots and README.md.

INSTALL.md

@@ -332,7 +332,7 @@ If you use a vertical deskbar, you could add a second row from the panel propert
 
 ### [ Thunar status indicator ] (for XFCE 4.14)
 
-The thunar status indicator can be modified on line 59 in `/home/$USER/.themes/Chicago95/gtk-3.24/apps/thunar.css`. Uncomment the code from line 53 to line 64.
+The thunar status indicator can be modified on line 59 in `/home/$USER/.themes/Chicago95/gtk-3.24/apps/thunar.css`. Uncomment the code from line 49 to line 60.
 
 You can replace `status_badge_c95.png` with four of the following images.
 
@@ -454,7 +454,32 @@ If these themes aren't enough and you'd like to personalize your icon theme down
 <a name="ms_sans_serif"/>
 
 ### [ MS Sans Serif font ]
-For an authentic Windows 95 feel, you can use the original MS Sans Serif font.  To do this, you will need a copy of both the "MS Sans Serif Regular" and "Microsoft Sans Serif Regular" fonts from the `C:\Windows\Fonts` directory of any modern Windows computer.  (The filenames for these fonts are `sserife.fon` and `micross.ttf` respectively)
+For an authentic Windows 95 feel, you can use the included cronyx-cyrillic Helvetica OTB font or the original MS Sans Serif font *(not included)*. You may encounter many issues with the original MS Sans Serif compared to the Helvetica font.
+
+#### Helvetica install
+To install the Helvetica font, you'll need to copy the "cronyx-cyrillic" folder from the `Extras/` directory into either `~/.fonts` for only a user install or `/usr/share/fonts` for a system-wide install.
+
+    cp -r Chicago95-master/Extras/cronyx-cyrillic ~/.fonts
+
+    cp -r Chicago95-master/Extras/cronyx-cyrillic /usr/share/fonts
+
+By default, some systems block bitmap fonts. To enable this and other bitmap fonts, run the following command:
+
+    sudo mv /etc/fonts/conf.d/70-no-bitmaps.conf /etc/fonts/conf.d/70-no-bitmaps.conf.bak
+
+If you see "No such file or directory," then bitmap fonts were already enabled on your system.
+
+The name of the font is listed as "Helvetica" and so depending on distribution, it might conflict with Adobe's Helvetica font. Specifically, Debian lists both as Helvetica (Arch lists Adobe's font as "Adobe Helvetica" so there is no conflict). If, after installing this font, some programs show a different Helvetica font, the other font can be safely removed. To fix this for programs such as Firefox which still accept PCF and other legacy font formats, run the following command:
+
+    sudo rm /usr/share/fonts/X11/*dpi/helv*
+
+*Note: Do not uninstall xfonts-75dpi or xfonts-100dpi on Debian-based systems, as these are required by tasksel tasks.*
+
+There is some additional information about this font in the reported issue [ticket #218](https://github.com/grassmunk/Chicago95/issues/218).
+
+#### MS Sans Serif
+
+To do this, you will need a copy of both the "MS Sans Serif Regular" and "Microsoft Sans Serif Regular" fonts from the `C:\Windows\Fonts` directory of any modern Windows computer.  (The filenames for these fonts are `sserife.fon` and `micross.ttf` respectively)
 
 After copying over the files to your system, we now need to convert the `sserife.fon` file to a TrueType font using FontForge.  (This step is optional; you can still use MS Sans Serif, but bold fonts will not be available)
 

Plus/README.MD

@@ -27,13 +27,14 @@ Two ways to install themes: [GUI](#run_GUI) and [CLI](#run_CLI):
 - python3-fonttools
 - python3-numpy
 - fonts-noto
+- aplay
 
 Notes:
 
 * Sounds are installed assuming you have XFCE sounds enabled per the [Chicago95 Install instructions](../INSTALL.md).
 * To use Chicago95 Plus! on Xubuntu you need to install the following: `python3-svgwrite` `python3-fonttools` `inkscape`:
 
-    `sudo apt install python3-svgwrite python3-fonttools inkscape`
+    `sudo apt install python3-svgwrite python3-fonttools inkscape aplay`
 
 * By default Chicago95 Plus! creates the theme in your working folder and copies the files to their required location then automatically changes the current theme to the new theme, just like Windows!
 

README.md

@@ -9,9 +9,9 @@
 
 I was unhappy with the various XFCE/GTK2/GTK3 Windows 95 based themes and decided to make one that was more consistent across the board for theming.
 
-#### Included in this theme:
+### Included in this theme:
 
-- New icons to complete the icon theme started with Classic95
+- Icons to complete the icon theme started with Classic95
 - GTK2 and GTK3 themes
 - Edited Redmond XFWM theme to more accurately reflect Windows 95
 - Chicago95 Plus! A tool to preview and install Windows 95/98/ME/XP themes
@@ -20,15 +20,12 @@ I was unhappy with the various XFCE/GTK2/GTK3 Windows 95 based themes and decide
 - Partial support for HiDPI monitors
 - Partial icon theme for LibreOffice 6+
 
-#### Requirements
+### Requirements:
 
-GTK+ 3.22 or 3.24
+- GTK+ 3.22 or 3.24
-
+- Xfce 4.12, 4.14, 4.16
-Xfce 4.12, 4.14, 4.16
+- gtk2-engines-pixbuf (Recommended for GTK2 applications)
-
+- A Window compositor
-gtk2-engines-pixbuf
-
-A Window compositor
 
 (If your are using an older desktop that uses GTK3.18, you can use [this forked version of the theme.](https://github.com/EMH-Mark-I/Chicago95-Custom-XUbuntu-16.04-))
 
@@ -42,7 +39,7 @@ A Window compositor
 
 ## Installation
 
-### Packages
+### Packages:
 
 |Distro|Package Name/Link|
 |:----:|:----:|
@@ -51,25 +48,32 @@ A Window compositor
 | Debian Testing/Unstable | [obs-repo] |
 | Ubuntu 18.04 - 20.04 | [obs-repo] |
 
-### Manual installation and setup instructions
+### Manual installation and setup instructions:
 [Click here](INSTALL.md) for install steps.
 
-### Install a Microsoft Windows Plus! theme
+### Install a Microsoft Windows Plus! theme:
 [Click here](Plus/README.MD) for installing custom themes.
 
-### Install the Plymouth boot splash theme
+### Install the Plymouth boot splash theme:
 [Click here](Plymouth/) for install steps.
 
-### Install the LibreOffice icon theme
+### Install the LibreOffice icon theme:
 [Click here](Extras/libreoffice-chicago95-iconset/README.md) for installing the LibreOffice Chicago95 icon theme.
 
-## KDE Support (experimental)
+----
+## Miscellaneous
+
+### KDE Support (experimental):
 - SDDM Logon Manager:: Click `Install from file...` in Loggin Screen (SDDM) manager. Select `SDDM/Chicago95.tar.gz` to install the theme. 
 - Splash Screen: `plasmapkg2 -t lookandfeel -i KDE/Splash/chicago95.splashscreen`
 
-### Screenshots
+### Screenshots:
 [Click here to view screenshots](Screenshots/SCREENSHOTS.md)
 
+### IRC server:
+[Click here](https://web.emhmki.org:8443/) to connect to the IRC server. Please read server rules and be kind.
+
+----
 
 ### Code and license
 License: GPL-3.0+/MIT

Screenshots/SCREENSHOTS.md

@@ -19,8 +19,11 @@
 
 ![alt text](Desktop4.png "Desktop4")
 
-#### XFCE4 Screensaver lock screen
+![alt text](Desktop5.png "Desktop5")
 
+![alt text](Desktop6.png "Desktop6")
+
+#### XFCE4 Screensaver lock screen
 ![alt text](lock_screen.png "Screensaver lock")
 
 #### LightDM login manager theme

Theme/Chicago95/gtk-3.0/apps/mate.css

@@ -94,7 +94,7 @@ PanelToplevel.background {
   box-shadow: inset 1px 1px @bg_shade, inset -1px -1px @bg_bright; }
   /* Brisk button */
   .mate-panel-menu-bar .brisk-button {
-    font-family: "MS Sans Serif Bold", Sans, Sans-Serif;
+    font-family: Helvetica, "MS Sans Serif Bold", Sans, Sans-Serif;
     font-weight: bold; }
   /* MATE Main Menu */
   .mate-panel-menu-bar menubar {

Theme/Chicago95/gtk-3.0/gtk-widgets.css

@@ -410,6 +410,9 @@ box label link {
   color: @osd_fg;
   background-color: @osd_bg; }
 
+.osd .trough {
+  background-color: @osd_trough_bg;}
+
 overlay.osd {
   background-color: transparent; }
 

Theme/Chicago95/gtk-3.0/gtk.css

@@ -90,6 +90,7 @@
 @define-color osd_base @dark_bg_color;
 @define-color osd_fg @dark_fg_color;
 @define-color osd_bg alpha(@osd_base, 0.8);
+@define-color osd_trough_bg @selected_bg_color;
 
 /* lightdm greeter colors */
 @define-color lightdm_bg_color @dark_bg_color;

Theme/Chicago95/xfwm4/bottom-active.xpm

@@ -1,13 +1,11 @@
 /* XPM */
 static char * bottom_active_xpm[] = {
-"16 5 5 1",
+"16 4 4 1",
-" 	c None",
 ".	c #000000 s active_shadow_1",
 "@	c #C0C0C0 s active_mid_1",
 "#	c #808080 s active_shadow_2",
 "&      c #FF00FF s active_border_color",
 "@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&&&&",
 "################",
 "................"};

Theme/Chicago95/xfwm4/bottom-inactive.xpm

@@ -1,13 +1,11 @@
 /* XPM */
 static char * bottom_inactive_xpm[] = {
-"16 5 5 1",
+"16 4 4 1",
-" 	c None",
 ".	c #000000 s inactive_shadow_1",
 "@	c #C0C0C0 s inactive_mid_1",
 "#	c #808080 s inactive_shadow_2",
 "&      c #FF00FF s inactive_border_color",
 "@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
 "&&&&&&&&&&&&&&&&",
 "################",
 "................"};

Theme/Chicago95/xfwm4/bottom-left-active.xpm

@@ -8,14 +8,14 @@ static char * bottom_left_active_xpm[] = {
 "@	c #C0C0C0 s active_mid_1",
 "#	c #808080 s active_shadow_2",
 "&      c #FF00FF s active_border_color",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@@@@@@@@",
+"$+&@        ",
 "$+&@@@@@@@@@",
 "$+&&&&&&&&&&",
 "$###########",

Theme/Chicago95/xfwm4/bottom-left-inactive.xpm

@@ -8,14 +8,14 @@ static char * bottom_left_inactive_xpm[] = {
 "@	c #C0C0C0 s inactive_mid_1",
 "#	c #808080 s inactive_shadow_2",
 "&      c #FF00FF s inactive_border_color",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@       ",
+"$+&@        ",
-"$+&@@@@@@@@@",
+"$+&@        ",
 "$+&@@@@@@@@@",
 "$+&&&&&&&&&&",
 "$###########",

Theme/Chicago95/xfwm4/bottom-right-active.xpm

@@ -6,14 +6,14 @@ static char * bottom_right_active_xpm[] = {
 "@	c #C0C0C0 s active_mid_1",
 "#	c #808080 s active_shadow_2",
 "&      c #FF00FF s active_border_color",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"@@@@@@@@@&#.",
+"        @&#.",
 "@@@@@@@@@&#.",
 "&&&&&&&&&&#.",
 "###########.",

Theme/Chicago95/xfwm4/bottom-right-inactive.xpm

@@ -6,14 +6,14 @@ static char * bottom_right_inactive_xpm[] = {
 "@	c #C0C0C0 s inactive_mid_1",
 "#	c #808080 s inactive_shadow_2",
 "&      c #FF00FF s inactive_border_color",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"       @@&#.",
+"        @&#.",
-"@@@@@@@@@&#.",
+"        @&#.",
 "@@@@@@@@@&#.",
 "&&&&&&&&&&#.",
 "###########.",

Theme/Chicago95/xfwm4/left-active.xpm

@@ -1,9 +1,8 @@
 /* XPM */
 static char * left_active_xpm[] = {
-"5 1 5 1",
+"4 1 4 1",
-" 	c None",
 "$	c #FFFFFF s active_hilight_1",
 "+	c #DFDFDF s active_hilight_2",
 "@      c #C0C0C0 s active_mid_1",
 "&      c #FF00FF s active_border_color",
-"$+&@@"};
+"$+&@"};

Theme/Chicago95/xfwm4/left-inactive.xpm

@@ -1,9 +1,8 @@
 /* XPM */
 static char * left_inactive_xpm[] = {
-"5 1 5 1",
+"4 1 4 1",
-" 	c None",
 "$	c #FFFFFF s inactive_hilight_1",
 "+	c #DFDFDF s inactive_hilight_2",
 "@      c #C0C0C0 s inactive_mid_1",
 "&      c #FF00FF s inactive_border_color",
-"$+&@@"};
+"$+&@"};

Theme/Chicago95/xfwm4/right-active.xpm

@@ -1,9 +1,8 @@
 /* XPM */
 static char * right_active_xpm[] = {
-"5 1 5 1",
+"4 1 4 1",
-" 	c None",
 ".	c #000000 s active_shadow_1",
 "#	c #808080 s active_shadow_2",
 "@	c #C0C0C0 s active_mid_1",
 "&      c #FF00FF s active_border_color",
-"@@&#."};
+"@&#."};

Theme/Chicago95/xfwm4/right-inactive.xpm

@@ -1,9 +1,8 @@
 /* XPM */
 static char * right_inactive_xpm[] = {
-"5 1 5 1",
+"4 1 4 1",
-" 	c None",
 ".	c #000000 s inactive_shadow_1",
 "#	c #808080 s inactive_shadow_2",
 "@	c #C0C0C0 s inactive_mid_1",
 "&      c #FF00FF s inactive_border_color",
-"@@&#."};
+"@&#."};