diff --git a/spritz/Makefile b/spritz/Makefile
index fba2c6695..77d56200d 100644
--- a/spritz/Makefile
+++ b/spritz/Makefile
@@ -18,18 +18,18 @@ clean:
 	for d in $(SUBDIRS); do make -C $$d clean ; done
 
 install:
-	mkdir -p $(DESTDIR)/usr/share/yumex
-	mkdir -p $(DESTDIR)/usr/share/pixmaps/yumex
+	mkdir -p $(DESTDIR)/usr/lib/entropy/spritz
+	mkdir -p $(DESTDIR)/usr/share/pixmaps/spritz
 	mkdir -p $(DESTDIR)/usr/share/applications
 	mkdir -p $(DESTDIR)/usr/bin
 	mkdir -p $(DESTDIR)/etc
 	mkdir -p $(DESTDIR)/etc/pam.d
 	mkdir -p $(DESTDIR)/etc/security/console.apps
-	install -m644 COPYING $(DESTDIR)/usr/share/yumex/.
-	install -m755 $(MISCDIR)/yumex $(DESTDIR)/usr/share/yumex/.
-	install -m644 $(PIXDIR)/*.png $(DESTDIR)/usr/share/pixmaps/yumex/.
+	install -m644 COPYING $(DESTDIR)/usr/lib/entropy/spritz/.
+	install -m755 $(MISCDIR)/yumex $(DESTDIR)/usr/lib/entropy/spritz/.
+	install -m644 $(PIXDIR)/*.png $(DESTDIR)/usr/share/pixmaps/spritz/.
 	install -m644 $(MISCDIR)/spritz.pam $(DESTDIR)/etc/pam.d/spritz
-	chmod +x $(DESTDIR)/usr/lib/entropy/gui/spritz
+	chmod +x $(DESTDIR)/usr/lib/entropy/spritz
 	install -m644 $(MISCDIR)/spritz.desktop $(DESTDIR)/usr/share/applications/.
 	for d in $(SUBDIRS); do make DESTDIR=`cd $(DESTDIR); pwd` -C $$d install; [ $$? = 0 ] || exit 1; done
 
diff --git a/spritz/gfx/logo.png b/spritz/gfx/logo.png
index b1e95b252..3eacbdfba 100644
Binary files a/spritz/gfx/logo.png and b/spritz/gfx/logo.png differ
diff --git a/spritz/gfx/spritz-about.png b/spritz/gfx/spritz-about.png
new file mode 100644
index 000000000..abb0a17c0
Binary files /dev/null and b/spritz/gfx/spritz-about.png differ
diff --git a/spritz/gfx/spritz-icon.png b/spritz/gfx/spritz-icon.png
new file mode 100644
index 000000000..f6e8e9c75
Binary files /dev/null and b/spritz/gfx/spritz-icon.png differ
diff --git a/spritz/gfx/yumex-about.png b/spritz/gfx/yumex-about.png
deleted file mode 100644
index 776e37231..000000000
Binary files a/spritz/gfx/yumex-about.png and /dev/null differ
diff --git a/spritz/gfx/yumex-icon.png b/spritz/gfx/yumex-icon.png
deleted file mode 100644
index 71abdb598..000000000
Binary files a/spritz/gfx/yumex-icon.png and /dev/null differ
diff --git a/spritz/src/Makefile b/spritz/src/Makefile
index 53e424eca..1447159a8 100644
--- a/spritz/src/Makefile
+++ b/spritz/src/Makefile
@@ -1,16 +1,16 @@
-PKGDIR = /usr/share/yumex
+PKGDIR = /usr/lib/entropy/spritz
 
-all: 
+all:
 	@../tools/py-compile *.py 
 
 clean:
 	rm -fv *.pyc *.pyo *~ *.bak *.gladep
-	rm -fv yumex/*.pyc yumex/*.pyo yumex/*~ 
-	rm -fv yumgui/*.pyc yumgui/*.pyo yumgui/*~ 
+	rm -fv yumex/*.pyc yumex/*.pyo etpgui/*~ 
+	rm -fv etpgui/*.pyc etpgui/*.pyo etpgui/*~ 
 
 install:
-	mkdir -p $(DESTDIR)/usr/share/yumex
-	mkdir -p $(DESTDIR)/usr/share/yumex
+	mkdir -p $(DESTDIR)/usr/lib/entropy/spritz
+	mkdir -p $(DESTDIR)/usr/lib/entropy/spritz
 	install -m755 *.pyc $(DESTDIR)/$(PKGDIR)/.
 	install -m755 *.py $(DESTDIR)/$(PKGDIR)/.
-	install -m644 yumex.glade $(DESTDIR)/$(PKGDIR)/.
+	install -m644 spritz.glade $(DESTDIR)/$(PKGDIR)/.
diff --git a/spritz/src/yumgui/Makefile b/spritz/src/etpgui/Makefile
similarity index 100%
rename from spritz/src/yumgui/Makefile
rename to spritz/src/etpgui/Makefile
diff --git a/spritz/src/yumgui/__init__.py b/spritz/src/etpgui/__init__.py
similarity index 100%
rename from spritz/src/yumgui/__init__.py
rename to spritz/src/etpgui/__init__.py
diff --git a/spritz/src/yumgui/callbacks.py b/spritz/src/etpgui/callbacks.py
similarity index 99%
rename from spritz/src/yumgui/callbacks.py
rename to spritz/src/etpgui/callbacks.py
index 74f278031..446981488 100644
--- a/spritz/src/yumgui/callbacks.py
+++ b/spritz/src/etpgui/callbacks.py
@@ -22,9 +22,9 @@ import os
 import sys
 import yum
 import logging
-from yum.constants import *
+#from yum.constants import *
 
-from yumgui import doGtkEvents
+from etpgui import doGtkEvents
 
 # yum callback handlers
 
diff --git a/spritz/src/yumgui/packages.py b/spritz/src/etpgui/packages.py
similarity index 99%
rename from spritz/src/yumgui/packages.py
rename to spritz/src/etpgui/packages.py
index 86fc5237d..5e4aa4fd6 100644
--- a/spritz/src/yumgui/packages.py
+++ b/spritz/src/etpgui/packages.py
@@ -17,7 +17,7 @@
 # Authors:
 #    Tim Lauridsen <tla@rasmil.dk>
 
-from yumgui import format_number
+from etpgui import format_number
 import time
 import types
 
diff --git a/spritz/src/yumgui/widgets.py b/spritz/src/etpgui/widgets.py
similarity index 99%
rename from spritz/src/yumgui/widgets.py
rename to spritz/src/etpgui/widgets.py
index 1e8dcad47..5f92746f5 100644
--- a/spritz/src/yumgui/widgets.py
+++ b/spritz/src/etpgui/widgets.py
@@ -19,7 +19,7 @@
 
 import gtk.glade
 import pango
-import yumgui
+import etpgui
 import gobject
 import types
 
@@ -35,8 +35,8 @@ class TextViewConsole:
         self.style_banner.set_property( "foreground", "saddle brown" )
         self.style_banner.set_property( "family", "Monospace" )
         self.style_banner.set_property( "size_points", 8 )
-        
-            
+
+
         self.style_ps1 = gtk.TextTag( "ps1" )
         self.style_ps1.set_property( "editable", False )
         if color:
diff --git a/spritz/src/gui.py b/spritz/src/gui.py
index 3144bd578..20a02fb64 100644
--- a/spritz/src/gui.py
+++ b/spritz/src/gui.py
@@ -17,10 +17,10 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-from yumgui import *
+from etpgui import *
 from misc import YumexQueue,YumexConf,const,cleanMarkupSting
 from views import *
-from yumgui.widgets import TextViewConsole
+from etpgui.widgets import TextViewConsole
 from i18n import _
 
 
diff --git a/spritz/src/misc.py b/spritz/src/misc.py
index 7ad5d1c72..f49192d29 100644
--- a/spritz/src/misc.py
+++ b/spritz/src/misc.py
@@ -43,8 +43,8 @@ class const:
     __spritz_version__   = "0.1"
     # Paths
     MAIN_PATH = os.path.abspath( os.path.dirname( sys.argv[0] ) );
-    GLADE_FILE = MAIN_PATH+'/yumex.glade'  
-    if MAIN_PATH == '/usr/share/yumex':    
+    GLADE_FILE = MAIN_PATH+'/spritz.glade'
+    if MAIN_PATH == '/usr/share/yumex':
         PIXMAPS_PATH = '/usr/share/pixmaps/yumex'
     else:
         PIXMAPS_PATH = MAIN_PATH+'/../gfx'
diff --git a/spritz/src/packages.py b/spritz/src/packages.py
index f56e6aed8..e0e843fc4 100644
--- a/spritz/src/packages.py
+++ b/spritz/src/packages.py
@@ -17,7 +17,7 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-from yumgui.packages import PackageWrapper
+from etpgui.packages import PackageWrapper
 import logging
 import time
 
diff --git a/spritz/src/pixmaps/spritz-icon.png b/spritz/src/pixmaps/spritz-icon.png
new file mode 100644
index 000000000..f6e8e9c75
Binary files /dev/null and b/spritz/src/pixmaps/spritz-icon.png differ
diff --git a/spritz/src/yumex.glade b/spritz/src/spritz.glade
similarity index 99%
rename from spritz/src/yumex.glade
rename to spritz/src/spritz.glade
index 3136a8e70..a3f9fdad8 100644
--- a/spritz/src/yumex.glade
+++ b/spritz/src/spritz.glade
@@ -13,7 +13,7 @@
   <property name="default_height">600</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon_name">system-installer</property>
+  <property name="icon_name">spritz-icon</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
diff --git a/spritz/src/yumex.py b/spritz/src/spritz.py
old mode 100755
new mode 100644
similarity index 99%
rename from spritz/src/yumex.py
rename to spritz/src/spritz.py
index ad4ab4aa8..d75429a5f
--- a/spritz/src/yumex.py
+++ b/spritz/src/spritz.py
@@ -36,8 +36,8 @@ import gtk,gobject
 from threading import Thread,Event
 import thread
 import exceptions
-from yumgui.widgets import UI, Controller
-from yumgui import *
+from etpgui.widgets import UI, Controller
+from etpgui import *
 
 # yumex imports
 import filters
@@ -367,7 +367,7 @@ class YumexController(Controller):
         self.settings = self.yumexOptions.settings       
         
     def on_HelpAbout( self, widget ):
-        about = AboutDialog(const.PIXMAPS_PATH+'/yumex-about.png',const.CREDITS,self.settings.branding_title)
+        about = AboutDialog(const.PIXMAPS_PATH+'/spritz-about.png',const.CREDITS,self.settings.branding_title)
         about.show()
         
     def on_ProfileSave( self, widget ):
@@ -711,7 +711,7 @@ if __name__ == "__main__":
     try:
         gtkEventThread = ProcessGtkEventsThread()
         gtkEventThread.start()
-        gtk.window_set_default_icon_from_file(const.PIXMAPS_PATH+"/yumex-icon.png")
+        gtk.window_set_default_icon_from_file(const.PIXMAPS_PATH+"/spritz-icon.png")
         mainApp = YumexApplication()
         gtk.main()
     except SystemExit, e: