diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index e311cf05c..808c7753f 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -45,7 +45,7 @@ QT4_WRAP_CPP(MOC_SRCS ${LAUNCHER_HEADER_MOC})
 include(${QT_USE_FILE})
 
 # Main executable
-add_executable(launcher
+add_executable(omwlauncher
     ${LAUNCHER}
     ${MISC} ${MISC_HEADER}
     ${FILES} ${FILES_HEADER}
@@ -55,11 +55,14 @@ add_executable(launcher
     ${MOC_SRCS}
 )
 
-target_link_libraries(launcher
+target_link_libraries(omwlauncher
     ${Boost_LIBRARIES}
     ${OGRE_LIBRARIES}
     ${QT_LIBRARIES}
 )
 
 configure_file(${CMAKE_SOURCE_DIR}/files/launcher.qss
-    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launcher.qss")
\ No newline at end of file
+    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launcher.qss")
+
+configure_file(${CMAKE_SOURCE_DIR}/files/launcher.cfg
+    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/launcher.cfg")
\ No newline at end of file
diff --git a/apps/launcher/launcher.pro b/apps/launcher/launcher.pro
index 5c05dcb90..f5a82a8dc 100644
--- a/apps/launcher/launcher.pro
+++ b/apps/launcher/launcher.pro
@@ -1,23 +1,30 @@
 ######################################################################
-# Automatically generated by qmake (2.01a) Tue Mar 29 22:56:27 2011
+# Automatically generated by qmake (2.01a) Fri Jun 24 21:14:15 2011
 ######################################################################
 
 TEMPLATE = app
-TARGET = 
+TARGET =
 DEPENDPATH += .
 INCLUDEPATH += .
 
 # Input
-HEADERS += datafilespage.hpp \
+HEADERS += combobox.hpp \
+           datafilespage.hpp \
+           graphicspage.hpp \
            lineedit.hpp \
            maindialog.hpp \
-           playpage.hpp
-
+           naturalsort.hpp \
+           playpage.hpp \
+           pluginsmodel.hpp \
+           pluginsview.hpp
 SOURCES += datafilespage.cpp \
+           graphicspage.cpp \
            lineedit.cpp \
+           main.cpp \
            maindialog.cpp \
-           playpage.cpp
-           qrc_resources.cxx
-
+           naturalsort.cpp \
+           playpage.cpp \
+           pluginsmodel.cpp \
+           pluginsview.cpp
 RESOURCES += resources.qrc
-RC_FILE = launcher.rc
+win32:RC_FILE = launcher.rc
\ No newline at end of file
diff --git a/apps/launcher/launcher.rc b/apps/launcher/launcher.rc
index c369a5b06..efe86e4da 100644
--- a/apps/launcher/launcher.rc
+++ b/apps/launcher/launcher.rc
@@ -1 +1 @@
-IDI_ICON1               ICON    DISCARDABLE     "resources/images/openmw-icon.ico" 
+IDI_ICON1               ICON    DISCARDABLE     "resources/images/openmw.ico"
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 19b6b6a6a..257b35cce 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -42,7 +42,7 @@ MainDialog::MainDialog()
 
 
     setWindowTitle(tr("OpenMW Launcher"));
-    setWindowIcon(QIcon(":/images/openmw-icon.png"));
+    setWindowIcon(QIcon(":/images/openmw.png"));
     // Remove what's this? button
     setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
     setMinimumSize(QSize(575, 575));
@@ -65,7 +65,7 @@ void MainDialog::createIcons()
     QIcon graphicsIcon = QIcon(":/icons/tango/video-display.png");
 
     QListWidgetItem *playButton = new QListWidgetItem(mIconWidget);
-    playButton->setIcon(QIcon(":/images/openmw-icon.png"));
+    playButton->setIcon(QIcon(":/images/openmw.png"));
     playButton->setText(tr("Play"));
     playButton->setTextAlignment(Qt::AlignCenter);
     playButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
@@ -77,7 +77,7 @@ void MainDialog::createIcons()
     graphicsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
     QListWidgetItem *dataFilesButton = new QListWidgetItem(mIconWidget);
-    dataFilesButton->setIcon(QIcon(":/images/openmw-plugin-icon.png"));
+    dataFilesButton->setIcon(QIcon(":/images/openmw-plugin.png"));
     dataFilesButton->setText(tr("Data Files"));
     dataFilesButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom);
     dataFilesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
diff --git a/apps/launcher/resources.qrc b/apps/launcher/resources.qrc
index e5b2f5ca7..2b56f80fd 100644
--- a/apps/launcher/resources.qrc
+++ b/apps/launcher/resources.qrc
@@ -2,8 +2,8 @@
 <qresource prefix="/images">
     <file alias="clear.png">resources/images/clear.png</file>
     <file alias="down.png">resources/images/down.png</file>
-    <file alias="openmw-icon.png">resources/images/openmw-icon.png</file>
-    <file alias="openmw-plugin-icon.png">resources/images/openmw-plugin-icon.png</file>
+    <file alias="openmw.png">resources/images/openmw.png</file>
+    <file alias="openmw-plugin.png">resources/images/openmw-plugin.png</file>
     <file alias="openmw-header.png">resources/images/openmw-header.png</file>
     <file alias="playpage-background.png">resources/images/playpage-background.png</file>
 </qresource>
diff --git a/apps/launcher/resources/images/openmw-plugin-icon.png b/apps/launcher/resources/images/openmw-plugin.png
similarity index 100%
rename from apps/launcher/resources/images/openmw-plugin-icon.png
rename to apps/launcher/resources/images/openmw-plugin.png
diff --git a/apps/launcher/resources/images/openmw-icon.ico b/apps/launcher/resources/images/openmw.ico
similarity index 100%
rename from apps/launcher/resources/images/openmw-icon.ico
rename to apps/launcher/resources/images/openmw.ico
diff --git a/apps/launcher/resources/images/openmw-icon.png b/apps/launcher/resources/images/openmw.png
similarity index 100%
rename from apps/launcher/resources/images/openmw-icon.png
rename to apps/launcher/resources/images/openmw.png
diff --git a/files/launcher.cfg b/files/launcher.cfg
new file mode 100644
index 000000000..bc0e2b7fb
--- /dev/null
+++ b/files/launcher.cfg
@@ -0,0 +1,5 @@
+[Profiles]
+CurrentProfile=Default
+Default\Master0=Morrowind.esm
+Default\Master1=Tribunal.esm
+Default\Master2=Bloodmoon.esm
diff --git a/files/openmw.desktop b/files/openmw.desktop
new file mode 100644
index 000000000..162a37dea
--- /dev/null
+++ b/files/openmw.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=0.11
+Type=Application
+Name=OpenMW Launcher
+GenericName=Role Playing Game
+Comment=An engine replacement for The Elder Scrolls III: Morrowind
+TryExec=omwlauncher
+Exec=omwlauncher
+Icon=openmw
+Categories=Game;RolePlaying;
\ No newline at end of file