--- a/clients/pychan_demo/content/gui/absolute.xml	Wed Aug 06 01:03:00 2008 +0000
+++ b/clients/pychan_demo/content/gui/absolute.xml	Wed Aug 06 22:24:57 2008 +0000
@@ -1,10 +1,10 @@
 <Container position="100,100" size="400,200" 
 	   base_color="255,0,0"
-	   background_image="content/gui/stripe.png"
+	   background_image="gui/backgrounds/stripe.png"
 	   border_size="2">
 	<Label text="Absolute values work._" font="samanata_large" position="20,20" foreground_color="128,0,0" />
 	<ClickLabel text="__ Baseline ok?" font="samanata_large" position="220,20" max_size="500,20" foreground_color="128,0,0" />
 	<Label text="It's tiresome, though." position="20,50" base_color="255,0,0" />
-	<Icon image="content/gui/stripe.png"  position="100,100" />
+	<Icon image="gui/backgrounds/stripe.png"  position="100,100" />
 	<Button name="closeButton" text="Ok" position="160,150" base_color="255,0,0" />
 </Container>

--- a/clients/pychan_demo/content/gui/all_widgets.xml	Wed Aug 06 01:03:00 2008 +0000
+++ b/clients/pychan_demo/content/gui/all_widgets.xml	Wed Aug 06 22:24:57 2008 +0000
@@ -39,8 +39,8 @@
 	<CheckBox text="Inclusive choice 1"/>
 	<CheckBox text="Inclusive choice 2"/>
 	<Label text="Icon and ImageButton:"/>
-	<Icon image="content/gui/stripe.png" />
-	<ImageButton up_image="content/gui/stripe.png" text="Click me for a Bug demonstration" />
+	<Icon image="gui/backgrounds/stripe.png" />
+	<ImageButton up_image="gui/backgrounds/stripe.png" text="Click me for a Bug demonstration" />
 	<HBox>
 		<Label text="I'm a ClickLabel[br]Multiline enabled?![br]I do hope so."/>
 		<Spacer/>

--- a/clients/pychan_demo/content/gui/demoapp.xml	Wed Aug 06 01:03:00 2008 +0000
+++ b/clients/pychan_demo/content/gui/demoapp.xml	Wed Aug 06 22:24:57 2008 +0000
@@ -11,7 +11,7 @@
 					<Button text="XML code"/>
 				</HBox>
 				<ScrollArea size="600,200">
-					<TextBox name="xmlSource" filename="content/gui/all_widgets.xml"/>
+					<TextBox name="xmlSource" filename="gui/all_widgets.xml"/>
 				</ScrollArea>
 				<Spacer />
 			</VBox>
@@ -22,4 +22,4 @@
 			<Button name="closeButton" text="Quit Demo"/>
 		</HBox>
 	</VBox>
-</Window>
\ No newline at end of file
+</Window>

--- a/clients/pychan_demo/content/gui/dynamic.xml	Wed Aug 06 01:03:00 2008 +0000
+++ b/clients/pychan_demo/content/gui/dynamic.xml	Wed Aug 06 22:24:57 2008 +0000
@@ -3,11 +3,11 @@
 	<ScrollArea size="200,100" vertical_scrollbar="0">
 		<TextBox name="labelText" text="Add some text here."/>
 	</ScrollArea>
-	<VBox name="labelBox" min_size="0,100" border_size="1" background_image="content/gui/background.png" opaque="0">
+	<VBox name="labelBox" min_size="0,100" border_size="1" background_image="gui/backgrounds/background.png" opaque="0">
 	</VBox>
 	<HBox>
 		<Button name="addButton" text="Add one label!"/>
 		<Spacer />
 		<Button name="okButton" text="Close"/>
 	</HBox>
-</Window>
\ No newline at end of file
+</Window>

--- a/clients/pychan_demo/dynamic.py	Wed Aug 06 01:03:00 2008 +0000
+++ b/clients/pychan_demo/dynamic.py	Wed Aug 06 22:24:57 2008 +0000
@@ -21,7 +21,7 @@
 
 class DynamicExample(PyChanExample):
 	def __init__(self):
-		super(DynamicExample,self).__init__('content/gui/dynamic.xml')
+		super(DynamicExample,self).__init__('gui/dynamic.xml')
 		
 	def start(self):
 		self.widget = pychan.loadXML(self.xmlFile)

--- a/clients/pychan_demo/pychan_test.py	Wed Aug 06 01:03:00 2008 +0000
+++ b/clients/pychan_demo/pychan_test.py	Wed Aug 06 22:24:57 2008 +0000
@@ -43,7 +43,7 @@
 		pychan.init(self.engine,debug=True)
 		pychan.setupModalExecution(self.mainLoop,self.breakFromMainLoop)
 		
-		self.gui = pychan.loadXML('content/gui/demoapp.xml')
+		self.gui = pychan.loadXML('gui/demoapp.xml')
 		
 		eventMap = {
 			'creditsLink'  : self.showCredits,
@@ -56,9 +56,9 @@
 		from styling import StylingExample
 		
 		self.examples = {
-			'Absolute Positioning' : PyChanExample('content/gui/absolute.xml'),
+			'Absolute Positioning' : PyChanExample('gui/absolute.xml'),
 			'Basic Styling' : StylingExample(),
-			'All Widgets' : PyChanExample('content/gui/all_widgets.xml'),
+			'All Widgets' : PyChanExample('gui/all_widgets.xml'),
 			'Dynamic Widgets' : DynamicExample(),
 		}
 		self.demoList = self.gui.findChild(name='demoList')
@@ -77,7 +77,7 @@
 		self.currentExample.start()
 
 	def showCredits(self):
-		print pychan.loadXML('content/gui/credits.xml').execute({ 'okButton' : "Yay!" })
+		print pychan.loadXML('gui/credits.xml').execute({ 'okButton' : "Yay!" })
 
 class TestXMLApplication(basicapplication.ApplicationBase):
 	"""

--- a/clients/pychan_demo/settings.py	Wed Aug 06 01:03:00 2008 +0000
+++ b/clients/pychan_demo/settings.py	Wed Aug 06 22:24:57 2008 +0000
@@ -13,3 +13,6 @@
 
 FontGlyphs          = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]\""
 Font                = 'content/fonts/samanata.ttf'
+
+WindowTitle			= 'Pychan demo [FIFE Client]'
+WindowIcon			= 'gui/pychan_logo.png'

--- a/clients/pychan_demo/styling.py	Wed Aug 06 01:03:00 2008 +0000
+++ b/clients/pychan_demo/styling.py	Wed Aug 06 22:24:57 2008 +0000
@@ -85,13 +85,13 @@
 
 class StylingExample(PyChanExample):
 	def __init__(self):
-		super(StylingExample,self).__init__('content/gui/styling.xml')
+		super(StylingExample,self).__init__('gui/styling.xml')
 
 		self.styles = ['default'] + STYLES.keys()
 		for name,style in STYLES.items():
 			pychan.manager.addStyle(name,style)
 
-		pychan.loadFonts("content/fonts/samanata.fontdef")
+		pychan.loadFonts("fonts/samanata.fontdef")
 
 	def start(self):
 		self.styledCredits = None
@@ -114,7 +114,7 @@
 		style = self.styles[self.widget.collectData('styleList')]
 		if self.styledCredits:
 			self.styledCredits.hide()
-		self.styledCredits = pychan.loadXML('content/gui/all_widgets.xml')
+		self.styledCredits = pychan.loadXML('gui/all_widgets.xml')
 		self.styledCredits.distributeInitialData({
 			'demoList' : dir(pychan),
 			'demoText' : pychan.__doc__