diff --git a/LFSApplications/ChangeLog b/LFSApplications/ChangeLog
index aeb1bf9..7375f26 100644
--- a/LFSApplications/ChangeLog
+++ b/LFSApplications/ChangeLog
@@ -1,4 +1,6 @@
 0.2.0
+Fixed missing prefs image.
+Set appnames.
 Updated appearance dialog.
 Added dock prefs dialog.
 Updated prefs apps.
diff --git a/LFSApplications/LFSApplications/resources/desktopdata/lfsprefs.png b/LFSApplications/LFSApplications/resources/desktopdata/LFSTKPrefs.png
similarity index 100%
rename from LFSApplications/LFSApplications/resources/desktopdata/lfsprefs.png
rename to LFSApplications/LFSApplications/resources/desktopdata/LFSTKPrefs.png
diff --git a/LFSApplications/LFSApplications/resources/desktopdata/lfsappearance.desktop b/LFSApplications/LFSApplications/resources/desktopdata/lfsappearance.desktop
index a004d4c..072593d 100644
--- a/LFSApplications/LFSApplications/resources/desktopdata/lfsappearance.desktop
+++ b/LFSApplications/LFSApplications/resources/desktopdata/lfsappearance.desktop
@@ -4,5 +4,5 @@ Comment=Prefs for LFS Window Manager
 Terminal=false
 Type=Application
 Categories=Gnome;GTK;;Settings;DesktopSettings;
-Icon=lfsprefs
+Icon=LFSTKPrefs
 Exec=lfsappearance
\ No newline at end of file
diff --git a/LFSApplications/LFSApplications/resources/desktopdata/lfsdesktopprefs.desktop b/LFSApplications/LFSApplications/resources/desktopdata/lfsdesktopprefs.desktop
index 6a78819..128d618 100644
--- a/LFSApplications/LFSApplications/resources/desktopdata/lfsdesktopprefs.desktop
+++ b/LFSApplications/LFSApplications/resources/desktopdata/lfsdesktopprefs.desktop
@@ -4,5 +4,5 @@ Comment=Prefs for LFS Window Manager
 Terminal=false
 Type=Application
 Categories=Gnome;GTK;;Settings;DesktopSettings;
-Icon=lfsprefs
+Icon=LFSTKPrefs
 Exec=lfsdesktopprefs
\ No newline at end of file
diff --git a/LFSApplications/LFSApplications/resources/desktopdata/lfspanelprefs.desktop b/LFSApplications/LFSApplications/resources/desktopdata/lfspanelprefs.desktop
index 0f449dc..3c81d0b 100644
--- a/LFSApplications/LFSApplications/resources/desktopdata/lfspanelprefs.desktop
+++ b/LFSApplications/LFSApplications/resources/desktopdata/lfspanelprefs.desktop
@@ -4,5 +4,5 @@ Comment=Prefs for LFS Panels
 Terminal=false
 Type=Application
 Categories=Gnome;GTK;;Settings;DesktopSettings;
-Icon=lfsprefs
+Icon=LFSTKPrefs
 Exec=lfspanelprefs
\ No newline at end of file
diff --git a/LFSApplications/LFSApplications/resources/desktopdata/lfstkprefs.desktop b/LFSApplications/LFSApplications/resources/desktopdata/lfstkprefs.desktop
index 9f70d00..8fd6702 100644
--- a/LFSApplications/LFSApplications/resources/desktopdata/lfstkprefs.desktop
+++ b/LFSApplications/LFSApplications/resources/desktopdata/lfstkprefs.desktop
@@ -4,5 +4,5 @@ Comment=Prefs for LFS Window Manager
 Terminal=false
 Type=Application
 Categories=Gnome;GTK;;Settings;DesktopSettings;
-Icon=lfsprefs
+Icon=LFSTKPrefs
 Exec=lfstkprefs
\ No newline at end of file
diff --git a/LFSApplications/LFSApplications/resources/desktopdata/lfswallpaperprefs.desktop b/LFSApplications/LFSApplications/resources/desktopdata/lfswallpaperprefs.desktop
index 15ad4fb..8473aea 100644
--- a/LFSApplications/LFSApplications/resources/desktopdata/lfswallpaperprefs.desktop
+++ b/LFSApplications/LFSApplications/resources/desktopdata/lfswallpaperprefs.desktop
@@ -4,5 +4,5 @@ Comment=Prefs for LFS Window Manager
 Terminal=false
 Type=Application
 Categories=Gnome;GTK;;Settings;DesktopSettings;
-Icon=lfsprefs
+Icon=LFSTKPrefs
 Exec=lfsbackdropprefs
\ No newline at end of file
diff --git a/LFSApplications/LFSApplications/resources/desktopdata/lfswm2prefs.desktop b/LFSApplications/LFSApplications/resources/desktopdata/lfswm2prefs.desktop
index 0cce015..942fb46 100644
--- a/LFSApplications/LFSApplications/resources/desktopdata/lfswm2prefs.desktop
+++ b/LFSApplications/LFSApplications/resources/desktopdata/lfswm2prefs.desktop
@@ -4,5 +4,5 @@ Comment=Prefs for LFS Window Manager
 Terminal=false
 Type=Application
 Categories=Gnome;GTK;;Settings;DesktopSettings;
-Icon=lfsprefs
+Icon=LFSTKPrefs
 Exec=lfswmprefs
\ No newline at end of file
diff --git a/LFSApplications/LFSApplications/resources/desktopdata/lfswmprefs.desktop b/LFSApplications/LFSApplications/resources/desktopdata/lfswmprefs.desktop
index 5822693..3c1c730 100644
--- a/LFSApplications/LFSApplications/resources/desktopdata/lfswmprefs.desktop
+++ b/LFSApplications/LFSApplications/resources/desktopdata/lfswmprefs.desktop
@@ -4,5 +4,5 @@ Comment=Prefs for LFS Window Manager ( version 2 )
 Terminal=false
 Type=Application
 Categories=Gnome;GTK;;Settings;DesktopSettings;
-Icon=lfsprefs
+Icon=LFSTKPrefs
 Exec=lfswm2prefs
\ No newline at end of file
diff --git a/LFSApplications/LFSApplications/src/lfsappearance.cpp b/LFSApplications/LFSApplications/src/lfsappearance.cpp
index 13bf5f3..792c41c 100644
--- a/LFSApplications/LFSApplications/src/lfsappearance.cpp
+++ b/LFSApplications/LFSApplications/src/lfsappearance.cpp
@@ -272,7 +272,7 @@ int main(int argc, char **argv)
 	std::vector<hitRect>	hrs;
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
 	wc=apc->mainWindow;
 
 	multi=new LFSTK_ExpanderGadgetClass(wc,"",0,0,1,1);
diff --git a/LFSApplications/LFSApplications/src/lfsbackdropprefs.cpp b/LFSApplications/LFSApplications/src/lfsbackdropprefs.cpp
index 017698c..e708ecd 100644
--- a/LFSApplications/LFSApplications/src/lfsbackdropprefs.cpp
+++ b/LFSApplications/LFSApplications/src/lfsbackdropprefs.cpp
@@ -292,7 +292,7 @@ int main(int argc, char **argv)
 		}
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
 	wc=apc->mainWindow;
 
 	asprintf(&wd,"%s",apc->userHome);
diff --git a/LFSApplications/LFSApplications/src/lfsdesktopprefs.cpp b/LFSApplications/LFSApplications/src/lfsdesktopprefs.cpp
index 9b88db9..53b8cdd 100644
--- a/LFSApplications/LFSApplications/src/lfsdesktopprefs.cpp
+++ b/LFSApplications/LFSApplications/src/lfsdesktopprefs.cpp
@@ -199,7 +199,7 @@ int main(int argc, char **argv)
 		}
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
 	wc=apc->mainWindow;
 
 	prefs.prefsMap=
diff --git a/LFSApplications/LFSApplications/src/lfsdockprefs.cpp b/LFSApplications/LFSApplications/src/lfsdockprefs.cpp
index bf50515..ac8bbab 100644
--- a/LFSApplications/LFSApplications/src/lfsdockprefs.cpp
+++ b/LFSApplications/LFSApplications/src/lfsdockprefs.cpp
@@ -254,7 +254,7 @@ int main(int argc, char **argv)
 		}
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
 	wc=apc->mainWindow;
 
 	copyrite=new LFSTK_labelClass(wc,COPYRITE,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSApplications/LFSApplications/src/lfspanelprefs.cpp b/LFSApplications/LFSApplications/src/lfspanelprefs.cpp
index 8b03f22..bb674ca 100644
--- a/LFSApplications/LFSApplications/src/lfspanelprefs.cpp
+++ b/LFSApplications/LFSApplications/src/lfspanelprefs.cpp
@@ -302,7 +302,7 @@ int main(int argc, char **argv)
 		}
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
 	wc=apc->mainWindow;
 
 	copyrite=new LFSTK_labelClass(wc,COPYRITE,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSApplications/LFSApplications/src/lfstkprefs.cpp b/LFSApplications/LFSApplications/src/lfstkprefs.cpp
index 1a5e9a5..c5fdcda 100644
--- a/LFSApplications/LFSApplications/src/lfstkprefs.cpp
+++ b/LFSApplications/LFSApplications/src/lfstkprefs.cpp
@@ -627,7 +627,7 @@ int main(int argc, char **argv)
 		}
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
 	wc=apc->mainWindow;
 
 	command=apc->globalLib->LFSTK_oneLiner("sed -n '2p' %s/lfsappearance.rc",apc->configDir.c_str());
diff --git a/LFSApplications/LFSApplications/src/lfswm2prefs.cpp b/LFSApplications/LFSApplications/src/lfswm2prefs.cpp
index 17c57e5..fbbdb4d 100644
--- a/LFSApplications/LFSApplications/src/lfswm2prefs.cpp
+++ b/LFSApplications/LFSApplications/src/lfswm2prefs.cpp
@@ -371,7 +371,7 @@ int main(int argc, char **argv)
 		}
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
 	wc=apc->mainWindow;
 
 	buffer=wc->globalLib->LFSTK_oneLiner("sed -n '2p' %s/lfsappearance.rc",apc->configDir.c_str());
diff --git a/LFSApplications/LFSApplications/src/lfswmprefs.cpp b/LFSApplications/LFSApplications/src/lfswmprefs.cpp
index fdb5359..fa3b824 100644
--- a/LFSApplications/LFSApplications/src/lfswmprefs.cpp
+++ b/LFSApplications/LFSApplications/src/lfswmprefs.cpp
@@ -234,7 +234,7 @@ int main(int argc, char **argv)
 		}
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKPrefs");
 	wc=apc->mainWindow;
 
 	buffer=wc->globalLib->LFSTK_oneLiner("sed -n '2p' %s/lfsappearance.rc",apc->configDir.c_str());
diff --git a/LFSApplications/Makefile.am b/LFSApplications/Makefile.am
index c0cf395..3f324fd 100644
--- a/LFSApplications/Makefile.am
+++ b/LFSApplications/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = LFSApplications/app
 install-exec-hook:
 	mkdir -vp $(DESTDIR)${datadir}/applications $(DESTDIR)${datadir}/pixmaps $(DESTDIR)/usr/share/xsessions $(DESTDIR)$(bindir)
 	cp LFSApplications/resources/desktopdata/lfs*.desktop $(DESTDIR)${datadir}/applications
-	cp LFSApplications/resources/desktopdata/lfs*.png $(DESTDIR)${datadir}/pixmaps
+	cp LFSApplications/resources/desktopdata/*.png $(DESTDIR)${datadir}/pixmaps
 	cp LFSApplications/resources/lfslaunchpanels $(DESTDIR)$(bindir)
 	cp LFSApplications/resources/startlfsdesktop $(DESTDIR)$(bindir)
 	cp LFSApplications/resources/lfsdesktop.desktop $(DESTDIR)/usr/share/xsessions
diff --git a/LFSDock/ChangeLog b/LFSDock/ChangeLog
index 5c510fd..a8b5bdb 100644
--- a/LFSDock/ChangeLog
+++ b/LFSDock/ChangeLog
@@ -1,4 +1,5 @@
 0.1.0
+Prevent tasks changing postion on bar.
 Gui fixes.
 Compacted code.
 Various gui fixes.
diff --git a/LFSDock/LFSDock/src/globals.h b/LFSDock/LFSDock/src/globals.h
index 7816d11..cab5412 100644
--- a/LFSDock/LFSDock/src/globals.h
+++ b/LFSDock/LFSDock/src/globals.h
@@ -25,6 +25,7 @@
 #include <filesystem>
 #include <iostream>
 #include <fstream>
+#include <algorithm>
 
 #include "config.h"
 #include <lfstk/LFSTKGlobals.h>
diff --git a/LFSDock/LFSDock/src/main.cpp b/LFSDock/LFSDock/src/main.cpp
index 6b31956..64ad182 100644
--- a/LFSDock/LFSDock/src/main.cpp
+++ b/LFSDock/LFSDock/src/main.cpp
@@ -200,23 +200,20 @@ int main(int argc,char **argv)
 			popActionList->LFSTK_setListItemsColours(GADGETFG,"red","red","red","red");
 			popActionList->LFSTK_setGadgetColourPair(NORMALCOLOUR,lc,"red");
 			popActionList->LFSTK_setMouseCallBack(NULL,popActionWindowSelect,NULL);
-			//popActionList->LFSTK_setMouseMoveCallBack(popActionListEnterCB,popActionListExitCB,NULL);
 
-//TODO//
-			WM_STATE=XInternAtom(dockWindow->app->display,"WM_STATE",False);
-			NET_WM_WINDOW_TYPE_NORMAL=XInternAtom(dockWindow->app->display,"_NET_WM_WINDOW_TYPE_NORMAL",False);
-			NET_WM_STATE_HIDDEN=XInternAtom(dockWindow->app->display,"_NET_WM_STATE_HIDDEN",False);
-			NET_WM_WINDOW_TYPE_DIALOG=XInternAtom(dockWindow->app->display,"_NET_WM_WINDOW_TYPE_DIALOG",False);
-			//NET_WM_DESKTOP=XInternAtom(dockWindow->app->display,"_NET_WM_DESKTOP",False);
-			NET_WM_WINDOW_TYPE=XInternAtom(dockWindow->app->display,"_NET_WM_WINDOW_TYPE",False);
-			NET_WM_STATE=XInternAtom(dockWindow->app->display,"_NET_WM_STATE",False);
-			NET_WM_NAME=XInternAtom(dockWindow->app->display,"_NET_WM_NAME",False);
-			UTF8_STRING=XInternAtom(dockWindow->app->display,"UTF8_STRING",False);
-			NET_CURRENT_DESKTOP=XInternAtom(dockWindow->app->display,"_NET_CURRENT_DESKTOP",False);
-			WM_CLASS=XInternAtom(dockWindow->app->display,"WM_CLASS",False);
-			NET_WM_PID=XInternAtom(dockWindow->app->display,"_NET_WM_PID",False);
-			NET_NUMBER_OF_DESKTOPS=XInternAtom(dockWindow->app->display,"_NET_NUMBER_OF_DESKTOPS",False);
-			NET_ACTIVE_WINDOW=XInternAtom(dockWindow->app->display,"_NET_ACTIVE_WINDOW",False);
+			WM_STATE=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("WM_STATE"));
+			NET_WM_WINDOW_TYPE_NORMAL=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_NORMAL"));
+			NET_WM_STATE_HIDDEN=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("_NET_WM_STATE_HIDDEN"));
+			NET_WM_WINDOW_TYPE_DIALOG=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DIALOG"));
+			NET_WM_WINDOW_TYPE=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE"));
+			NET_WM_STATE=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("_NET_WM_STATE"));
+			NET_WM_NAME=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("_NET_WM_NAME"));
+			UTF8_STRING=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("UTF8_STRING"));
+			NET_CURRENT_DESKTOP=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("_NET_CURRENT_DESKTOP"));
+			WM_CLASS=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("WM_CLASS"));
+			NET_WM_PID=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("_NET_WM_PID"));
+			NET_NUMBER_OF_DESKTOPS=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("_NET_NUMBER_OF_DESKTOPS"));
+			NET_ACTIVE_WINDOW=apc->appAtomsHashed.at(apc->globalLib->prefs.LFSTK_hashFromKey("_NET_ACTIVE_WINDOW"));
 
 			env=dockWindow->globalLib->LFSTK_oneLiner("sed -n '2p' %s/lfsappearance.rc",apc->configDir.c_str());
 			key=atoi(env);
diff --git a/LFSDock/LFSDock/src/taskBar.cpp b/LFSDock/LFSDock/src/taskBar.cpp
index 6b653d0..79ba5db 100644
--- a/LFSDock/LFSDock/src/taskBar.cpp
+++ b/LFSDock/LFSDock/src/taskBar.cpp
@@ -130,8 +130,8 @@ Window doTreeWalkForTasks(Window wind)
 						{
 							if(pr.strlist.size()>1)
 								{
-									tsk.taskClass[0]=pr.strlist.at(1);
-									tsk.taskClass[1]=pr.strlist.at(0);
+									tsk.taskClass[0]=pr.strlist.at(0);
+									tsk.taskClass[1]=pr.strlist.at(1);
 								}
 							else
 								tsk.taskClass[0]=pr.strlist.at(0);
@@ -174,6 +174,11 @@ Window doTreeWalkForTasks(Window wind)
 	return thewin;
 }
 
+bool compareTaskClass(const taskStruct &a,const taskStruct &b)
+{
+	return(a.taskClass[0].compare(b.taskClass[0]));
+}
+
 void updateTaskBar(bool force)
 {
 	int						cnt=0;
@@ -203,11 +208,14 @@ void updateTaskBar(bool force)
 	if((unequal==false) && (force==false))
 		return;
 
+	std::sort(tasks.begin(),tasks.end(),compareTaskClass);
+
 	holdtasks=tasks;
 
 	filltasks.clear();
 	filltasks.push_back(tasks.at(0));
 	tasks.erase(tasks.begin());
+
 	while(tasks.size()>0)
 		{
 			skipflag=false;
diff --git a/LFSToolKit/ChangeLog b/LFSToolKit/ChangeLog
index 683a351..a976abc 100644
--- a/LFSToolKit/ChangeLog
+++ b/LFSToolKit/ChangeLog
@@ -1,4 +1,5 @@
 0.6.0
+Set applicaion name and class correctly.
 GUI fixes.
 Removed some od legacy code.
 Added CONTEXTCENTRE to gadget context menu.
diff --git a/LFSToolKit/LFSToolKit/lfstk/LFSTKApplication.cpp b/LFSToolKit/LFSToolKit/lfstk/LFSTKApplication.cpp
index 84a512e..64b4b9e 100644
--- a/LFSToolKit/LFSToolKit/lfstk/LFSTKApplication.cpp
+++ b/LFSToolKit/LFSToolKit/lfstk/LFSTKApplication.cpp
@@ -98,10 +98,6 @@ LFSTK_applicationClass::LFSTK_applicationClass()
 	this->configDir=this->userHome + std::string("/.config/LFS");
 	this->iconThemeName=this->globalLib->LFSTK_oneLiner("cat '%s'/lfsdesktop.rc|grep -i icontheme|awk '{print $2}'",this->configDir.c_str());
 
-/*
-			NET_ACTIVE_WINDOW=XInternAtom(dockWindow->app->display,"_NET_ACTIVE_WINDOW",False);
-
-*/
 //set up atoms
 	const char *appAtomNames[]={
 						"_NET_WM_WINDOW_TYPE_DESKTOP",
@@ -182,7 +178,7 @@ windowInitStruct* LFSTK_applicationClass::LFSTK_getDefaultWInit(void)
 * \note name can be NULL, if window is set to 1px size and type to _NET_WM_WINDOW_TYPE_DOCK.
 * \note class take ownership of wi don't delete.
 */
-void LFSTK_applicationClass::LFSTK_addWindow(windowInitStruct *wi,const char *name)
+void LFSTK_applicationClass::LFSTK_addWindow(windowInitStruct *wi,const char *name,const char *appname)
 {
 	windowInitStruct	*win;
 
@@ -204,6 +200,9 @@ void LFSTK_applicationClass::LFSTK_addWindow(windowInitStruct *wi,const char *na
 		}
 	else
 		win->windowName=name;
+	if(appname!=NULL)
+		win->appName=appname;
+	
 	this->windows->push_back({new LFSTK_windowClass(win,this),false,false});
 	if(this->windows->size()==1)
 		this->mainWindow=this->windows->back().window;
@@ -217,7 +216,7 @@ void LFSTK_applicationClass::LFSTK_addWindow(windowInitStruct *wi,const char *na
 * \note wi can be NULL, defaults are used.
 * \note class takes ownership of wi don't delete.
 */
-void LFSTK_applicationClass::LFSTK_addToolWindow(windowInitStruct *wi)
+void LFSTK_applicationClass::LFSTK_addToolWindow(windowInitStruct *wi,const char *appname)
 {
 	windowInitStruct	*win;
 
@@ -231,22 +230,13 @@ void LFSTK_applicationClass::LFSTK_addToolWindow(windowInitStruct *wi)
 			win=wi;
 		}
 
-	//win->windowName="";
-	//win->loadVars=true;
-	//win->windowType="_NET_WM_WINDOW_TYPE_DOCK";
-	//win->windowType=this->appAtomsHashed.at(this->globalLib->prefs.LFSTK_hashFromKey("_NET_WM_WINDOW_TYPE_DOCK"));
 	win->decorated=false;
 	win->overRide=true;
 	win->level=ABOVEALL;
-	this->windows->push_back({new LFSTK_toolWindowClass(win,this),false,false});
-	//LFSTK_toolWindowClass *tw=new LFSTK_toolWindowClass(win,this);
-//
-	//windowData wd;
+	if(appname!=NULL)
+		win->appName=appname;
 
-	//wd.window=tw;
-	//wd.loopFlag=false;
-	//wd.showing=false;
-	//this->windows->push_back(wd);
+	this->windows->push_back({new LFSTK_toolWindowClass(win,this),false,false});
 	delete win;
 }
 
diff --git a/LFSToolKit/LFSToolKit/lfstk/LFSTKApplication.h b/LFSToolKit/LFSToolKit/lfstk/LFSTKApplication.h
index 4ec181d..16b80b9 100644
--- a/LFSToolKit/LFSToolKit/lfstk/LFSTKApplication.h
+++ b/LFSToolKit/LFSToolKit/lfstk/LFSTKApplication.h
@@ -46,8 +46,8 @@ class LFSTK_applicationClass
 		LFSTK_applicationClass();
 		~LFSTK_applicationClass();
 
-		void						LFSTK_addWindow(windowInitStruct *wi,const char *name);
-		void						LFSTK_addToolWindow(windowInitStruct *wi);
+		void						LFSTK_addWindow(windowInitStruct *wi,const char *name,const char *appname=NULL);
+		void						LFSTK_addToolWindow(windowInitStruct *wi,const char *appname=NULL);
 		int						LFSTK_runApp(void);
 		int						LFSTK_runWindowLoop(int window);
 		int						LFSTK_runWindowLoop(LFSTK_windowClass *win);
diff --git a/LFSToolKit/LFSToolKit/lfstk/LFSTKFileDialog.cpp b/LFSToolKit/LFSToolKit/lfstk/LFSTKFileDialog.cpp
index 9d57b9a..e56a517 100644
--- a/LFSToolKit/LFSToolKit/lfstk/LFSTKFileDialog.cpp
+++ b/LFSToolKit/LFSToolKit/lfstk/LFSTKFileDialog.cpp
@@ -258,10 +258,11 @@ LFSTK_fileDialogClass::LFSTK_fileDialogClass(LFSTK_windowClass* parentwc,const c
 
 	windowInitStruct	*win;
 
-	win=new windowInitStruct;//TODO//
-	win->app=parentwc->app;
+	win=this->wc->app->LFSTK_getDefaultWInit();
+	//new windowInitStruct;//TODO//
+	//win->app=parentwc->app;
 	win->windowName=label;
-	win->loadVars=true;
+	//win->loadVars=true;
 	win->w=dwidth;
 	win->h=hite;
 	win->wc=parentwc;
diff --git a/LFSToolKit/LFSToolKit/resources/Defaults/0.Default/lfsdock.rc b/LFSToolKit/LFSToolKit/resources/Defaults/0.Default/lfsdock.rc
new file mode 100644
index 0000000..cca3caa
--- /dev/null
+++ b/LFSToolKit/LFSToolKit/resources/Defaults/0.Default/lfsdock.rc
@@ -0,0 +1,9 @@
+font Arial:size=12
+onmonitor 0
+panelgrav 2
+panelsize 2
+textcolour #FF000000
+gadgetsleft LCSDsssT
+termcommand kkterminal -m -l -e 
+panelbgcolour #00000000
+
diff --git a/LFSToolKit/LFSToolKit/resources/pixmaps/LFSTKApplication.png b/LFSToolKit/LFSToolKit/resources/pixmaps/LFSTKApplication.png
new file mode 100644
index 0000000..3d11c09
Binary files /dev/null and b/LFSToolKit/LFSToolKit/resources/pixmaps/LFSTKApplication.png differ
diff --git a/LFSToolKit/LFSToolKit/resources/pixmaps/LFSTKExample.png b/LFSToolKit/LFSToolKit/resources/pixmaps/LFSTKExample.png
new file mode 100644
index 0000000..ee9541b
Binary files /dev/null and b/LFSToolKit/LFSToolKit/resources/pixmaps/LFSTKExample.png differ
diff --git a/LFSToolKit/examples/RunExamples.cpp b/LFSToolKit/examples/RunExamples.cpp
index e3f56ab..6329e79 100755
--- a/LFSToolKit/examples/RunExamples.cpp
+++ b/LFSToolKit/examples/RunExamples.cpp
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
 	dbg="";
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 //	wc=new LFSTK_windowClass(0,0,DIALOGWIDTH,DIALOGHITE,"Gadgets",false);
diff --git a/LFSToolKit/examples/basic.cpp b/LFSToolKit/examples/basic.cpp
index 7d27b89..98b41d0 100755
--- a/LFSToolKit/examples/basic.cpp
+++ b/LFSToolKit/examples/basic.cpp
@@ -180,7 +180,7 @@ int main(int argc, char **argv)
 //apc->globalLib->LFSTK_setGlobalString(PRELIGHTCOLOUR,TYPEWINDOW,"blue");
 //apc->globalLib->LFSTK_setGlobalString(INACTIVECOLOUR,TYPEWINDOW,"yellow");
 
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 
 	wc=apc->mainWindow;
 
diff --git a/LFSToolKit/examples/colourchooser.cpp b/LFSToolKit/examples/colourchooser.cpp
index 94be56f..b8b3866 100755
--- a/LFSToolKit/examples/colourchooser.cpp
+++ b/LFSToolKit/examples/colourchooser.cpp
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
 		}
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSToolKit/examples/dialogs.cpp b/LFSToolKit/examples/dialogs.cpp
index bf45563..66f324a 100755
--- a/LFSToolKit/examples/dialogs.cpp
+++ b/LFSToolKit/examples/dialogs.cpp
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
 	int	sy=BORDER;
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSToolKit/examples/expander.cpp b/LFSToolKit/examples/expander.cpp
index 1bdf567..c58ae2d 100755
--- a/LFSToolKit/examples/expander.cpp
+++ b/LFSToolKit/examples/expander.cpp
@@ -55,7 +55,7 @@ int main(int argc, char **argv)
 	std::vector<hitRect>	hrs;
 	
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	multi=new LFSTK_ExpanderGadgetClass(wc,"",0,0,DIALOGWIDTH,GADGETHITE*3);
diff --git a/LFSToolKit/examples/fontdialog.cpp b/LFSToolKit/examples/fontdialog.cpp
index aa439dc..0f83979 100755
--- a/LFSToolKit/examples/fontdialog.cpp
+++ b/LFSToolKit/examples/fontdialog.cpp
@@ -23,11 +23,11 @@ LFSTK_fontDialogClass		*fontdialog=NULL;
 
 int main(int argc, char **argv)
 {
-	const fontDataStruct	*fd;
+	const fontDataStruct		*fd;
 	const char				*bools[]={"false","true"};
 	
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,NULL);
+	apc->LFSTK_addWindow(NULL,NULL,"LFSTKExample");//TODO//
 	wc=apc->mainWindow;
 
 	fontdialog=new LFSTK_fontDialogClass(wc,"Select Font",0,0,1,1,BUTTONGRAV);
diff --git a/LFSToolKit/examples/geticonpath.cpp b/LFSToolKit/examples/geticonpath.cpp
index 3579191..ad77aac 100755
--- a/LFSToolKit/examples/geticonpath.cpp
+++ b/LFSToolKit/examples/geticonpath.cpp
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
 	callbackStruct	cbs;
 	
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSToolKit/examples/image.cpp b/LFSToolKit/examples/image.cpp
index 09279f0..88b87e9 100755
--- a/LFSToolKit/examples/image.cpp
+++ b/LFSToolKit/examples/image.cpp
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
 
 	apc=new LFSTK_applicationClass();
 	apc->globalLib->LFSTK_setUseTheme(false);
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 	//wc->LFSTK_setTile(NULL,0);
 	wc->LFSTK_setWindowPixmap(apc->globalLib->LFSTK_getWindowPixmap(apc->display,apc->rootWindow),DIALOGWIDTH,sy);
diff --git a/LFSToolKit/examples/imagebutton.cpp b/LFSToolKit/examples/imagebutton.cpp
index e88d247..9718a93 100755
--- a/LFSToolKit/examples/imagebutton.cpp
+++ b/LFSToolKit/examples/imagebutton.cpp
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
 	int	sy=BORDER;
 		
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSToolKit/examples/lfsabout.cpp b/LFSToolKit/examples/lfsabout.cpp
index a5e74b5..49633ae 100755
--- a/LFSToolKit/examples/lfsabout.cpp
+++ b/LFSToolKit/examples/lfsabout.cpp
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 	int	dw=DIALOGWIDTH;
 		
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	tux=new LFSTK_imageClass(wc,NULL,DIALOGMIDDLE-(IMAGESIZE/2),sy,IMAGESIZE,IMAGESIZE,BUTTONGRAV,true);
diff --git a/LFSToolKit/examples/lfsruncommand.cpp b/LFSToolKit/examples/lfsruncommand.cpp
index ebf5680..4da8085 100755
--- a/LFSToolKit/examples/lfsruncommand.cpp
+++ b/LFSToolKit/examples/lfsruncommand.cpp
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
 	LFSTK_labelClass	*label;
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	label=new LFSTK_labelClass(wc,COPYRITE,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSToolKit/examples/lineedit.cpp b/LFSToolKit/examples/lineedit.cpp
index 9165e90..3464ee4 100755
--- a/LFSToolKit/examples/lineedit.cpp
+++ b/LFSToolKit/examples/lineedit.cpp
@@ -71,11 +71,11 @@ bool windowDrop(LFSTK_windowClass *lwc,void* ud)
 int main(int argc, char **argv)
 {
 	int							sy=BORDER;
-	std::vector<hitRect>		hrs;
+	std::vector<hitRect>			hrs;
 	LFSTK_ExpanderGadgetClass	*multi=NULL;
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	multi=new LFSTK_ExpanderGadgetClass(wc,"",0,0,DIALOGWIDTH,GADGETHITE*3);
diff --git a/LFSToolKit/examples/list.cpp b/LFSToolKit/examples/list.cpp
index c34609b..2715b37 100755
--- a/LFSToolKit/examples/list.cpp
+++ b/LFSToolKit/examples/list.cpp
@@ -61,10 +61,10 @@ bool select(void *object,void* userdata)
 int main(int argc, char **argv)
 {
 	int						sy=0;
-	std::vector<hitRect>	hrs;
+	std::vector<hitRect>		hrs;
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	multi=new LFSTK_ExpanderGadgetClass(wc,"",0,0,DIALOGWIDTH,GADGETHITE*3);
diff --git a/LFSToolKit/examples/menus.cpp b/LFSToolKit/examples/menus.cpp
index 18f061b..95c2c89 100755
--- a/LFSToolKit/examples/menus.cpp
+++ b/LFSToolKit/examples/menus.cpp
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
 	int	hsy;
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSToolKit/examples/multilineedit.cpp b/LFSToolKit/examples/multilineedit.cpp
index f469d2b..a096fe4 100755
--- a/LFSToolKit/examples/multilineedit.cpp
+++ b/LFSToolKit/examples/multilineedit.cpp
@@ -81,7 +81,7 @@ int main(int argc, char **argv)
 	int	sy=BORDER;
 	
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSToolKit/examples/scrollbar.cpp b/LFSToolKit/examples/scrollbar.cpp
index 034f0ea..94ffc56 100755
--- a/LFSToolKit/examples/scrollbar.cpp
+++ b/LFSToolKit/examples/scrollbar.cpp
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
 	int	sy=BORDER;
 		
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSToolKit/examples/subwindowtest.cpp b/LFSToolKit/examples/subwindowtest.cpp
index fb8257b..d67b8a0 100755
--- a/LFSToolKit/examples/subwindowtest.cpp
+++ b/LFSToolKit/examples/subwindowtest.cpp
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
 	LFSTK_buttonClass	*button=NULL;
 	
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 	wc->userData=USERDATA("Main Window");
 	//wc->LFSTK_setWindowColourName(NORMALCOLOUR,"#20ff0000");
diff --git a/LFSToolKit/examples/toggle.cpp b/LFSToolKit/examples/toggle.cpp
index 5c96080..7e06e6f 100755
--- a/LFSToolKit/examples/toggle.cpp
+++ b/LFSToolKit/examples/toggle.cpp
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
 	int	sy=BORDER;
 		
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 
 	label=new LFSTK_labelClass(wc,BOXLABEL,BORDER,sy,DIALOGWIDTH-BORDER-BORDER,GADGETHITE);
diff --git a/LFSToolKit/examples/window.cpp b/LFSToolKit/examples/window.cpp
index b5bdf7c..28a7e38 100755
--- a/LFSToolKit/examples/window.cpp
+++ b/LFSToolKit/examples/window.cpp
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
 	int	sy=0;
 
 	apc=new LFSTK_applicationClass();
-	apc->LFSTK_addWindow(NULL,BOXLABEL);
+	apc->LFSTK_addWindow(NULL,BOXLABEL,"LFSTKExample");
 	wc=apc->mainWindow;
 	wc->passEventToRoot=true;