- If fonts are specified as xlfd, convert to fc names before creating them.

This was we internally only deal with fc names and properties. It will incur a small performance hit as the font needs to be parsed/unparsed, but this is only for backward-compatibility to support old xlfd names. People are encouraged to swtich to fontconfig names. - WINGs no longer adds sans as a fallback for internal fonts. It is automatically done by fontconfig (if it can't find the requested font it will use the closest match which is the default font: sans-serif) - Added code to honor the AntialiasesText global option - Fixed style names for WMCopyFontWithStyle() - Added fonts in style files where they were missing. Also changed some fonts to better defaults.
2025-12-24 07:02:30 +01:00 · 2004-10-22 00:21:51 +00:00
parent 6de693a24d
commit 08e811aae7
54 changed files with 368 additions and 314 deletions
--- a/WindowMaker/Defaults/WMGLOBAL
+++ b/WindowMaker/Defaults/WMGLOBAL
@@ -2,8 +2,7 @@
  SystemFont = "Trebuchet MS,Luxi Sans";
  BoldSystemFont = "Trebuchet MS,Luxi Sans:bold";
  DefaultFontSize = 12;
-  AntialiasedText = No;
-  MultiByteText = AUTO;
+  AntialiasedText = Yes;
  FloppyPath = "/floppy";
  DoubleClickTime = 250;
  MouseWheelUp = Button4;
--- a/WindowMaker/Defaults/WindowMaker.in
+++ b/WindowMaker/Defaults/WindowMaker.in
@@ -108,10 +108,10 @@
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=10";
-  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
-  LargeDisplayFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=24";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  HighlightColor = white;
  HighlightTextColor = black;
  ClipTitleColor = black;
--- a/WindowMaker/Styles/Autumn.style
+++ b/WindowMaker/Styles/Autumn.style
@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
  ClipTitleColor = white;
--- a/WindowMaker/Styles/Black.style
+++ b/WindowMaker/Styles/Black.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/BlackTexture.style
+++ b/WindowMaker/Styles/BlackTexture.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Blue.style
+++ b/WindowMaker/Styles/Blue.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = left;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/BlueDawn.style
+++ b/WindowMaker/Styles/BlueDawn.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = left;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/BlueishGreen.style
+++ b/WindowMaker/Styles/BlueishGreen.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = lightgoldenrod1;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Brown.style
+++ b/WindowMaker/Styles/Brown.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Brownish.style
+++ b/WindowMaker/Styles/Brownish.style
@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
  HighlightColor = "#c0b0b0";
  HighlightTextColor = "#201010";
  ClipTitleColor = white;
--- a/WindowMaker/Styles/Chumbo.style
+++ b/WindowMaker/Styles/Chumbo.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Copper.style
+++ b/WindowMaker/Styles/Copper.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/DarkBlue.style
+++ b/WindowMaker/Styles/DarkBlue.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/DarkRed.style
+++ b/WindowMaker/Styles/DarkRed.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Emerald.style
+++ b/WindowMaker/Styles/Emerald.style
@@ -1,10 +1,11 @@
 {
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  HighlightColor = "#595d8e";
  HighlightTextColor = "#71b6d7";
  ClipTitleColor = white;
--- a/WindowMaker/Styles/Fire.style
+++ b/WindowMaker/Styles/Fire.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = left;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Food.style
+++ b/WindowMaker/Styles/Food.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Golden.style
+++ b/WindowMaker/Styles/Golden.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Green.style
+++ b/WindowMaker/Styles/Green.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/GreyBlue.style
+++ b/WindowMaker/Styles/GreyBlue.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Gtk.style
+++ b/WindowMaker/Styles/Gtk.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = blue;
  HighlightTextColor = white;
--- a/WindowMaker/Styles/IRednBlue.style
+++ b/WindowMaker/Styles/IRednBlue.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = left;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Interlace.style
+++ b/WindowMaker/Styles/Interlace.style
@@ -1,12 +1,12 @@
 {
-  TitleJustify = right;
-  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  LargeDisplayFont = "-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = right;
  HighlightColor = "#000000";
  HighlightTextColor = "#bac4e0";
  ClipTitleColor = "#8a94b0";
--- a/WindowMaker/Styles/LightBlue.style
+++ b/WindowMaker/Styles/LightBlue.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/NewBlue.style
+++ b/WindowMaker/Styles/NewBlue.style
@@ -1,11 +1,12 @@
 {
-  TitleJustify = left;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = left;
  HighlightColor = white;
  HighlightTextColor = black;
  ClipTitleColor = black;
--- a/WindowMaker/Styles/NightSky.style
+++ b/WindowMaker/Styles/NightSky.style
@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
  HighlightColor = "#ffe0ac";
  HighlightTextColor = "#000000";
  ClipTitleColor = "#fff38c";
--- a/WindowMaker/Styles/Pastel.style
+++ b/WindowMaker/Styles/Pastel.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Pink.style
+++ b/WindowMaker/Styles/Pink.style
@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
  ClipTitleColor = white;
--- a/WindowMaker/Styles/Pumpkin.style
+++ b/WindowMaker/Styles/Pumpkin.style
@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
  ClipTitleColor = black;
--- a/WindowMaker/Styles/Purple.style
+++ b/WindowMaker/Styles/Purple.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Purplish.style
+++ b/WindowMaker/Styles/Purplish.style
@@ -1,11 +1,12 @@
 {
-  TitleJustify = center;
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=8";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
+  TitleJustify = center;
  HighlightColor = "#c0c0d0";
  HighlightTextColor = "#505070";
  ClipTitleColor = black;
--- a/WindowMaker/Styles/Red.style
+++ b/WindowMaker/Styles/Red.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = left;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/RednBlue.style
+++ b/WindowMaker/Styles/RednBlue.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Spring.style
+++ b/WindowMaker/Styles/Spring.style
@@ -1,10 +1,11 @@
 {
-  ClipTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
-  IconTitleFont = "Trebuchet MS,Luxi Sans:pixelsize=10";
-  DisplayFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=24";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  HighlightColor = "#ffffff";
  HighlightTextColor = "#000000";
  ClipTitleColor = black;
--- a/WindowMaker/Styles/Summer.style
+++ b/WindowMaker/Styles/Summer.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/Traditional.style
+++ b/WindowMaker/Styles/Traditional.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Styles/VioletBlue.style
+++ b/WindowMaker/Styles/VioletBlue.style
@@ -1,4 +1,11 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
  HighlightColor = white;
  HighlightTextColor = black;
--- a/WindowMaker/Themes/Default.style
+++ b/WindowMaker/Themes/Default.style
@@ -1,11 +1,12 @@
 {
  TitleJustify = left;
-  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
-  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
-  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
-  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  HighlightColor = white;
  HighlightTextColor = black;
  ClipTitleColor = black;
--- a/WindowMaker/Themes/OpenStep.style
+++ b/WindowMaker/Themes/OpenStep.style
@@ -1,12 +1,13 @@
 {
  NewStyle = YES;
  TitleJustify = left;
-  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
-  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
-  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
-  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  HighlightColor = white;
  HighlightTextColor = black;
  ClipTitleColor = black;
--- a/WindowMaker/Themes/Pastel.style
+++ b/WindowMaker/Themes/Pastel.style
@@ -1,11 +1,12 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = left;
-  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
-  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
-  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
-  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
  HighlightColor = white;
  HighlightTextColor = black;
  ClipTitleColor = "rgb:79/96/cf";
--- a/WindowMaker/Themes/SteelBlueSilk.style
+++ b/WindowMaker/Themes/SteelBlueSilk.style
@@ -1,11 +1,12 @@
 {
+  WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12";
+  MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  IconTitleFont = "Arial,Luxi Sans:pixelsize=9";
+  ClipTitleFont = "Verdana:bold:pixelsize=10";
+  DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12";
+  LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24";
  TitleJustify = center;
-  ClipTitleFont = "-b&h-lucida-medium-r-normal-*-10-*-*-*-p-*-iso8859-1";
-  WindowTitleFont = "-b&h-lucida-medium-r-normal-*-12-*-*-*-p-*-iso8859-1";
-  MenuTitleFont = "-b&h-lucida-bold-r-normal-*-12-*-*-*-p-*-iso8859-1";
-  MenuTextFont = "-b&h-lucida-medium-r-normal-*-12-*-*-*-p-*-iso8859-1";
-  IconTitleFont = "-b&h-lucida-medium-r-normal-*-10-*-*-*-p-*-iso8859-1";
-  DisplayFont = "-b&h-lucida-medium-r-normal-*-12-*-*-*-p-*-iso8859-1";
  HighlightColor = white;
  HighlightTextColor = black;
  ClipTitleColor = white;