Build .etheme's from source. Theme fixes.

SVN revision: 13637
2005-03-06 15:29:59 +00:00 · 2005-03-06 15:29:59 +00:00 · c98624cac6
parent b04fcf3fd8
commit c98624cac6
35 changed files with 86 additions and 105 deletions
--- a/BlueSteel/.cvsignore
+++ b/BlueSteel/.cvsignore
@ -6,4 +6,4 @@ config.log
 config.status
 Makefile
 e16-theme-*.tar.gz
-files
+*.etheme
--- a/BlueSteel/BlueSteel.etheme
+++ b/BlueSteel/BlueSteel.etheme
--- a/BlueSteel/Makefile.am
+++ b/BlueSteel/Makefile.am
@ -1,6 +1,7 @@

 ethemedir = $(datadir)/themes

+BUILT_SOURCES = @THEME@.etheme
 EXTRA_DIST = etheme-@THEME@.spec @THEME_FILES@

 THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/@THEME@
@ -18,9 +19,7 @@ uninstall-local:
 			rm -f `tar -tf -` 2>/dev/null); \
 	done

-untar:
-	mkdir -p files
-	tar -xzvf @THEME@.etheme -C files
-
-dotar:
-	tar -czvf @THEME@.etheme -C files *
+.PHONY: etheme @THEME@.etheme
+etheme: @THEME@.etheme
+@THEME@.etheme:
+	test ! -d data || (cd data; tar -czvf ../@THEME@.etheme --exclude CVS *)
--- a/BlueSteel/configure.in
+++ b/BlueSteel/configure.in
@ -27,7 +27,7 @@ fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)

-THEME_FILES=`ls -1 $THEME.etheme*`
+THEME_FILES="$THEME.etheme `ls -1 $THEME.etheme*`"
 THEME_FILES=`echo $THEME_FILES`
 AC_SUBST(THEME)
 AC_SUBST(THEME_FILES)
--- 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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 182 178 190
-  __CLICKED "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-iso8859-1"
+  __CLICKED "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 182 178 190
-  __CLICKED "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-iso8859-1"
+  __CLICKED "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 182 178 190
--- a/BrushedMetal-Tigert/.cvsignore
+++ b/BrushedMetal-Tigert/.cvsignore
@ -6,4 +6,4 @@ config.log
 config.status
 Makefile
 e16-theme-*.tar.gz
-files
+*.etheme
--- a/BrushedMetal-Tigert/BrushedMetal-Tigert.etheme
+++ b/BrushedMetal-Tigert/BrushedMetal-Tigert.etheme
--- a/BrushedMetal-Tigert/Makefile.am
+++ b/BrushedMetal-Tigert/Makefile.am
@ -1,6 +1,7 @@

 ethemedir = $(datadir)/themes

+BUILT_SOURCES = @THEME@.etheme
 EXTRA_DIST = etheme-@THEME@.spec @THEME_FILES@

 THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/@THEME@
@ -18,9 +19,7 @@ uninstall-local:
 			rm -f `tar -tf -` 2>/dev/null); \
 	done

-untar:
-	mkdir -p files
-	tar -xzvf @THEME@.etheme -C files
-
-dotar:
-	tar -czvf @THEME@.etheme -C files *
+.PHONY: etheme @THEME@.etheme
+etheme: @THEME@.etheme
+@THEME@.etheme:
+	test ! -d data || (cd data; tar -czvf ../@THEME@.etheme --exclude CVS *)
--- a/BrushedMetal-Tigert/configure.in
+++ b/BrushedMetal-Tigert/configure.in
@ -27,7 +27,7 @@ fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)

-THEME_FILES=`ls -1 $THEME.etheme*`
+THEME_FILES="$THEME.etheme `ls -1 $THEME.etheme*`"
 THEME_FILES=`echo $THEME_FILES`
 AC_SUBST(THEME)
 AC_SUBST(THEME_FILES)
--- 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-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180

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

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

-  __NORMAL_ACTIVE_STICKY "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-iso8859-1"
+  __NORMAL_ACTIVE_STICKY "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
--- 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-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
--- 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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
@ -173,27 +173,17 @@ __TCLASS __BGN
  __NAME "DIALOG_WIDGET_TEXT"
  __JUSTIFICATION 512
  
-  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 255 255 255
 __END

-__TCLASS __BGN
-  __NAME "PAGER_WINDOW_TITLE"
-  __JUSTIFICATION 0
-  
-  __NORMAL "-*-lucida-bold-r-normal-*-*-80-*-*-p-*-iso8859-1"
-  __DRAWING_EFFECT __EFFECT_SHADOW
-  __FORGROUND_COLOR 0 0 0
-  __BACKGROUND_COLOR 180 180 180
-__END
-
 __TCLASS __BGN
  __NAME "DIALOG_BUTTON"
  __JUSTIFICATION 512
    
-  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-80-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-120-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180

-  __CLICKED "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-iso8859-1"
+  __CLICKED "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- 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-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-80-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180
--- 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-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180
--- 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-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_NONE
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 0 0 0

-  __HILITED "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-iso8859-1"
+  __HILITED "-*-lucida-medium-r-normal-*-*-100-*-*-p-*-*-*"
  __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-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-80-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180
--- 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-*-iso8859-1"
+  __NORMAL "-*-lucida-bold-r-normal-*-*-100-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_NONE
  __FORGROUND_COLOR 0 0 0
  __BACKGROUND_COLOR 180 180 180
--- a/Ganymede/.cvsignore
+++ b/Ganymede/.cvsignore
@ -6,4 +6,4 @@ config.log
 config.status
 Makefile
 e16-theme-*.tar.gz
-files
+*.etheme
--- a/Ganymede/Ganymede.etheme
+++ b/Ganymede/Ganymede.etheme
--- a/Ganymede/Makefile.am
+++ b/Ganymede/Makefile.am
@ -1,6 +1,7 @@

 ethemedir = $(datadir)/themes

+BUILT_SOURCES = @THEME@.etheme
 EXTRA_DIST = etheme-@THEME@.spec @THEME_FILES@

 THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/@THEME@
@ -18,9 +19,7 @@ uninstall-local:
 			rm -f `tar -tf -` 2>/dev/null); \
 	done

-untar:
-	mkdir -p files
-	tar -xzvf @THEME@.etheme -C files
-
-dotar:
-	tar -czvf @THEME@.etheme -C files *
+.PHONY: etheme @THEME@.etheme
+etheme: @THEME@.etheme
+@THEME@.etheme:
+	test ! -d data || (cd data; tar -czvf ../@THEME@.etheme --exclude CVS *)
--- a/Ganymede/configure.in
+++ b/Ganymede/configure.in
@ -27,7 +27,7 @@ fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)

-THEME_FILES=`ls -1 $THEME.etheme*`
+THEME_FILES="$THEME.etheme `ls -1 $THEME.etheme*`"
 THEME_FILES=`echo $THEME_FILES`
 AC_SUBST(THEME)
 AC_SUBST(THEME_FILES)
--- a/Ganymede/data/iconbox/iconbox.cfg
+++ b/Ganymede/data/iconbox/iconbox.cfg
@ -53,14 +53,22 @@ __END

 __ICLASS __BGN
  __NAME ICONBOX_HORIZONTAL
+#if 0
  __NORMAL "iconbox/images/back.png"
+#else
+  __NORMAL "ABOUT/background.png"
+#endif
  __EDGE_SCALING 2 2 2 2
  __PADDING 2 2 2 2
 __END

 __ICLASS __BGN
  __NAME ICONBOX_VERTICAL
+#if 0
  __NORMAL "iconbox/images/back.png"
+#else
+  __NORMAL "ABOUT/background.png"
+#endif
  __EDGE_SCALING 2 2 2 2
  __PADDING 2 2 2 2
 __END
--- a/Ganymede/data/menustyles/menustyles.cfg
+++ b/Ganymede/data/menustyles/menustyles.cfg
@ -108,6 +108,7 @@ NORMAL_MENU_STYLE_VERTICAL("CONFIG",     "MENU_NOTITLE", 	"GANYMEDE_MENU", "MENU
 NORMAL_MENU_STYLE_VERTICAL("TASK_MENU",  "MENU_NOTITLE", 	"GANYMEDE_MENU", "MENU_FOCUS",   "MENUBACK",     "DEFAULT_MENU_SUB", 40)
 NORMAL_MENU_STYLE_VERTICAL("DESK_MENU",  "MENU_NOTITLE", 	"GANYMEDE_MENU", "MENU_FOCUS",   "MENUBACK",     "DEFAULT_MENU_SUB", 40)

+#if 0 /* Menu definitions can no longer be in menustyles.cfg */
 BEGIN_NEW_MENU("GANYMEDE_CONFIG_MENU", "CONFIG")
 ADD_MENU_TITLE("E Config")
 ADD_MENU_ICON_ITEM(CONFIG_AUDIO_TOGGLE,      __A_SOUND_SET, "" )
@ -140,3 +141,4 @@ BEGIN_NEW_FILE_MENU("GANYMEDE_GRAPHICS", "EMPTY", HOME_DIR"/.enlightenment/ganym
 END_MENU
 BEGIN_NEW_FILE_MENU("GANYMEDE_OTHER", "EMPTY", HOME_DIR"/.enlightenment/ganymede.other.menu")
 END_MENU
+#endif
--- a/ShinyMetal/.cvsignore
+++ b/ShinyMetal/.cvsignore
@ -6,4 +6,4 @@ config.log
 config.status
 Makefile
 e16-theme-*.tar.gz
-files
+*.etheme
--- a/ShinyMetal/Makefile.am
+++ b/ShinyMetal/Makefile.am
@ -1,6 +1,7 @@

 ethemedir = $(datadir)/themes

+BUILT_SOURCES = @THEME@.etheme
 EXTRA_DIST = etheme-@THEME@.spec @THEME_FILES@

 THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/@THEME@
@ -18,9 +19,7 @@ uninstall-local:
 			rm -f `tar -tf -` 2>/dev/null); \
 	done

-untar:
-	mkdir -p files
-	tar -xzvf @THEME@.etheme -C files
-
-dotar:
-	tar -czvf @THEME@.etheme -C files *
+.PHONY: etheme @THEME@.etheme
+etheme: @THEME@.etheme
+@THEME@.etheme:
+	test ! -d data || (cd data; tar -czvf ../@THEME@.etheme --exclude CVS *)
--- a/ShinyMetal/ShinyMetal.etheme
+++ b/ShinyMetal/ShinyMetal.etheme
--- a/ShinyMetal/configure.in
+++ b/ShinyMetal/configure.in
@ -27,7 +27,7 @@ fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)

-THEME_FILES=`ls -1 $THEME.etheme*`
+THEME_FILES="$THEME.etheme `ls -1 $THEME.etheme*`"
 THEME_FILES=`echo $THEME_FILES`
 AC_SUBST(THEME)
 AC_SUBST(THEME_FILES)
--- a/ShinyMetal/data/epplets/epplets.cfg
+++ b/ShinyMetal/data/epplets/epplets.cfg
@ -331,7 +331,7 @@ __END

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

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

 __TCLASS __BGN
  __NAME "EPPLET_TEXT_LARGE"
-  __NORMAL "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"
+  __NORMAL "-*-lucida-medium-r-normal-*-*-120-*-*-p-*-*-*"
  __DRAWING_EFFECT __EFFECT_SHADOW
  __FORGROUND_COLOR 255 255 255
  __BACKGROUND_COLOR 0 0 0
--- a/winter/.cvsignore
+++ b/winter/.cvsignore
@ -6,3 +6,4 @@ config.log
 config.status
 Makefile
 e16-theme-*.tar.gz
+*.etheme
--- a/winter/Makefile.am
+++ b/winter/Makefile.am
@ -1,6 +1,7 @@

 ethemedir = $(datadir)/themes

+BUILT_SOURCES = @THEME@.etheme
 EXTRA_DIST = etheme-@THEME@.spec @THEME_FILES@

 THEME_DIR = $(DESTDIR)$(ENLIGHTENMENT_ROOT)/themes/@THEME@
@ -18,9 +19,7 @@ uninstall-local:
 			rm -f `tar -tf -` 2>/dev/null); \
 	done

-untar:
-	mkdir -p files
-	tar -xzvf @THEME@.etheme -C files
-
-dotar:
-	tar -czvf @THEME@.etheme -C files *
+.PHONY: etheme @THEME@.etheme
+etheme: @THEME@.etheme
+@THEME@.etheme:
+	test ! -d data || (cd data; tar -czvf ../@THEME@.etheme --exclude CVS *)
--- a/winter/configure.in
+++ b/winter/configure.in
@ -27,7 +27,7 @@ fi
 ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)

-THEME_FILES=`ls -1 $THEME.etheme*`
+THEME_FILES="$THEME.etheme `ls -1 $THEME.etheme*`"
 THEME_FILES=`echo $THEME_FILES`
 AC_SUBST(THEME)
 AC_SUBST(THEME_FILES)
--- a/winter/data/dialogs/dialogs.cfg
+++ b/winter/data/dialogs/dialogs.cfg
@ -203,21 +203,6 @@ __NORMAL "*norm-7"
  __BACKGROUND_COLOR 210 210 210
 __END

-__TCLASS __BGN
-  __NAME "PAGER_WINDOW_TITLE"
-  __JUSTIFICATION 0
-  
-__NORMAL "*norm-7"
-  __DRAWING_EFFECT __EFFECT_SHADOW
-  __FORGROUND_COLOR 70 70 70
-  __BACKGROUND_COLOR 210 210 210
-
-  __HILITED "*norm-7"
-  __DRAWING_EFFECT __EFFECT_SHADOW
-  __FORGROUND_COLOR 70 70 70
-  __BACKGROUND_COLOR 210 210 210
-__END
-
 __TCLASS __BGN
  __NAME "DIALOG_BUTTON"
  __JUSTIFICATION 512
--- a/winter/winter.etheme
+++ b/winter/winter.etheme