Use font lookups. Bump versions.

SVN revision: 13791
19 years ago · b633e24a9e
parent c98624cac6
commit b633e24a9e
132 changed files with 333 additions and 203 deletions
--- a/BlueSteel/BlueSteel.etheme.ja
+++ b/BlueSteel/BlueSteel.etheme.ja
--- a/BlueSteel/configure.in
+++ b/BlueSteel/configure.in
@ -1,6 +1,6 @@
 AC_INIT(etheme-BlueSteel.spec)

-AM_INIT_AUTOMAKE(e16-theme-BlueSteel, 0.16)
+AM_INIT_AUTOMAKE(e16-theme-BlueSteel, 0.16.8)
 AM_MAINTAINER_MODE

 THEME=BlueSteel
--- a/BlueSteel/data/borders.cfg
+++ b/BlueSteel/data/borders.cfg
@ -1,3 +1,3 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <borders/borders.cfg>
--- a/BlueSteel/data/borders/LEFTPAGER/border.cfg
+++ b/BlueSteel/data/borders/LEFTPAGER/border.cfg
@ -199,19 +199,19 @@ __END

 __TCLASS __BGN
  __NAME "LEFTPAGER_TITLE_TEXT"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 192 192 192
    __BACKGROUND_COLOR 0 0 0
    __JUSTIFICATION 512
    __ORIENTATION __FONT_TO_DOWN
-  __NORMAL_ACTIVE "vixar/12"
+  __NORMAL_ACTIVE "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 255 255 255
    __BACKGROUND_COLOR 0 0 0
    __JUSTIFICATION 512
    __ORIENTATION __FONT_TO_DOWN
-  __NORMAL_ACTIVE_STICKY "vixar/12"
+  __NORMAL_ACTIVE_STICKY "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 255 255 255
    __BACKGROUND_COLOR 0 0 0
--- a/BlueSteel/data/borders/common/border.cfg
+++ b/BlueSteel/data/borders/common/border.cfg
@ -649,17 +649,17 @@ __END

 __TCLASS __BGN
  __NAME "TITLE_TEXT"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 192 192 192
    __BACKGROUND_COLOR 0 0 0
    __JUSTIFICATION 512
-  __NORMAL_ACTIVE "vixar/12"
+  __NORMAL_ACTIVE "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 255 255 255
    __BACKGROUND_COLOR 0 0 0
    __JUSTIFICATION 512
-  __NORMAL_ACTIVE_STICKY "vixar/12"
+  __NORMAL_ACTIVE_STICKY "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 255 255 255
    __BACKGROUND_COLOR 0 0 0
@ -668,19 +668,19 @@ __END

 __TCLASS __BGN
  __NAME "LEFTSIDE_TITLE_TEXT"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 192 192 192
    __BACKGROUND_COLOR 0 0 0
    __JUSTIFICATION 512
 	__ORIENTATION __FONT_TO_UP
-  __NORMAL_ACTIVE "vixar/12"
+  __NORMAL_ACTIVE "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 255 255 255
    __BACKGROUND_COLOR 0 0 0
    __JUSTIFICATION 512
 	__ORIENTATION __FONT_TO_UP
-  __NORMAL_ACTIVE_STICKY "vixar/12"
+  __NORMAL_ACTIVE_STICKY "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 255 255 255
    __BACKGROUND_COLOR 0 0 0
--- a/BlueSteel/data/buttons.cfg
+++ b/BlueSteel/data/buttons.cfg
@ -1,3 +1,3 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <buttons/buttons.cfg>
--- a/BlueSteel/data/colormodifiers.cfg
+++ b/BlueSteel/data/colormodifiers.cfg
@ -1,2 +1,2 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
--- a/BlueSteel/data/coords/coords.cfg
+++ b/BlueSteel/data/coords/coords.cfg
@ -7,7 +7,7 @@ __END

 __TCLASS __BGN
  __NAME "COORDS"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/BlueSteel/data/cursors.cfg
+++ b/BlueSteel/data/cursors.cfg
@ -1,3 +1,3 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <cursors/cursors.cfg>
--- a/BlueSteel/data/desktops.cfg
+++ b/BlueSteel/data/desktops.cfg
@ -1,3 +1,3 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <backgrounds/backgrounds.cfg>
--- a/BlueSteel/data/dialogs/dialogs.cfg
+++ b/BlueSteel/data/dialogs/dialogs.cfg
@ -109,7 +109,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 192 192 192
    __BACKGROUND_COLOR 0 0 0
@ -118,7 +118,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_BUTTON"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 255 255 255
    __BACKGROUND_COLOR 0 0 0
@ -127,7 +127,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_TEXT"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 192 192 192
  __BACKGROUND_COLOR 0 0 0
@ -136,7 +136,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_CHECK_BUTTON"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 192 192 192
  __BACKGROUND_COLOR 0 0 0
@ -145,7 +145,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_RADIO_BUTTON"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 192 192 192
  __BACKGROUND_COLOR 0 0 0
@ -154,7 +154,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_BUTTON"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/BlueSteel/data/epplets/epplets.cfg
+++ b/BlueSteel/data/epplets/epplets.cfg
@ -286,7 +286,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_LABEL"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 182 178 190
@ -294,11 +294,11 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_BUTTON"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 182 178 190
-  __CLICKED "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __CLICKED "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 128 125 133
@ -306,7 +306,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TOGGLEBUTTON_ON"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 128 125 133
@ -314,7 +314,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TOGGLEBUTTON_OFF"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 182 178 190
@ -322,11 +322,11 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_POPUP"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 182 178 190
-  __CLICKED "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __CLICKED "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 128 125 133
@ -334,7 +334,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TEXT_TINY"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 182 178 190
@ -342,7 +342,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TEXT_MEDIUM"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*epplets-medium"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 182 178 190
@ -350,7 +350,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TEXT_LARGE"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*"
+  __NORMAL "*epplets-large"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 182 178 190
--- a/BlueSteel/data/focuslist/focuslist.cfg
+++ b/BlueSteel/data/focuslist/focuslist.cfg
@ -11,12 +11,12 @@ __END

 __TCLASS __BGN
  __NAME "WARPFOCUS"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 192 192 192
    __BACKGROUND_COLOR 0 0 0
    __JUSTIFICATION 0
-  __CLICKED "vixar/12"
+  __CLICKED "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 255 255 255
    __BACKGROUND_COLOR 0 0 0
--- a/BlueSteel/data/fonts.cfg
+++ b/BlueSteel/data/fonts.cfg
@ -0,0 +1,11 @@
+#include <definitions>
+__E_CFG_VERSION 1
+__FONTS __BGN
+
+norm-12	"vixar/12"
+
+epplets-small	"-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*"
+epplets-medium	"-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*"
+epplets-large	"-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-12-*"
+
+__END
--- a/BlueSteel/data/fonts.cfg.ja
+++ b/BlueSteel/data/fonts.cfg.ja
@ -0,0 +1,11 @@
+#include <definitions>
+__E_CFG_VERSION 1
+__FONTS __BGN
+
+norm-12	"-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+
+epplets-small	"-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+epplets-medium	"-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+epplets-large	"-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+
+__END
--- a/BlueSteel/data/iconbox/iconbox.cfg
+++ b/BlueSteel/data/iconbox/iconbox.cfg
@ -126,7 +126,7 @@ __END

 __TCLASS __BGN
  __NAME "ICONBOX_WINDOW_TITLE"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/BlueSteel/data/imageclasses.cfg
+++ b/BlueSteel/data/imageclasses.cfg
@ -1,5 +1,5 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <coords/coords.cfg>
 #include <dialogs/dialogs.cfg>
 #include <dragbar/dragbar.cfg>
--- a/BlueSteel/data/init.cfg
+++ b/BlueSteel/data/init.cfg
@ -1,3 +1,3 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <init/init.cfg>
--- a/BlueSteel/data/init/init.cfg
+++ b/BlueSteel/data/init/init.cfg
@ -30,7 +30,7 @@ __END

 __TCLASS __BGN
  __NAME "PROGRESS_TEXT"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
    __DRAWING_EFFECT __EFFECT_NONE
    __FORGROUND_COLOR 255 255 255
    __BACKGROUND_COLOR 0 0 0
@ -39,7 +39,7 @@ __END

 __TCLASS __BGN
  __NAME "PROGRESS_TEXT_NUMBER"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
    __DRAWING_EFFECT __EFFECT_NONE
    __FORGROUND_COLOR 255 255 255
    __BACKGROUND_COLOR 0 0 0
--- a/BlueSteel/data/menustyles.cfg
+++ b/BlueSteel/data/menustyles.cfg
@ -1,4 +1,4 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <menustyles/menustyles.cfg>

--- a/BlueSteel/data/menustyles/menustyles.cfg
+++ b/BlueSteel/data/menustyles/menustyles.cfg
@ -25,7 +25,7 @@ __END

 __TCLASS __BGN
  __NAME "MENU_TEXT"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
    __DRAWING_EFFECT __EFFECT_SHADOW
    __FORGROUND_COLOR 192 192 192
    __BACKGROUND_COLOR 0 0 0
--- a/BlueSteel/data/pager/pager.cfg
+++ b/BlueSteel/data/pager/pager.cfg
@ -31,7 +31,7 @@ __END

 __TCLASS __BGN
  __NAME "PAGER_WINDOW_TITLE"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/BlueSteel/data/slideouts.cfg
+++ b/BlueSteel/data/slideouts.cfg
@ -1,3 +1,3 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <slideouts/slideouts.cfg>
--- a/BlueSteel/data/sound.cfg
+++ b/BlueSteel/data/sound.cfg
@ -1,3 +1,3 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <sound/sound.cfg>
--- a/BlueSteel/data/tooltips.cfg
+++ b/BlueSteel/data/tooltips.cfg
@ -1,3 +1,3 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <tooltips/tooltips.cfg>
--- a/BlueSteel/data/tooltips/tooltips.cfg
+++ b/BlueSteel/data/tooltips/tooltips.cfg
@ -27,7 +27,7 @@ __END

 __TCLASS __BGN
  __NAME "TOOLTIP_TEXT"
-  __NORMAL "vixar/12"
+  __NORMAL "*norm-12"
  __DRAWING_EFFECT __EFFECT_NONE
  __FORGROUND_COLOR 0 0 0
  __JUSTIFICATION 0
--- a/BlueSteel/data/windowmatches.cfg
+++ b/BlueSteel/data/windowmatches.cfg
@ -1,5 +1,5 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1

 /* Let's get our matches for small, normal windows out of the way... */

--- a/BlueSteel/etheme-BlueSteel.spec
+++ b/BlueSteel/etheme-BlueSteel.spec
@ -1,6 +1,6 @@
 Summary:	Enlightenment theme: BlueSteel
 Name:		e16-theme-BlueSteel
-Version:	0.16
+Version:	0.16.8
 Release:	0.%(date '+%y%m%d')
 License:	BSD
 Group:		User Interface/Desktops
--- a/BrushedMetal-Tigert/BrushedMetal-Tigert.etheme.ja
+++ b/BrushedMetal-Tigert/BrushedMetal-Tigert.etheme.ja
--- a/BrushedMetal-Tigert/BrushedMetal-Tigert.etheme.pl
+++ b/BrushedMetal-Tigert/BrushedMetal-Tigert.etheme.pl
--- a/BrushedMetal-Tigert/configure.in
+++ b/BrushedMetal-Tigert/configure.in
@ -1,6 +1,6 @@
 AC_INIT(etheme-BrushedMetal-Tigert.spec)

-AM_INIT_AUTOMAKE(e16-theme-BrushedMetal-Tigert, 0.16)
+AM_INIT_AUTOMAKE(e16-theme-BrushedMetal-Tigert, 0.16.8)
 AM_MAINTAINER_MODE

 THEME=BrushedMetal-Tigert
--- a/BrushedMetal-Tigert/data/borders.cfg
+++ b/BrushedMetal-Tigert/data/borders.cfg
@ -1,4 +1,4 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <borders/borders.cfg>

--- a/BrushedMetal-Tigert/data/borders/common/border.cfg
+++ b/BrushedMetal-Tigert/data/borders/common/border.cfg
@ -426,22 +426,22 @@ __TCLASS __BGN
  __NAME "TEXT1"
  __JUSTIFICATION 0
  
-  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*bold-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180

-  __NORMAL_ACTIVE "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL_ACTIVE "*bold-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255

-  __NORMAL_STICKY "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL_STICKY "*bold-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180

-  __NORMAL_ACTIVE_STICKY "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL_ACTIVE_STICKY "*bold-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
--- a/BrushedMetal-Tigert/data/buttons.cfg
+++ b/BrushedMetal-Tigert/data/buttons.cfg
@ -1,4 +1,4 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <buttons/buttons.cfg>

--- a/BrushedMetal-Tigert/data/colormodifiers.cfg
+++ b/BrushedMetal-Tigert/data/colormodifiers.cfg
@ -1,2 +1,2 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
--- a/BrushedMetal-Tigert/data/coords/coords.cfg
+++ b/BrushedMetal-Tigert/data/coords/coords.cfg
@ -2,7 +2,7 @@ __TCLASS __BGN
  __NAME "COORDS"
  __JUSTIFICATION 0
    
-  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*bold-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
--- a/BrushedMetal-Tigert/data/cursors.cfg
+++ b/BrushedMetal-Tigert/data/cursors.cfg
@ -1,4 +1,4 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <cursors/cursors.cfg>

--- a/BrushedMetal-Tigert/data/desktops.cfg
+++ b/BrushedMetal-Tigert/data/desktops.cfg
@ -1,4 +1,4 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <backgrounds/backgrounds.cfg>

--- a/BrushedMetal-Tigert/data/dialogs/dialogs.cfg
+++ b/BrushedMetal-Tigert/data/dialogs/dialogs.cfg
@ -133,7 +133,7 @@ __TCLASS __BGN
  __NAME "DIALOG"
  __JUSTIFICATION 512
 		
-  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -143,7 +143,7 @@ __TCLASS __BGN
  __NAME "DIALOG_WIDGET_BUTTON"
  __JUSTIFICATION 512
  
-  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -153,7 +153,7 @@ __TCLASS __BGN
  __NAME "DIALOG_WIDGET_CHECK_BUTTON"
  __JUSTIFICATION 0
  
-  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -163,7 +163,7 @@ __TCLASS __BGN
  __NAME "DIALOG_WIDGET_RADIO_BUTTON"
  __JUSTIFICATION 0
  
-  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -173,7 +173,7 @@ __TCLASS __BGN
  __NAME "DIALOG_WIDGET_TEXT"
  __JUSTIFICATION 512
  
-  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -183,7 +183,7 @@ __TCLASS __BGN
  __NAME "DIALOG_BUTTON"
  __JUSTIFICATION 512
    
-  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*bold-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
--- a/BrushedMetal-Tigert/data/epplets/epplets.cfg
+++ b/BrushedMetal-Tigert/data/epplets/epplets.cfg
@ -286,7 +286,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_LABEL"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -294,7 +294,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_BUTTON"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -302,7 +302,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TOGGLEBUTTON_ON"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -310,7 +310,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TOGGLEBUTTON_OFF"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -318,7 +318,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_POPUP"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -326,7 +326,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TEXT_TINY"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*epplets-small"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -334,7 +334,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TEXT_MEDIUM"
-  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*epplets-medium"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -342,7 +342,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TEXT_LARGE"
-  __NORMAL "-*-lucida-bold-r-normal-*-*-120-*-*-p-*-*-*"
+  __NORMAL "*epplets-large"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
--- a/BrushedMetal-Tigert/data/focuslist/focuslist.cfg
+++ b/BrushedMetal-Tigert/data/focuslist/focuslist.cfg
@ -2,12 +2,12 @@ __TCLASS __BGN
  __NAME "WARPFOCUS"
  __JUSTIFICATION 0
  
-  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*bold-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180

-  __CLICKED "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __CLICKED "*bold-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/BrushedMetal-Tigert/data/fonts.cfg
+++ b/BrushedMetal-Tigert/data/fonts.cfg
@ -0,0 +1,15 @@
+#include <definitions>
+__E_CFG_VERSION 1
+__FONTS __BGN
+
+norm-8	"-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*"
+norm-10	"-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-10-*"
+
+bold-8	"-*-lucida-bold-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-8-*"
+bold-10	"-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-10-*"
+
+epplets-small	"-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-helvetica-medium-r-normal-*-8-*"
+epplets-medium	"-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-10-*"
+epplets-large	"-*-lucida-bold-r-normal-*-*-120-*-*-p-*-*-*,-*-helvetica-bold-r-normal-*-12-*"
+
+__END
--- a/BrushedMetal-Tigert/data/fonts.cfg.ja
+++ b/BrushedMetal-Tigert/data/fonts.cfg.ja
@ -0,0 +1,15 @@
+#include <definitions>
+__E_CFG_VERSION 1
+__FONTS __BGN
+
+norm-8	"-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+norm-10	"-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+
+bold-8	"-*-lucida-bold-r-normal-*-*-80-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+bold-10	"-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+
+epplets-small	"-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+epplets-medium	"-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+epplets-large	"-*-lucida-bold-r-normal-*-*-120-*-*-p-*-*-*,-*-fixed-medium-r-normal--14-*,-*--14-*"
+
+__END
--- a/BrushedMetal-Tigert/data/iconbox/iconbox.cfg
+++ b/BrushedMetal-Tigert/data/iconbox/iconbox.cfg
@ -131,7 +131,7 @@ __TCLASS __BGN
  __NAME "ICONBOX_WINDOW_TITLE"
  __JUSTIFICATION 0
    
-  __NORMAL "-*-lucida-bold-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*bold-8"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180
--- a/BrushedMetal-Tigert/data/imageclasses.cfg
+++ b/BrushedMetal-Tigert/data/imageclasses.cfg
@ -1,5 +1,5 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <coords/coords.cfg>
 #include <dialogs/dialogs.cfg>
 #include <dragbar/dragbar.cfg>
--- a/BrushedMetal-Tigert/data/init.cfg
+++ b/BrushedMetal-Tigert/data/init.cfg
@ -1,4 +1,4 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <init/init.cfg>

--- a/BrushedMetal-Tigert/data/init/init.cfg
+++ b/BrushedMetal-Tigert/data/init/init.cfg
@ -34,7 +34,7 @@ __TCLASS __BGN
  __NAME "PROGRESS_TEXT"
  __JUSTIFICATION 0
  
-  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*bold-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180
@ -45,7 +45,7 @@ __TCLASS __BGN
  __NAME "PROGRESS_TEXT_NUMBER"
  __JUSTIFICATION 512
  
-  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*bold-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180
--- a/BrushedMetal-Tigert/data/menustyles.cfg
+++ b/BrushedMetal-Tigert/data/menustyles.cfg
@ -1,4 +1,4 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <menustyles/menustyles.cfg>

--- a/BrushedMetal-Tigert/data/menustyles/menustyles.cfg
+++ b/BrushedMetal-Tigert/data/menustyles/menustyles.cfg
@ -31,12 +31,12 @@ __TCLASS __BGN
  __NAME "MENU"
  __JUSTIFICATION 0
  
-  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_NONE
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 0 0 0

-  __HILITED "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
+  __HILITED "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
--- a/BrushedMetal-Tigert/data/pager/pager.cfg
+++ b/BrushedMetal-Tigert/data/pager/pager.cfg
@ -33,7 +33,7 @@ __TCLASS __BGN
  __NAME "PAGER_WINDOW_TITLE"
  __JUSTIFICATION 0
    
-  __NORMAL "-*-lucida-bold-r-normal-*-*-80-*-*-p-*-*-*"
+  __NORMAL "*bold-8"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180
--- a/BrushedMetal-Tigert/data/slideouts.cfg
+++ b/BrushedMetal-Tigert/data/slideouts.cfg
@ -1,4 +1,4 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <slideouts/slideouts.cfg>

--- a/BrushedMetal-Tigert/data/sound.cfg
+++ b/BrushedMetal-Tigert/data/sound.cfg
@ -1,4 +1,4 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <sound/sound.cfg>

--- a/BrushedMetal-Tigert/data/tooltips.cfg
+++ b/BrushedMetal-Tigert/data/tooltips.cfg
@ -1,4 +1,4 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <tooltips/tooltips.cfg>

--- a/BrushedMetal-Tigert/data/tooltips/tooltips.cfg
+++ b/BrushedMetal-Tigert/data/tooltips/tooltips.cfg
@ -34,7 +34,7 @@ __TCLASS __BGN
  __NAME "TT_TEXT"
  __JUSTIFICATION 0
  
-  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
+  __NORMAL "*bold-10"
  __DRAWING_EFFECT __EFFECT_NONE
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180
--- a/BrushedMetal-Tigert/data/windowmatches.cfg
+++ b/BrushedMetal-Tigert/data/windowmatches.cfg
@ -1,5 +1,5 @@
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1

 /* The short convenient way */
 /* Format:
--- a/BrushedMetal-Tigert/etheme-BrushedMetal-Tigert.spec
+++ b/BrushedMetal-Tigert/etheme-BrushedMetal-Tigert.spec
@ -1,6 +1,6 @@
 Summary:	Enlightenment theme: BrushedMetal-Tigert
 Name:		e16-theme-BrushedMetal-Tigert
-Version:	0.16
+Version:	0.16.8
 Release:	0.%(date '+%y%m%d')
 License:	BSD
 Group:		User Interface/Desktops
--- a/Ganymede/Ganymede.etheme.ja
+++ b/Ganymede/Ganymede.etheme.ja
--- a/Ganymede/configure.in
+++ b/Ganymede/configure.in
@ -1,6 +1,6 @@
 AC_INIT(etheme-Ganymede.spec)

-AM_INIT_AUTOMAKE(e16-theme-Ganymede, 0.16)
+AM_INIT_AUTOMAKE(e16-theme-Ganymede, 0.16.8)
 AM_MAINTAINER_MODE

 THEME=Ganymede
--- a/Ganymede/data/borders.cfg
+++ b/Ganymede/data/borders.cfg
@ -8,6 +8,6 @@ ____________________________________________________________

 */
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <borders/borders.cfg>

--- a/Ganymede/data/borders/DEFAULT/border.cfg
+++ b/Ganymede/data/borders/DEFAULT/border.cfg
@ -10,17 +10,17 @@ ____________________________________________________________

 __TCLASS __BGN
  __NAME "GANYMEDE"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 200 200 200
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 450
-  __NORMAL_ACTIVE "ganymede/10"
+  __NORMAL_ACTIVE "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 450
-  __NORMAL_ACTIVE_STICKY "ganymede/10"
+  __NORMAL_ACTIVE_STICKY "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/borders/GREEN/border.cfg
+++ b/Ganymede/data/borders/GREEN/border.cfg
@ -10,17 +10,17 @@ ____________________________________________________________

 __TCLASS __BGN
  __NAME "GANYMEDE_GREEN"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 200 255 200
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 450
-  __NORMAL_ACTIVE "ganymede/10"
+  __NORMAL_ACTIVE "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 200 255 255
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 450
-  __NORMAL_ACTIVE_STICKY "ganymede/10"
+  __NORMAL_ACTIVE_STICKY "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/borders/MENU_BORDER/border.cfg
+++ b/Ganymede/data/borders/MENU_BORDER/border.cfg
@ -10,12 +10,12 @@ ____________________________________________________________

 __TCLASS __BGN
  __NAME "GANYMEDE_SMALL_ITALIC"
-  __NORMAL "ganymede_italic/10"
+  __NORMAL "*italic-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 210 210 255
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 512
-  __NORMAL_ACTIVE "ganymede_italic/10"
+  __NORMAL_ACTIVE "*italic-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/borders/PAGER/border.cfg
+++ b/Ganymede/data/borders/PAGER/border.cfg
@ -10,7 +10,7 @@ ____________________________________________________________

 __TCLASS __BGN
  __NAME "GANYMEDE_CENTERED_SMALL"
-  __NORMAL "ganymede/7"
+  __NORMAL "*norm-7"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/borders/PAGER_LEFT/border.cfg
+++ b/Ganymede/data/borders/PAGER_LEFT/border.cfg
@ -10,7 +10,7 @@ ____________________________________________________________

 __TCLASS __BGN
  __NAME "GANYMEDE_CENTERED_SMALL_UP"
-  __NORMAL "ganymede/7"
+  __NORMAL "*norm-7"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/borders/PAGER_RIGHT/border.cfg
+++ b/Ganymede/data/borders/PAGER_RIGHT/border.cfg
@ -9,7 +9,7 @@ ____________________________________________________________
 */
 __TCLASS __BGN
  __NAME "GANYMEDE_CENTERED_SMALL_DOWN"
-  __NORMAL "ganymede/7"
+  __NORMAL "*norm-7"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/borders/RED/border.cfg
+++ b/Ganymede/data/borders/RED/border.cfg
@ -10,17 +10,17 @@ ____________________________________________________________

 __TCLASS __BGN
  __NAME "GANYMEDE_RED"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 200 200
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 450
-  __NORMAL_ACTIVE "ganymede/10"
+  __NORMAL_ACTIVE "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 200
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 450
-  __NORMAL_ACTIVE_STICKY "ganymede/10"
+  __NORMAL_ACTIVE_STICKY "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 0
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/borders/ROTATED/border.cfg
+++ b/Ganymede/data/borders/ROTATED/border.cfg
@ -10,7 +10,7 @@ ____________________________________________________________

 __TCLASS __BGN
  __NAME "GANYMEDE_DOWN"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/buttons/buttons.cfg
+++ b/Ganymede/data/buttons/buttons.cfg
@ -90,17 +90,17 @@ __END

 __TCLASS __BGN
  __NAME "GANYMEDE_CENTERED"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 240 240 240
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 512
-  __HILITED "ganymede/10"
+  __HILITED "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 512
-  __CLICKED "ganymede/10"
+  __CLICKED "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
@ -109,19 +109,19 @@ __END

 __TCLASS __BGN
  __NAME "GANYMEDE_CENTERED_DOWN"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 240 240 240
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 512
  __ORIENTATION __FONT_TO_DOWN
-  __HILITED "ganymede/10"
+  __HILITED "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
  __JUSTIFICATION 512
  __ORIENTATION __FONT_TO_DOWN
-  __CLICKED "ganymede/10"
+  __CLICKED "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/colormodifiers.cfg
+++ b/Ganymede/data/colormodifiers.cfg
@ -9,7 +9,7 @@ ____________________________________________________________
 */
 #include<definitions>

-__E_CFG_VERSION 0
+__E_CFG_VERSION 1

 /* commented out for now. Come back later.

--- a/Ganymede/data/coords/coords.cfg
+++ b/Ganymede/data/coords/coords.cfg
@ -9,7 +9,7 @@ ____________________________________________________________
 */
 __TCLASS __BGN
  __NAME "COORDS"
-  __NORMAL "ganymede/8"
+  __NORMAL "*norm-8"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/cursors.cfg
+++ b/Ganymede/data/cursors.cfg
@ -8,6 +8,6 @@ ____________________________________________________________

 */
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <cursors/cursors.cfg>

--- a/Ganymede/data/desktops.cfg
+++ b/Ganymede/data/desktops.cfg
@ -8,6 +8,6 @@ ____________________________________________________________

 */
 #include <definitions>
-__E_CFG_VERSION 0
+__E_CFG_VERSION 1
 #include <backgrounds/backgrounds.cfg>

--- a/Ganymede/data/dialogs/dialogs.cfg
+++ b/Ganymede/data/dialogs/dialogs.cfg
@ -13,7 +13,7 @@ __E_CFG_VERSION 0

 __TCLASS __BGN
  __NAME "DIALOG"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
@ -22,7 +22,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_TEXT"
-  __NORMAL "ganymede_italic/10"
+  __NORMAL "*italic-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
@ -31,7 +31,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_BUTTON"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
@ -40,7 +40,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_RADIO_BUTTON"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
@ -49,7 +49,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_TABLE"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
@ -58,7 +58,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_CHECK_BUTTON"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
@ -67,7 +67,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_AREA"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
@ -76,7 +76,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_WIDGET_BUTTON"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
@ -85,7 +85,7 @@ __END

 __TCLASS __BGN
  __NAME "DIALOG_BUTTON"
-  __NORMAL "ganymede/10"
+  __NORMAL "*norm-10"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/Ganymede/data/epplets/epplets.cfg
+++ b/Ganymede/data/epplets/epplets.cfg
@ -309,7 +309,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_LABEL"
-  __NORMAL "ganymede/8"
+  __NORMAL "*norm-8"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 210 210 255
  __BACKGROUND_COLOR 0 0 0
@ -318,7 +318,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_BUTTON"
-  __NORMAL "ganymede/8"
+  __NORMAL "*norm-8"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 210 210 255
  __BACKGROUND_COLOR 0 0 0
@ -327,7 +327,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TOGGLEBUTTON_ON"
-  __NORMAL "ganymede/8"
+  __NORMAL "*norm-8"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 210 210 255
  __BACKGROUND_COLOR 0 0 0
@ -336,7 +336,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_TOGGLEBUTTON_OFF"
-  __NORMAL "ganymede/8"
+  __NORMAL "*norm-8"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 210 210 255
  __BACKGROUND_COLOR 0 0 0
@ -345,7 +345,7 @@ __END

 __TCLASS __BGN
  __NAME "EPPLET_POPUP"
-  __NORMAL "ganymede/8"
+  __NORMAL "*norm-8"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 210 210 255
  __BACKGROUND_COLOR 0 0 0
@ -354,7 +354,7 @@ __END

 __TCLASS __BGN