diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp
index 374c8180c..045138ab7 100644
--- a/apps/wizard/installationpage.cpp
+++ b/apps/wizard/installationpage.cpp
@@ -45,8 +45,6 @@ void Wizard::InstallationPage::initializePage()
             installProgressBar->setMaximum(installProgressBar->maximum() + 100);
     }
 
-    installProgressBar->setValue(100);
-
     startInstallation();
 }
 
@@ -75,6 +73,9 @@ void Wizard::InstallationPage::startInstallation()
     connect(unshield, SIGNAL(finished()),
             this, SLOT(installationFinished()));
 
+    connect(unshield, SIGNAL(error(QString)),
+            this, SLOT(installationError(QString)));
+
     connect(unshield, SIGNAL(textChanged(QString)),
             installProgressLabel, SLOT(setText(QString)));
 
@@ -135,6 +136,12 @@ void Wizard::InstallationPage::installationFinished()
     qDebug() << "finished!";
     mFinished = true;
     emit completeChanged();
+
+}
+
+void Wizard::InstallationPage::installationError(const QString &text)
+{
+    qDebug() << "error: " << text;
 }
 
 bool Wizard::InstallationPage::isComplete() const
diff --git a/apps/wizard/installationpage.hpp b/apps/wizard/installationpage.hpp
index 42b2be819..f55ab8ab5 100644
--- a/apps/wizard/installationpage.hpp
+++ b/apps/wizard/installationpage.hpp
@@ -28,6 +28,7 @@ namespace Wizard
 
     private slots:
         void installationFinished();
+        void installationError(const QString &text);
 
     protected:
         void initializePage();
diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index 71beaf9b8..4f92b1cf9 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -29,6 +29,10 @@ Wizard::UnshieldWorker::UnshieldWorker(QObject *parent) :
     mInstallMorrowind = false;
     mInstallTribunal = false;
     mInstallBloodmoon = false;
+
+    mMorrowindDone = false;
+    mTribunalDone = false;
+    mBloodmoonDone = false;
 }
 
 Wizard::UnshieldWorker::~UnshieldWorker()
@@ -119,25 +123,30 @@ bool Wizard::UnshieldWorker::removeDirectory(const QString &dirName)
     return result;
 }
 
-bool Wizard::UnshieldWorker::moveFile(const QString &source, const QString &destination)
+bool Wizard::UnshieldWorker::copyFile(const QString &source, const QString &destination, bool keepSource)
 {
     QDir dir;
     QFile file;
 
-    if (dir.rename(source, destination)) {
-        return true;
-    } else {
-        if (file.copy(source, destination)) {
+    QFileInfo info(destination);
+
+    if (info.exists())
+        dir.remove(info.absoluteFilePath());
+
+    if (file.copy(source, destination)) {
+        if (!keepSource) {
             return file.remove(source);
         } else {
-            qDebug() << "copy failed! " << file.errorString();
+            return true;
         }
+    } else {
+        qDebug() << "copy failed! " << file.errorString();
     }
 
     return false;
 }
 
-bool Wizard::UnshieldWorker::moveDirectory(const QString &source, const QString &destination)
+bool Wizard::UnshieldWorker::copyDirectory(const QString &source, const QString &destination, bool keepSource)
 {
     QDir sourceDir(source);
     QDir destDir(destination);
@@ -170,127 +179,217 @@ bool Wizard::UnshieldWorker::moveDirectory(const QString &source, const QString
 
             result = moveFile(info.absoluteFilePath(), destDir.absolutePath() + relativePath);
         }
-
-        //if (!result)
-        //    return result;
     }
 
-    return result && removeDirectory(sourceDir.absolutePath());
+    if (!keepSource)
+        return result && removeDirectory(sourceDir.absolutePath());
+
+    return result;
 }
 
-void Wizard::UnshieldWorker::extract()
+bool Wizard::UnshieldWorker::moveFile(const QString &source, const QString &destination)
 {
-    emit textChanged(QLatin1String("Starting installation"));
-    emit textChanged(QLatin1String("Installation target: ") + mPath);
+    return copyFile(source, destination, false);
+}
 
-    QStringList components;
-    if (mInstallMorrowind)
-        components << QLatin1String("Morrowind");
+bool Wizard::UnshieldWorker::moveDirectory(const QString &source, const QString &destination)
+{
+    return copyDirectory(source, destination, false);
+}
 
-    if (mInstallTribunal)
-        components << QLatin1String("Tribunal");
+void Wizard::UnshieldWorker::installDirectories(const QString &source)
+{
+    QDir dir(source);
 
-    if (mInstallBloodmoon)
-        components << QLatin1String("Bloodmoon");
+    if (!dir.exists())
+        return;
 
-    emit textChanged(QLatin1String("Components: ") + components.join(QLatin1String(", ")));
+    QStringList directories;
+    directories << QLatin1String("Fonts")
+                << QLatin1String("Music")
+                << QLatin1String("Sound")
+                << QLatin1String("Splash")
+                << QLatin1String("Video");
+
+    QFileInfoList list(dir.entryInfoList(QDir::NoDotAndDotDot |
+                                          QDir::System | QDir::Hidden |
+                                          QDir::AllDirs));
+    foreach(QFileInfo info, list) {
+        if (info.isSymLink())
+            continue;
 
-    emit textChanged(QLatin1String("Updating Morrowind.ini: ") + mIniPath);
+        if (directories.contains(info.fileName())) {
+            qDebug() << "found " << info.fileName();
+            emit textChanged(tr("Extracting: %1 directory").arg(info.fileName()));
+            copyDirectory(info.absoluteFilePath(), mPath + QDir::separator() + info.fileName());
+        }
+    }
+}
 
-    //emit progressChanged(45);
+void Wizard::UnshieldWorker::extract()
+{
+    emit textChanged(QLatin1String("Starting installation"));
+    emit textChanged(QLatin1String("Installation target: ") + mPath);
 
-    ///
-//    bfs::path outputDataFilesDir = mOutputPath;
-//    outputDataFilesDir /= "Data Files";
-//    bfs::path extractPath = mOutputPath;
-//    extractPath /= "extract-temp";
+    QString diskPath("/mnt/cdrom/");
+    QDir disk(diskPath);
 
     // Create temporary extract directory
     // TODO: Use QTemporaryDir in Qt 5.0
-    QString tempPath(mPath + QLatin1String("/extract-temp"));
-    QDir dir;
-    dir.mkpath(tempPath);
+    QString tempPath(mPath + QDir::separator() + QLatin1String("extract-temp"));
+    QDir temp;
+
+    // Make sure the temporary folder is empty
+    removeDirectory(tempPath);
+
+    if (!temp.mkpath(tempPath)) {
+        qDebug() << "Can't make path";
+        return;
+    }
+
+    temp.setPath(tempPath);
+    disk.setPath(diskPath);
 
     if (mInstallMorrowind)
     {
-        QString morrowindTempPath(tempPath + QLatin1String("/morrowind"));
-        QString morrowindCab(QLatin1String("/mnt/cdrom/data1.hdr"));
+        emit textChanged(QLatin1String("Installing Morrowind\n"));
 
-        //extractCab(morrowindCab, morrowindTempPath);
+        if (!temp.mkdir(QLatin1String("morrowind"))) {
+            qDebug() << "Can't make dir";
+            return;
+        }
+
+        if (!temp.cd(QLatin1String("morrowind"))) {
+            qDebug() << "Can't cd to dir";
+            return;
+        }
+
+        if (!disk.exists(QLatin1String("data1.hdr"))) {
+            qDebug() << "No data found!";
+            return;
+        }
+
+        // Extract the installation files
+        extractCab(disk.absoluteFilePath(QLatin1String("data1.hdr")), temp.absolutePath());
 
         // TODO: Throw error;
         // Move the files from the temporary path to the destination folder
 
         //qDebug() << "rename: " << morrowindTempPath << " to: " << mPath;
-        morrowindTempPath.append(QDir::separator() + QLatin1String("Data Files"));
-//        if (!moveDirectory(morrowindTempPath, mPath))
-//            qDebug() << "failed!";
+        if (!moveDirectory(temp.absoluteFilePath(QLatin1String("Data Files")), mPath))
+            qDebug() << "failed!";
 
-        QDir sourceDir(QLatin1String("/mnt/cdrom/"));
-        QStringList directories;
-        directories << QLatin1String("Fonts")
-                    << QLatin1String("Music")
-                    << QLatin1String("Sound")
-                    << QLatin1String("Splash")
-                    << QLatin1String("Video");
+        // Install files outside of cab archives
+        qDebug() << temp.absolutePath() << disk.absolutePath();
+        installDirectories(disk.absolutePath());
 
-        QFileInfoList list(sourceDir.entryInfoList(QDir::NoDotAndDotDot |
-                                                   QDir::System | QDir::Hidden |
-                                                   QDir::AllDirs));
+        // Copy Morrowind configuration file
+        QString iniPath(temp.absoluteFilePath(QLatin1String("App Executables")));
+        iniPath.append(QDir::separator() + QLatin1String("Morrowind.ini"));
 
+        QFileInfo info(iniPath);
 
-        foreach(QFileInfo info, list) {
-            if (info.isSymLink())
-                continue;
+        qDebug() << info.absoluteFilePath() << mPath;
+
+        if (info.exists()) {
+            emit textChanged(tr("Extracting: Morrowind.ini"));
+            moveFile(info.absoluteFilePath(), mPath + QDir::separator() + QLatin1String("Morrowind.ini"));
+        } else {
+            qDebug() << "Could not find ini file!";
+        }
+
+        mMorrowindDone = true;
+
+    }
+
+    temp.setPath(tempPath);
+    disk.setPath(diskPath);
+
+    if (mInstallTribunal)
+    {
+        emit textChanged(QLatin1String("Installing Tribunal\n"));
+
+        if (!temp.mkdir(QLatin1String("tribunal"))) {
+            qDebug() << "Can't make dir";
+            return;
+        }
 
-            qDebug() << "not found " << info.fileName();
+        if (!temp.cd(QLatin1String("tribunal"))) {
+            qDebug() << "Can't cd to dir";
+            return;
+        }
+
+        if (!disk.cd(QLatin1String("Tribunal")))
+            qDebug() << "Show file selector";
 
-            if (directories.contains(info.fileName()))
-                qDebug() << "found " << info.fileName();
-//                copyDirectory(info.absoluteFilePath(), mPath);
+        if (!disk.exists(QLatin1String("data1.hdr"))) {
+            qDebug() << "No data found!";
+            return;
         }
 
+        // Extract the installation files
+        extractCab(disk.absoluteFilePath(QLatin1String("data1.hdr")), temp.absolutePath());
+
+        if (!moveDirectory(temp.absoluteFilePath(QLatin1String("Data Files")), mPath))
+            qDebug() << "failed!";
+
+        // Install files outside of cab archives
+        installDirectories(disk.absolutePath());
+
+        mTribunalDone = true;
     }
 
-//    if(!mMorrowindDone && mMorrowindPath.string().length() > 0)
-//    {
-//        mMorrowindDone = true;
+    temp.setPath(tempPath);
+    disk.setPath(diskPath);
 
-//        bfs::path mwExtractPath = extractPath / "morrowind";
-//        extract_cab(mMorrowindPath, mwExtractPath, true);
+    if (mInstallBloodmoon)
+    {
+        emit textChanged(QLatin1String("Installing Bloodmoon\n"));
 
-//        bfs::path dFilesDir = findFile(mwExtractPath, "morrowind.esm").parent_path();
+        if (!temp.mkdir(QLatin1String("bloodmoon"))) {
+            qDebug() << "Can't make dir";
+            return;
+        }
 
-//        installToPath(dFilesDir, outputDataFilesDir);
+        if (!temp.cd(QLatin1String("bloodmoon"))) {
+            qDebug() << "Can't cd to dir";
+            return;
+        }
 
-//        install_dfiles_outside(mwExtractPath, outputDataFilesDir);
+        if (!disk.cd(QLatin1String("Bloodmoon")))
+            qDebug() << "Show file selector";
 
-//        // Videos are often kept uncompressed on the cd
-//        bfs::path videosPath = findFile(mMorrowindPath.parent_path(), "video", false);
-//        if(videosPath.string() != "")
-//        {
-//            emit signalGUI(QString("Installing Videos..."));
-//            installToPath(videosPath, outputDataFilesDir / "Video", true);
-//        }
+        if (!disk.exists(QLatin1String("data1.hdr"))) {
+            qDebug() << "No data found!";
+            return;
+        }
 
-//        bfs::path cdDFiles = findFile(mMorrowindPath.parent_path(), "data files", false);
-//        if(cdDFiles.string() != "")
-//        {
-//            emit signalGUI(QString("Installing Uncompressed Data files from CD..."));
-//            installToPath(cdDFiles, outputDataFilesDir, true);
-//        }
+        // Extract the installation files
+        extractCab(disk.absoluteFilePath(QLatin1String("data1.hdr")), temp.absolutePath());
 
+        if (!moveDirectory(temp.absoluteFilePath(QLatin1String("Data Files")), mPath))
+            qDebug() << "failed!";
 
-//        bfs::rename(findFile(mwExtractPath, "morrowind.ini"), outputDataFilesDir / "Morrowind.ini");
+        // Install files outside of cab archives
+        installDirectories(disk.absolutePath());
 
-//        mTribunalDone = contains(outputDataFilesDir, "tribunal.esm");
-//        mBloodmoonDone = contains(outputDataFilesDir, "bloodmoon.esm");
+        mBloodmoonDone = true;
+    }
 
-//    }
 
+    int total = 0;
 
+    if (mInstallMorrowind)
+        total = 100;
 
-    ///
+    if (mInstallTribunal)
+        total = total + 100;
+
+    if (mInstallBloodmoon)
+        total = total + 100;
+
+    emit textChanged(tr("Installation finished!"));
+    emit progressChanged(total);
     emit finished();
 
 }
@@ -322,17 +421,25 @@ bool Wizard::UnshieldWorker::extractFile(Unshield *unshield, const QString &outp
     fileName.append(QString::fromLatin1(unshield_file_name(unshield, index)));
 
     // Calculate the percentage done
-    int progress = qCeil(((float) counter / (float) unshield_file_count(unshield)) * 100);
+    int progress = qFloor(((float) counter / (float) unshield_file_count(unshield)) * 100);
+
+    if (mMorrowindDone)
+        progress = progress + 100;
+
+    if (mTribunalDone)
+        progress = progress + 100;
 
     qDebug() << progress << counter << unshield_file_count(unshield);
 
-    emit textChanged(QLatin1String("Extracting: ") + QString::fromLatin1(unshield_file_name(unshield, index)));
+    emit textChanged(tr("Extracting: %1").arg(QString::fromLatin1(unshield_file_name(unshield, index))));
     emit progressChanged(progress);
 
     success = unshield_file_save(unshield, index, fileName.toLatin1().constData());
 
-    if (!success)
+    if (!success) {
+        emit error(tr("Failed to extract %1").arg(fileName));
         dir.remove(fileName);
+    }
 
     return success;
 }
diff --git a/apps/wizard/unshield/unshieldworker.hpp b/apps/wizard/unshield/unshieldworker.hpp
index 61e021865..b268727ce 100644
--- a/apps/wizard/unshield/unshieldworker.hpp
+++ b/apps/wizard/unshield/unshieldworker.hpp
@@ -31,6 +31,9 @@ namespace Wizard
 
         bool removeDirectory(const QString &dirName);
 
+        bool copyFile(const QString &source, const QString &destination, bool keepSource = true);
+        bool copyDirectory(const QString &source, const QString &destination, bool keepSource = true);
+
         bool moveFile(const QString &source, const QString &destination);
         bool moveDirectory(const QString &source, const QString &destination);
 
@@ -39,11 +42,17 @@ namespace Wizard
         void extractCab(const QString &cabFile, const QString &outputDir);
         bool extractFile(Unshield *unshield, const QString &outputDir, const QString &prefix, int index, int counter);
 
+        void installDirectories(const QString &source);
+
 
         bool mInstallMorrowind;
         bool mInstallTribunal;
         bool mInstallBloodmoon;
 
+        bool mMorrowindDone;
+        bool mTribunalDone;
+        bool mBloodmoonDone;
+
         QString mPath;
         QString mIniPath;
 
@@ -58,6 +67,8 @@ namespace Wizard
     signals:
         void finished();
         void textChanged(const QString &text);
+        void logTextChanged(const QString &text);
+
         void error(const QString &text);
         void progressChanged(int progress);
 
diff --git a/files/ui/wizard/installationpage.ui b/files/ui/wizard/installationpage.ui
index 6c1a3c493..664e10556 100644
--- a/files/ui/wizard/installationpage.ui
+++ b/files/ui/wizard/installationpage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>516</width>
-    <height>421</height>
+    <width>514</width>
+    <height>419</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -30,7 +30,7 @@
    <item>
     <widget class="QProgressBar" name="installProgressBar">
      <property name="value">
-      <number>24</number>
+      <number>0</number>
      </property>
     </widget>
    </item>