diff --git a/CMakeLists.txt b/CMakeLists.txt
index 208bddf33..5a923c631 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -600,11 +600,6 @@ if (BUILD_OPENCS)
 endif()
 
 if (BUILD_WIZARD)
-    find_package(LIBUNSHIELD REQUIRED)
-    if(NOT LIBUNSHIELD_FOUND)
-        message(FATAL_ERROR "Failed to find Unshield library")
-    endif(NOT LIBUNSHIELD_FOUND)
-
    add_subdirectory(apps/wizard)
 endif()
 
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 17951f2e4..f45b44470 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -137,6 +137,7 @@ void Launcher::DataFilesPage::saveSettings(const QString &profile)
 void Launcher::DataFilesPage::removeProfile(const QString &profile)
 {
     mLauncherSettings.remove(QString("Profiles/") + profile);
+    mLauncherSettings.remove(QString("Profiles/") + profile + QString("/content"));
 }
 
 QAbstractItemModel *Launcher::DataFilesPage::profilesModel() const
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index ff38eca0b..d22309007 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -11,7 +11,7 @@ opencs_units (model/doc
     )
 
 opencs_units_noqt (model/doc
-    stage savingstate savingstages blacklist
+    stage savingstate savingstages blacklist messages
     )
 
 opencs_hdrs_noqt (model/doc
@@ -68,11 +68,12 @@ opencs_units (view/world
 
 opencs_units_noqt (view/world
     subviews enumdelegate vartypedelegate recordstatusdelegate idtypedelegate datadisplaydelegate
-    scripthighlighter idvalidator dialoguecreator physicssystem physicsmanager
+    scripthighlighter idvalidator dialoguecreator physicssystem
     )
 
 opencs_units (view/widget
     scenetoolbar scenetool scenetoolmode pushbutton scenetooltoggle scenetoolrun modebutton
+    scenetooltoggle2
     )
 
 opencs_units (view/render
@@ -92,7 +93,7 @@ opencs_hdrs_noqt (view/render
 
 
 opencs_units (view/tools
-    reportsubview
+    reportsubview reporttable
     )
 
 opencs_units_noqt (view/tools
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 75546d07b..9849608c4 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -1,6 +1,8 @@
 
 #include "editor.hpp"
 
+#include <openengine/bullet/BulletShapeLoader.h>
+
 #include <QApplication>
 #include <QLocalServer>
 #include <QLocalSocket>
@@ -21,8 +23,8 @@
 
 CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
 : mUserSettings (mCfgMgr), mOverlaySystem (0), mDocumentManager (mCfgMgr),
-  mViewManager (mDocumentManager), mPhysicsManager (0),
-  mIpcServerName ("org.openmw.OpenCS"), mServer(NULL), mClientSocket(NULL)
+  mViewManager (mDocumentManager),
+  mIpcServerName ("org.openmw.OpenCS"), mServer(NULL), mClientSocket(NULL), mPid(""), mLock()
 {
     std::pair<Files::PathContainer, std::vector<std::string> > config = readConfig();
 
@@ -34,7 +36,6 @@ CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
     ogreInit.init ((mCfgMgr.getUserConfigPath() / "opencsOgre.log").string());
 
     mOverlaySystem.reset (new CSVRender::OverlaySystem);
-    mPhysicsManager.reset (new CSVWorld::PhysicsManager);
 
     Bsa::registerResources (Files::Collections (config.first, !mFsStrict), config.second, true,
         mFsStrict);
@@ -70,7 +71,15 @@ CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
 }
 
 CS::Editor::~Editor ()
-{}
+{
+    mPidFile.close();
+
+    if(mServer && boost::filesystem::exists(mPid))
+        remove(mPid.string().c_str()); // ignore any error
+
+    // cleanup global resources used by OEngine
+    delete OEngine::Physic::BulletShapeManager::getSingletonPtr();
+}
 
 void CS::Editor::setupDataFiles (const Files::PathContainer& dataDirs)
 {
@@ -233,7 +242,53 @@ void CS::Editor::showSettings()
 
 bool CS::Editor::makeIPCServer()
 {
-    mServer = new QLocalServer(this);
+    try
+    {
+        mPid = boost::filesystem::temp_directory_path();
+        mPid /= "opencs.pid";
+        bool pidExists = boost::filesystem::exists(mPid);
+
+        mPidFile.open(mPid);
+
+        mLock = boost::interprocess::file_lock(mPid.string().c_str());
+        if(!mLock.try_lock())
+        {
+            std::cerr << "OpenCS already running."  << std::endl;
+            return false;
+        }
+
+#ifdef _WIN32
+        mPidFile << GetCurrentProcessId() << std::endl;
+#else
+        mPidFile << getpid() << std::endl;
+#endif
+
+        mServer = new QLocalServer(this);
+
+        if(pidExists)
+        {
+            // hack to get the temp directory path
+            mServer->listen("dummy");
+            QString fullPath = mServer->fullServerName();
+            mServer->close();
+            fullPath.remove(QRegExp("dummy$"));
+            fullPath += mIpcServerName;
+            if(boost::filesystem::exists(fullPath.toStdString().c_str()))
+            {
+                // TODO: compare pid of the current process with that in the file
+                std::cout << "Detected unclean shutdown." << std::endl;
+                // delete the stale file
+                if(remove(fullPath.toStdString().c_str()))
+                    std::cerr << "ERROR removing stale connection file" << std::endl;
+            }
+        }
+    }
+
+    catch(const std::exception& e)
+    {
+        std::cerr << "ERROR " << e.what() << std::endl;
+        return false;
+    }
 
     if(mServer->listen(mIpcServerName))
     {
@@ -242,6 +297,7 @@ bool CS::Editor::makeIPCServer()
     }
 
     mServer->close();
+    mServer = NULL;
     return false;
 }
 
diff --git a/apps/opencs/editor.hpp b/apps/opencs/editor.hpp
index d55b0e873..273f0825b 100644
--- a/apps/opencs/editor.hpp
+++ b/apps/opencs/editor.hpp
@@ -3,6 +3,9 @@
 
 #include <memory>
 
+#include <boost/interprocess/sync/file_lock.hpp>
+#include <boost/filesystem/fstream.hpp>
+
 #include <QObject>
 #include <QString>
 #include <QLocalServer>
@@ -28,7 +31,6 @@
 
 #include "view/settings/dialog.hpp"
 #include "view/render/overlaysystem.hpp"
-#include "view/world/physicsmanager.hpp"
 
 namespace OgreInit
 {
@@ -45,7 +47,6 @@ namespace CS
             Files::ConfigurationManager mCfgMgr;
             CSMSettings::UserSettings mUserSettings;
             std::auto_ptr<CSVRender::OverlaySystem> mOverlaySystem;
-            std::auto_ptr<CSVWorld::PhysicsManager> mPhysicsManager;
             CSMDoc::DocumentManager mDocumentManager;
             CSVDoc::ViewManager mViewManager;
             CSVDoc::StartupDialogue mStartup;
@@ -54,6 +55,9 @@ namespace CS
             CSVDoc::FileDialog mFileDialog;
             boost::filesystem::path mLocal;
             boost::filesystem::path mResources;
+            boost::filesystem::path mPid;
+            boost::interprocess::file_lock mLock;
+            boost::filesystem::ofstream mPidFile;
             bool mFsStrict;
 
             void setupDataFiles (const Files::PathContainer& dataDirs);
diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
index b184a1ef1..dd20324d1 100644
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
     if(!editor.makeIPCServer())
     {
         editor.connectToIPCServer();
-       // return 0;
+        return 0;
     }
 
     shinyFactory = editor.setupGraphics();
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 4fdfd2e5e..e688a9474 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -9,6 +9,8 @@
 #include <components/files/configurationmanager.hpp>
 #endif
 
+#include "../../view/world/physicssystem.hpp"
+
 void CSMDoc::Document::addGmsts()
 {
     static const char *gmstFloats[] =
@@ -2253,7 +2255,7 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
   mProjectPath ((configuration.getUserDataPath() / "projects") /
   (savePath.filename().string() + ".project")),
   mSaving (*this, mProjectPath, encoding),
-  mRunner (mProjectPath)
+  mRunner (mProjectPath), mPhysics(boost::shared_ptr<CSVWorld::PhysicsSystem>())
 {
     if (mContentFiles.empty())
         throw std::runtime_error ("Empty content file sequence");
@@ -2299,8 +2301,8 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
     connect (&mSaving, SIGNAL (done (int, bool)), this, SLOT (operationDone (int, bool)));
 
     connect (
-        &mSaving, SIGNAL (reportMessage (const CSMWorld::UniversalId&, const std::string&, int)),
-        this, SLOT (reportMessage (const CSMWorld::UniversalId&, const std::string&, int)));
+        &mSaving, SIGNAL (reportMessage (const CSMWorld::UniversalId&, const std::string&, const std::string&, int)),
+        this, SLOT (reportMessage (const CSMWorld::UniversalId&, const std::string&, const std::string&, int)));
 
     connect (&mRunner, SIGNAL (runStateChanged()), this, SLOT (runStateChanged()));
 }
@@ -2385,7 +2387,7 @@ void CSMDoc::Document::modificationStateChanged (bool clean)
 }
 
 void CSMDoc::Document::reportMessage (const CSMWorld::UniversalId& id, const std::string& message,
-    int type)
+    const std::string& hint, int type)
 {
     /// \todo find a better way to get these messages to the user.
     std::cout << message << std::endl;
@@ -2464,3 +2466,11 @@ void CSMDoc::Document::progress (int current, int max, int type)
 {
     emit progress (current, max, type, 1, this);
 }
+
+boost::shared_ptr<CSVWorld::PhysicsSystem> CSMDoc::Document::getPhysics ()
+{
+    if(!mPhysics)
+        mPhysics = boost::shared_ptr<CSVWorld::PhysicsSystem> (new CSVWorld::PhysicsSystem());
+
+    return mPhysics;
+}
diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp
index c5f6d1006..f3aef6db6 100644
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 
+#include <boost/shared_ptr.hpp>
 #include <boost/filesystem/path.hpp>
 
 #include <QUndoStack>
@@ -39,6 +40,11 @@ namespace CSMWorld
     class ResourcesManager;
 }
 
+namespace CSVWorld
+{
+    class PhysicsSystem;
+}
+
 namespace CSMDoc
 {
     class Document : public QObject
@@ -57,6 +63,7 @@ namespace CSMDoc
             boost::filesystem::path mResDir;
             Blacklist mBlacklist;
             Runner mRunner;
+            boost::shared_ptr<CSVWorld::PhysicsSystem> mPhysics;
 
             // It is important that the undo stack is declared last, because on desctruction it fires a signal, that is connected to a slot, that is
             // using other member variables.  Unfortunately this connection is cut only in the QObject destructor, which is way too late.
@@ -129,6 +136,8 @@ namespace CSMDoc
 
             QTextDocument *getRunLog();
 
+            boost::shared_ptr<CSVWorld::PhysicsSystem> getPhysics();
+
         signals:
 
             void stateChanged (int state, CSMDoc::Document *document);
@@ -140,7 +149,7 @@ namespace CSMDoc
             void modificationStateChanged (bool clean);
 
             void reportMessage (const CSMWorld::UniversalId& id, const std::string& message,
-                int type);
+                const std::string& hint, int type);
 
             void operationDone (int type, bool failed);
 
diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
index 712deb9df..43f3b850e 100644
--- a/apps/opencs/model/doc/loader.cpp
+++ b/apps/opencs/model/doc/loader.cpp
@@ -52,7 +52,7 @@ void CSMDoc::Loader::load()
     {
         if (iter->second.mRecordsLeft)
         {
-            CSMDoc::Stage::Messages messages;
+            CSMDoc::Messages messages;
             for (int i=0; i<batchingSize; ++i) // do not flood the system with update signals
                 if (document->getData().continueLoading (messages))
                 {
@@ -65,11 +65,11 @@ void CSMDoc::Loader::load()
             CSMWorld::UniversalId log (CSMWorld::UniversalId::Type_LoadErrorLog, 0);
 
             { // silence a g++ warning
-            for (CSMDoc::Stage::Messages::const_iterator iter (messages.begin());
+            for (CSMDoc::Messages::Iterator iter (messages.begin());
                 iter!=messages.end(); ++iter)
             {
-                document->getReport (log)->add (iter->first, iter->second);
-                emit loadMessage (document, iter->second);
+                document->getReport (log)->add (iter->mId, iter->mMessage);
+                emit loadMessage (document, iter->mMessage);
             }
             }
 
diff --git a/apps/opencs/model/doc/messages.cpp b/apps/opencs/model/doc/messages.cpp
new file mode 100644
index 000000000..1fb423145
--- /dev/null
+++ b/apps/opencs/model/doc/messages.cpp
@@ -0,0 +1,28 @@
+
+#include "messages.hpp"
+
+void CSMDoc::Messages::add (const CSMWorld::UniversalId& id, const std::string& message,
+    const std::string& hint)
+{
+    Message data;
+    data.mId = id;
+    data.mMessage = message;
+    data.mHint = hint;
+
+    mMessages.push_back (data);
+}
+
+void CSMDoc::Messages::push_back (const std::pair<CSMWorld::UniversalId, std::string>& data)
+{
+    add (data.first, data.second);
+}
+
+CSMDoc::Messages::Iterator CSMDoc::Messages::begin() const
+{
+    return mMessages.begin();
+}
+
+CSMDoc::Messages::Iterator CSMDoc::Messages::end() const
+{
+    return mMessages.end();
+}
\ No newline at end of file
diff --git a/apps/opencs/model/doc/messages.hpp b/apps/opencs/model/doc/messages.hpp
new file mode 100644
index 000000000..0f36c73a7
--- /dev/null
+++ b/apps/opencs/model/doc/messages.hpp
@@ -0,0 +1,44 @@
+#ifndef CSM_DOC_MESSAGES_H
+#define CSM_DOC_MESSAGES_H
+
+#include <string>
+#include <vector>
+
+#include "../world/universalid.hpp"
+
+namespace CSMDoc
+{
+    class Messages
+    {
+        public:
+
+            struct Message
+            {
+                CSMWorld::UniversalId mId;
+                std::string mMessage;
+                std::string mHint;
+            };
+
+            typedef std::vector<Message> Collection;
+
+            typedef Collection::const_iterator Iterator;
+
+        private:
+
+            Collection mMessages;
+
+        public:
+
+            void add (const CSMWorld::UniversalId& id, const std::string& message,
+                const std::string& hint = "");
+
+            /// \deprecated Use add instead.
+            void push_back (const std::pair<CSMWorld::UniversalId, std::string>& data);
+
+            Iterator begin() const;
+
+            Iterator end() const;
+    };
+}
+
+#endif
diff --git a/apps/opencs/model/doc/operation.cpp b/apps/opencs/model/doc/operation.cpp
index 7f77e8ac9..e728050f4 100644
--- a/apps/opencs/model/doc/operation.cpp
+++ b/apps/opencs/model/doc/operation.cpp
@@ -84,7 +84,7 @@ void CSMDoc::Operation::abort()
 
 void CSMDoc::Operation::executeStage()
 {
-    Stage::Messages messages;
+    Messages messages;
 
     while (mCurrentStage!=mStages.end())
     {
@@ -101,7 +101,7 @@ void CSMDoc::Operation::executeStage()
             }
             catch (const std::exception& e)
             {
-                emit reportMessage (CSMWorld::UniversalId(), e.what(), mType);
+                emit reportMessage (CSMWorld::UniversalId(), e.what(), "", mType);
                 abort();
             }
 
@@ -112,8 +112,8 @@ void CSMDoc::Operation::executeStage()
 
     emit progress (mCurrentStepTotal, mTotalSteps ? mTotalSteps : 1, mType);
 
-    for (Stage::Messages::const_iterator iter (messages.begin()); iter!=messages.end(); ++iter)
-        emit reportMessage (iter->first, iter->second, mType);
+    for (Messages::Iterator iter (messages.begin()); iter!=messages.end(); ++iter)
+        emit reportMessage (iter->mId, iter->mMessage, iter->mHint, mType);
 
     if (mCurrentStage==mStages.end())
         exit();
diff --git a/apps/opencs/model/doc/operation.hpp b/apps/opencs/model/doc/operation.hpp
index d5a7d4e09..3c9467754 100644
--- a/apps/opencs/model/doc/operation.hpp
+++ b/apps/opencs/model/doc/operation.hpp
@@ -52,7 +52,7 @@ namespace CSMDoc
             void progress (int current, int max, int type);
 
             void reportMessage (const CSMWorld::UniversalId& id, const std::string& message,
-                int type);
+                const std::string& hint, int type);
 
             void done (int type, bool failed);
 
diff --git a/apps/opencs/model/doc/stage.hpp b/apps/opencs/model/doc/stage.hpp
index ca34c2229..126823ae9 100644
--- a/apps/opencs/model/doc/stage.hpp
+++ b/apps/opencs/model/doc/stage.hpp
@@ -6,14 +6,14 @@
 
 #include "../world/universalid.hpp"
 
+#include "messages.hpp"
+
 namespace CSMDoc
 {
     class Stage
     {
         public:
 
-            typedef std::vector<std::pair<CSMWorld::UniversalId, std::string> > Messages;
-
             virtual ~Stage();
 
             virtual int setup() = 0;
diff --git a/apps/opencs/model/tools/birthsigncheck.cpp b/apps/opencs/model/tools/birthsigncheck.cpp
index db20ce4bc..1d72e24b8 100644
--- a/apps/opencs/model/tools/birthsigncheck.cpp
+++ b/apps/opencs/model/tools/birthsigncheck.cpp
@@ -17,7 +17,7 @@ int CSMTools::BirthsignCheckStage::setup()
     return mBirthsigns.getSize();
 }
 
-void CSMTools::BirthsignCheckStage::perform (int stage, Messages& messages)
+void CSMTools::BirthsignCheckStage::perform (int stage, CSMDoc::Messages& messages)
 {
     const CSMWorld::Record<ESM::BirthSign>& record = mBirthsigns.getRecord (stage);
 
diff --git a/apps/opencs/model/tools/birthsigncheck.hpp b/apps/opencs/model/tools/birthsigncheck.hpp
index 1030e5c02..16d4c666f 100644
--- a/apps/opencs/model/tools/birthsigncheck.hpp
+++ b/apps/opencs/model/tools/birthsigncheck.hpp
@@ -21,7 +21,7 @@ namespace CSMTools
             virtual int setup();
             ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages);
+            virtual void perform (int stage, CSMDoc::Messages& messages);
             ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/bodypartcheck.cpp b/apps/opencs/model/tools/bodypartcheck.cpp
index a26945acf..68a09485f 100644
--- a/apps/opencs/model/tools/bodypartcheck.cpp
+++ b/apps/opencs/model/tools/bodypartcheck.cpp
@@ -14,7 +14,7 @@ int CSMTools::BodyPartCheckStage::setup()
     return mBodyParts.getSize();
 }
 
-void CSMTools::BodyPartCheckStage::perform ( int stage, Messages &messages )
+void CSMTools::BodyPartCheckStage::perform (int stage, CSMDoc::Messages &messages)
 {
     const CSMWorld::Record<ESM::BodyPart> &record = mBodyParts.getRecord(stage);
 
diff --git a/apps/opencs/model/tools/bodypartcheck.hpp b/apps/opencs/model/tools/bodypartcheck.hpp
index d72badfdf..0a6ca959a 100644
--- a/apps/opencs/model/tools/bodypartcheck.hpp
+++ b/apps/opencs/model/tools/bodypartcheck.hpp
@@ -27,7 +27,7 @@ namespace CSMTools
         virtual int setup();
         ///< \return number of steps
 
-        virtual void perform( int stage, Messages &messages );
+        virtual void perform( int stage, CSMDoc::Messages &messages );
         ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/classcheck.cpp b/apps/opencs/model/tools/classcheck.cpp
index cea4f3a68..5b872a266 100644
--- a/apps/opencs/model/tools/classcheck.cpp
+++ b/apps/opencs/model/tools/classcheck.cpp
@@ -18,7 +18,7 @@ int CSMTools::ClassCheckStage::setup()
     return mClasses.getSize();
 }
 
-void CSMTools::ClassCheckStage::perform (int stage, Messages& messages)
+void CSMTools::ClassCheckStage::perform (int stage, CSMDoc::Messages& messages)
 {
     const CSMWorld::Record<ESM::Class>& record = mClasses.getRecord (stage);
 
diff --git a/apps/opencs/model/tools/classcheck.hpp b/apps/opencs/model/tools/classcheck.hpp
index ec50ba35d..b76da3f13 100644
--- a/apps/opencs/model/tools/classcheck.hpp
+++ b/apps/opencs/model/tools/classcheck.hpp
@@ -21,7 +21,7 @@ namespace CSMTools
             virtual int setup();
             ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages);
+            virtual void perform (int stage, CSMDoc::Messages& messages);
             ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/factioncheck.cpp b/apps/opencs/model/tools/factioncheck.cpp
index ba8cfe1f9..0dfdee775 100644
--- a/apps/opencs/model/tools/factioncheck.cpp
+++ b/apps/opencs/model/tools/factioncheck.cpp
@@ -18,7 +18,7 @@ int CSMTools::FactionCheckStage::setup()
     return mFactions.getSize();
 }
 
-void CSMTools::FactionCheckStage::perform (int stage, Messages& messages)
+void CSMTools::FactionCheckStage::perform (int stage, CSMDoc::Messages& messages)
 {
     const CSMWorld::Record<ESM::Faction>& record = mFactions.getRecord (stage);
 
diff --git a/apps/opencs/model/tools/factioncheck.hpp b/apps/opencs/model/tools/factioncheck.hpp
index ccc44e6a9..321a4d6d8 100644
--- a/apps/opencs/model/tools/factioncheck.hpp
+++ b/apps/opencs/model/tools/factioncheck.hpp
@@ -21,7 +21,7 @@ namespace CSMTools
             virtual int setup();
             ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages);
+            virtual void perform (int stage, CSMDoc::Messages& messages);
             ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/mandatoryid.cpp b/apps/opencs/model/tools/mandatoryid.cpp
index 412e9f2f0..87d19401b 100644
--- a/apps/opencs/model/tools/mandatoryid.cpp
+++ b/apps/opencs/model/tools/mandatoryid.cpp
@@ -15,10 +15,9 @@ int CSMTools::MandatoryIdStage::setup()
     return mIds.size();
 }
 
-void CSMTools::MandatoryIdStage::perform (int stage, Messages& messages)
+void CSMTools::MandatoryIdStage::perform (int stage, CSMDoc::Messages& messages)
 {
     if (mIdCollection.searchId (mIds.at (stage))==-1 ||
         mIdCollection.getRecord (mIds.at (stage)).isDeleted())
-        messages.push_back (std::make_pair (mCollectionId,
-            "Missing mandatory record: " + mIds.at (stage)));
+        messages.add (mCollectionId, "Missing mandatory record: " + mIds.at (stage));
 }
\ No newline at end of file
diff --git a/apps/opencs/model/tools/mandatoryid.hpp b/apps/opencs/model/tools/mandatoryid.hpp
index a8afea62a..86015c982 100644
--- a/apps/opencs/model/tools/mandatoryid.hpp
+++ b/apps/opencs/model/tools/mandatoryid.hpp
@@ -30,7 +30,7 @@ namespace CSMTools
             virtual int setup();
             ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages);
+            virtual void perform (int stage, CSMDoc::Messages& messages);
             ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/racecheck.cpp b/apps/opencs/model/tools/racecheck.cpp
index 47aeda1e6..143d61772 100644
--- a/apps/opencs/model/tools/racecheck.cpp
+++ b/apps/opencs/model/tools/racecheck.cpp
@@ -7,7 +7,7 @@
 
 #include "../world/universalid.hpp"
 
-void CSMTools::RaceCheckStage::performPerRecord (int stage, Messages& messages)
+void CSMTools::RaceCheckStage::performPerRecord (int stage, CSMDoc::Messages& messages)
 {
     const CSMWorld::Record<ESM::Race>& record = mRaces.getRecord (stage);
 
@@ -46,7 +46,7 @@ void CSMTools::RaceCheckStage::performPerRecord (int stage, Messages& messages)
     /// \todo check data members that can't be edited in the table view
 }
 
-void CSMTools::RaceCheckStage::performFinal (Messages& messages)
+void CSMTools::RaceCheckStage::performFinal (CSMDoc::Messages& messages)
 {
     CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Races);
 
@@ -64,7 +64,7 @@ int CSMTools::RaceCheckStage::setup()
     return mRaces.getSize()+1;
 }
 
-void CSMTools::RaceCheckStage::perform (int stage, Messages& messages)
+void CSMTools::RaceCheckStage::perform (int stage, CSMDoc::Messages& messages)
 {
     if (stage==mRaces.getSize())
         performFinal (messages);
diff --git a/apps/opencs/model/tools/racecheck.hpp b/apps/opencs/model/tools/racecheck.hpp
index c68b283be..3e67b7577 100644
--- a/apps/opencs/model/tools/racecheck.hpp
+++ b/apps/opencs/model/tools/racecheck.hpp
@@ -15,9 +15,9 @@ namespace CSMTools
             const CSMWorld::IdCollection<ESM::Race>& mRaces;
             bool mPlayable;
 
-            void performPerRecord (int stage, Messages& messages);
+            void performPerRecord (int stage, CSMDoc::Messages& messages);
 
-            void performFinal (Messages& messages);
+            void performFinal (CSMDoc::Messages& messages);
 
         public:
 
@@ -26,7 +26,7 @@ namespace CSMTools
             virtual int setup();
             ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages);
+            virtual void perform (int stage, CSMDoc::Messages& messages);
             ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/referenceablecheck.cpp b/apps/opencs/model/tools/referenceablecheck.cpp
index 1816d0808..5190aacd5 100644
--- a/apps/opencs/model/tools/referenceablecheck.cpp
+++ b/apps/opencs/model/tools/referenceablecheck.cpp
@@ -18,7 +18,7 @@ CSMTools::ReferenceableCheckStage::ReferenceableCheckStage(
 {
 }
 
-void CSMTools::ReferenceableCheckStage::perform (int stage, Messages& messages)
+void CSMTools::ReferenceableCheckStage::perform (int stage, CSMDoc::Messages& messages)
 {
     //Checks for books, than, when stage is above mBooksSize goes to other checks, with (stage - PrevSum) as stage.
     const int bookSize(mReferencables.getBooks().getSize());
@@ -232,7 +232,7 @@ int CSMTools::ReferenceableCheckStage::setup()
 void CSMTools::ReferenceableCheckStage::bookCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Book >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -250,7 +250,7 @@ void CSMTools::ReferenceableCheckStage::bookCheck(
 void CSMTools::ReferenceableCheckStage::activatorCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Activator >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -270,7 +270,7 @@ void CSMTools::ReferenceableCheckStage::activatorCheck(
 void CSMTools::ReferenceableCheckStage::potionCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Potion >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -290,7 +290,7 @@ void CSMTools::ReferenceableCheckStage::potionCheck(
 void CSMTools::ReferenceableCheckStage::apparatusCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Apparatus >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -310,7 +310,7 @@ void CSMTools::ReferenceableCheckStage::apparatusCheck(
 void CSMTools::ReferenceableCheckStage::armorCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Armor >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -336,7 +336,7 @@ void CSMTools::ReferenceableCheckStage::armorCheck(
 void CSMTools::ReferenceableCheckStage::clothingCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Clothing >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -353,7 +353,7 @@ void CSMTools::ReferenceableCheckStage::clothingCheck(
 void CSMTools::ReferenceableCheckStage::containerCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Container >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -381,7 +381,7 @@ void CSMTools::ReferenceableCheckStage::containerCheck(
 
 void CSMTools::ReferenceableCheckStage::creatureCheck (
     int stage, const CSMWorld::RefIdDataContainer< ESM::Creature >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -448,7 +448,7 @@ void CSMTools::ReferenceableCheckStage::creatureCheck (
 
 void CSMTools::ReferenceableCheckStage::doorCheck(
     int stage, const CSMWorld::RefIdDataContainer< ESM::Door >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -469,7 +469,7 @@ void CSMTools::ReferenceableCheckStage::doorCheck(
 void CSMTools::ReferenceableCheckStage::ingredientCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Ingredient >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -487,7 +487,7 @@ void CSMTools::ReferenceableCheckStage::ingredientCheck(
 void CSMTools::ReferenceableCheckStage::creaturesLevListCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::CreatureLevList >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -505,7 +505,7 @@ void CSMTools::ReferenceableCheckStage::creaturesLevListCheck(
 void CSMTools::ReferenceableCheckStage::itemLevelledListCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::ItemLevList >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -522,7 +522,7 @@ void CSMTools::ReferenceableCheckStage::itemLevelledListCheck(
 
 void CSMTools::ReferenceableCheckStage::lightCheck(
     int stage, const CSMWorld::RefIdDataContainer< ESM::Light >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -547,7 +547,7 @@ void CSMTools::ReferenceableCheckStage::lightCheck(
 void CSMTools::ReferenceableCheckStage::lockpickCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Lockpick >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -567,7 +567,7 @@ void CSMTools::ReferenceableCheckStage::lockpickCheck(
 void CSMTools::ReferenceableCheckStage::miscCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Miscellaneous >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -584,7 +584,7 @@ void CSMTools::ReferenceableCheckStage::miscCheck(
 
 void CSMTools::ReferenceableCheckStage::npcCheck (
     int stage, const CSMWorld::RefIdDataContainer< ESM::NPC >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -701,7 +701,7 @@ void CSMTools::ReferenceableCheckStage::npcCheck (
 
 void CSMTools::ReferenceableCheckStage::weaponCheck(
     int stage, const CSMWorld::RefIdDataContainer< ESM::Weapon >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord (stage);
 
@@ -778,7 +778,7 @@ void CSMTools::ReferenceableCheckStage::weaponCheck(
 void CSMTools::ReferenceableCheckStage::probeCheck(
     int stage,
     const CSMWorld::RefIdDataContainer< ESM::Probe >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord(stage);
 
@@ -796,7 +796,7 @@ void CSMTools::ReferenceableCheckStage::probeCheck(
 
 void CSMTools::ReferenceableCheckStage::repairCheck (
     int stage, const CSMWorld::RefIdDataContainer< ESM::Repair >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord (stage);
 
@@ -812,7 +812,7 @@ void CSMTools::ReferenceableCheckStage::repairCheck (
 
 void CSMTools::ReferenceableCheckStage::staticCheck (
     int stage, const CSMWorld::RefIdDataContainer< ESM::Static >& records,
-    Messages& messages)
+    CSMDoc::Messages& messages)
 {
     const CSMWorld::RecordBase& baseRecord = records.getRecord (stage);
 
@@ -828,7 +828,7 @@ void CSMTools::ReferenceableCheckStage::staticCheck (
 
 //final check
 
-void CSMTools::ReferenceableCheckStage::finalCheck (Messages& messages)
+void CSMTools::ReferenceableCheckStage::finalCheck (CSMDoc::Messages& messages)
 {
     if (!mPlayerPresent)
         messages.push_back (std::make_pair (CSMWorld::UniversalId::Type_Referenceables,
@@ -839,7 +839,7 @@ void CSMTools::ReferenceableCheckStage::finalCheck (Messages& messages)
 //Templates begins here
 
 template<typename Item> void CSMTools::ReferenceableCheckStage::inventoryItemCheck (
-    const Item& someItem, Messages& messages, const std::string& someID, bool enchantable)
+    const Item& someItem, CSMDoc::Messages& messages, const std::string& someID, bool enchantable)
 {
     if (someItem.mName.empty())
         messages.push_back (std::make_pair (someID, someItem.mId + " has an empty name"));
@@ -865,7 +865,7 @@ template<typename Item> void CSMTools::ReferenceableCheckStage::inventoryItemChe
 }
 
 template<typename Item> void CSMTools::ReferenceableCheckStage::inventoryItemCheck (
-    const Item& someItem, Messages& messages, const std::string& someID)
+    const Item& someItem, CSMDoc::Messages& messages, const std::string& someID)
 {
     if (someItem.mName.empty())
         messages.push_back (std::make_pair (someID, someItem.mId + " has an empty name"));
@@ -888,7 +888,7 @@ template<typename Item> void CSMTools::ReferenceableCheckStage::inventoryItemChe
 }
 
 template<typename Tool> void CSMTools::ReferenceableCheckStage::toolCheck (
-    const Tool& someTool, Messages& messages, const std::string& someID, bool canBeBroken)
+    const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID, bool canBeBroken)
 {
     if (someTool.mData.mQuality <= 0)
         messages.push_back (std::make_pair (someID, someTool.mId + " has non-positive quality"));
@@ -899,14 +899,14 @@ template<typename Tool> void CSMTools::ReferenceableCheckStage::toolCheck (
 }
 
 template<typename Tool> void CSMTools::ReferenceableCheckStage::toolCheck (
-    const Tool& someTool, Messages& messages, const std::string& someID)
+    const Tool& someTool, CSMDoc::Messages& messages, const std::string& someID)
 {
     if (someTool.mData.mQuality <= 0)
         messages.push_back (std::make_pair (someID, someTool.mId + " has non-positive quality"));
 }
 
 template<typename List> void CSMTools::ReferenceableCheckStage::listCheck (
-    const List& someList, Messages& messages, const std::string& someID)
+    const List& someList, CSMDoc::Messages& messages, const std::string& someID)
 {
     for (unsigned i = 0; i < someList.mList.size(); ++i)
     {
diff --git a/apps/opencs/model/tools/referenceablecheck.hpp b/apps/opencs/model/tools/referenceablecheck.hpp
index b0129fc2a..ac7ed7082 100644
--- a/apps/opencs/model/tools/referenceablecheck.hpp
+++ b/apps/opencs/model/tools/referenceablecheck.hpp
@@ -17,56 +17,56 @@ namespace CSMTools
                 const CSMWorld::IdCollection<ESM::Class>& classes,
                 const CSMWorld::IdCollection<ESM::Faction>& factions);
 
-            virtual void perform(int stage, Messages& messages);
+            virtual void perform(int stage, CSMDoc::Messages& messages);
             virtual int setup();
 
         private:
             //CONCRETE CHECKS
-            void bookCheck(int stage, const CSMWorld::RefIdDataContainer< ESM::Book >& records, Messages& messages);
-            void activatorCheck(int stage, const CSMWorld::RefIdDataContainer< ESM::Activator >& records, Messages& messages);
-            void potionCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Potion>& records, Messages& messages);
-            void apparatusCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Apparatus>& records, Messages& messages);
-            void armorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Armor>& records, Messages& messages);
-            void clothingCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Clothing>& records, Messages& messages);
-            void containerCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Container>& records, Messages& messages);
-            void creatureCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Creature>& records, Messages& messages);
-            void doorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Door>& records, Messages& messages);
-            void ingredientCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Ingredient>& records, Messages& messages);
-            void creaturesLevListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::CreatureLevList>& records, Messages& messages);
-            void itemLevelledListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::ItemLevList>& records, Messages& messages);
-            void lightCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Light>& records, Messages& messages);
-            void lockpickCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Lockpick>& records, Messages& messages);
-            void miscCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Miscellaneous>& records, Messages& messages);
-            void npcCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::NPC>& records, Messages& messages);
-            void weaponCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Weapon>& records, Messages& messages);
-            void probeCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Probe>& records, Messages& messages);
-            void repairCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Repair>& records, Messages& messages);
-            void staticCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Static>& records, Messages& messages);
+            void bookCheck(int stage, const CSMWorld::RefIdDataContainer< ESM::Book >& records, CSMDoc::Messages& messages);
+            void activatorCheck(int stage, const CSMWorld::RefIdDataContainer< ESM::Activator >& records, CSMDoc::Messages& messages);
+            void potionCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Potion>& records, CSMDoc::Messages& messages);
+            void apparatusCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Apparatus>& records, CSMDoc::Messages& messages);
+            void armorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Armor>& records, CSMDoc::Messages& messages);
+            void clothingCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Clothing>& records, CSMDoc::Messages& messages);
+            void containerCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Container>& records, CSMDoc::Messages& messages);
+            void creatureCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Creature>& records, CSMDoc::Messages& messages);
+            void doorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Door>& records, CSMDoc::Messages& messages);
+            void ingredientCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Ingredient>& records, CSMDoc::Messages& messages);
+            void creaturesLevListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::CreatureLevList>& records, CSMDoc::Messages& messages);
+            void itemLevelledListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::ItemLevList>& records, CSMDoc::Messages& messages);
+            void lightCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Light>& records, CSMDoc::Messages& messages);
+            void lockpickCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Lockpick>& records, CSMDoc::Messages& messages);
+            void miscCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Miscellaneous>& records, CSMDoc::Messages& messages);
+            void npcCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::NPC>& records, CSMDoc::Messages& messages);
+            void weaponCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Weapon>& records, CSMDoc::Messages& messages);
+            void probeCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Probe>& records, CSMDoc::Messages& messages);
+            void repairCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Repair>& records, CSMDoc::Messages& messages);
+            void staticCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Static>& records, CSMDoc::Messages& messages);
 
             //FINAL CHECK
-            void finalCheck (Messages& messages);
+            void finalCheck (CSMDoc::Messages& messages);
 
 	    //TEMPLATE CHECKS
 	    template<typename ITEM> void inventoryItemCheck(const ITEM& someItem,
-                                                            Messages& messages,
+                                                            CSMDoc::Messages& messages,
                                                             const std::string& someID,
                                                             bool enchantable); //for all enchantable items.
 
 	    template<typename ITEM> void inventoryItemCheck(const ITEM& someItem,
-                                                            Messages& messages,
+                                                            CSMDoc::Messages& messages,
                                                             const std::string& someID); //for non-enchantable items.
 
 	    template<typename TOOL> void toolCheck(const TOOL& someTool,
-                                                   Messages& messages,
+                                                   CSMDoc::Messages& messages,
                                                    const std::string& someID,
                                                    bool canbebroken); //for tools with uses.
 
 	    template<typename TOOL> void toolCheck(const TOOL& someTool,
-                                                   Messages& messages,
+                                                   CSMDoc::Messages& messages,
                                                    const std::string& someID); //for tools without uses.
 
 	    template<typename LIST> void listCheck(const LIST& someList,
-                                                   Messages& messages,
+                                                   CSMDoc::Messages& messages,
                                                    const std::string& someID);
 
             const CSMWorld::RefIdData& mReferencables;
diff --git a/apps/opencs/model/tools/regioncheck.cpp b/apps/opencs/model/tools/regioncheck.cpp
index 07df20470..091836d0d 100644
--- a/apps/opencs/model/tools/regioncheck.cpp
+++ b/apps/opencs/model/tools/regioncheck.cpp
@@ -17,7 +17,7 @@ int CSMTools::RegionCheckStage::setup()
     return mRegions.getSize();
 }
 
-void CSMTools::RegionCheckStage::perform (int stage, Messages& messages)
+void CSMTools::RegionCheckStage::perform (int stage, CSMDoc::Messages& messages)
 {
     const CSMWorld::Record<ESM::Region>& record = mRegions.getRecord (stage);
 
diff --git a/apps/opencs/model/tools/regioncheck.hpp b/apps/opencs/model/tools/regioncheck.hpp
index a12903e7d..8ba32e137 100644
--- a/apps/opencs/model/tools/regioncheck.hpp
+++ b/apps/opencs/model/tools/regioncheck.hpp
@@ -21,7 +21,7 @@ namespace CSMTools
             virtual int setup();
             ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages);
+            virtual void perform (int stage, CSMDoc::Messages& messages);
             ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp
index 75545a7c7..135420612 100644
--- a/apps/opencs/model/tools/reportmodel.cpp
+++ b/apps/opencs/model/tools/reportmodel.cpp
@@ -16,7 +16,7 @@ int CSMTools::ReportModel::columnCount (const QModelIndex & parent) const
     if (parent.isValid())
         return 0;
 
-    return 2;
+    return 3;
 }
 
 QVariant CSMTools::ReportModel::data (const QModelIndex & index, int role) const
@@ -26,8 +26,11 @@ QVariant CSMTools::ReportModel::data (const QModelIndex & index, int role) const
 
     if (index.column()==0)
         return static_cast<int> (mRows.at (index.row()).first.getType());
-    else
-        return mRows.at (index.row()).second.c_str();
+
+    if (index.column()==1)
+        return QString::fromUtf8 (mRows.at (index.row()).second.first.c_str());
+
+    return QString::fromUtf8 (mRows.at (index.row()).second.second.c_str());
 }
 
 QVariant CSMTools::ReportModel::headerData (int section, Qt::Orientation orientation, int role) const
@@ -38,7 +41,13 @@ QVariant CSMTools::ReportModel::headerData (int section, Qt::Orientation orienta
     if (orientation==Qt::Vertical)
         return QVariant();
 
-    return tr (section==0 ? "Type" : "Description");
+    if (section==0)
+        return "Type";
+
+    if (section==1)
+        return "Description";
+
+    return "Hint";
 }
 
 bool CSMTools::ReportModel::removeRows (int row, int count, const QModelIndex& parent)
@@ -51,11 +60,12 @@ bool CSMTools::ReportModel::removeRows (int row, int count, const QModelIndex& p
     return true;
 }
 
-void CSMTools::ReportModel::add (const CSMWorld::UniversalId& id, const std::string& message)
+void CSMTools::ReportModel::add (const CSMWorld::UniversalId& id, const std::string& message,
+    const std::string& hint)
 {
     beginInsertRows (QModelIndex(), mRows.size(), mRows.size());
 
-    mRows.push_back (std::make_pair (id, message));
+    mRows.push_back (std::make_pair (id, std::make_pair (message, hint)));
 
     endInsertRows();
 }
@@ -64,3 +74,8 @@ const CSMWorld::UniversalId& CSMTools::ReportModel::getUniversalId (int row) con
 {
     return mRows.at (row).first;
 }
+
+std::string CSMTools::ReportModel::getHint (int row) const
+{
+    return mRows.at (row).second.second;
+}
\ No newline at end of file
diff --git a/apps/opencs/model/tools/reportmodel.hpp b/apps/opencs/model/tools/reportmodel.hpp
index 0f000245e..709e024a7 100644
--- a/apps/opencs/model/tools/reportmodel.hpp
+++ b/apps/opencs/model/tools/reportmodel.hpp
@@ -14,7 +14,7 @@ namespace CSMTools
     {
             Q_OBJECT
 
-            std::vector<std::pair<CSMWorld::UniversalId, std::string> > mRows;
+            std::vector<std::pair<CSMWorld::UniversalId, std::pair<std::string, std::string> > > mRows;
 
         public:
 
@@ -28,9 +28,12 @@ namespace CSMTools
 
             virtual bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex());
 
-            void add (const CSMWorld::UniversalId& id, const std::string& message);
+            void add (const CSMWorld::UniversalId& id, const std::string& message,
+                const std::string& hint = "");
 
             const CSMWorld::UniversalId& getUniversalId (int row) const;
+
+            std::string getHint (int row) const;
     };
 }
 
diff --git a/apps/opencs/model/tools/scriptcheck.cpp b/apps/opencs/model/tools/scriptcheck.cpp
index d2c647bda..d9dea7f43 100644
--- a/apps/opencs/model/tools/scriptcheck.cpp
+++ b/apps/opencs/model/tools/scriptcheck.cpp
@@ -28,7 +28,11 @@ void CSMTools::ScriptCheckStage::report (const std::string& message, const Compi
         << ", line " << loc.mLine << ", column " << loc.mColumn
         << " (" << loc.mLiteral << "): " << message;
 
-    mMessages->push_back (std::make_pair (id, stream.str()));
+    std::ostringstream hintStream;
+
+    hintStream << "l:" << loc.mLine << " " << loc.mColumn;
+
+    mMessages->add (id, stream.str(), hintStream.str());
 }
 
 void CSMTools::ScriptCheckStage::report (const std::string& message, Type type)
@@ -58,7 +62,7 @@ int CSMTools::ScriptCheckStage::setup()
     return mDocument.getData().getScripts().getSize();
 }
 
-void CSMTools::ScriptCheckStage::perform (int stage, Messages& messages)
+void CSMTools::ScriptCheckStage::perform (int stage, CSMDoc::Messages& messages)
 {
     mId = mDocument.getData().getScripts().getId (stage);
 
diff --git a/apps/opencs/model/tools/scriptcheck.hpp b/apps/opencs/model/tools/scriptcheck.hpp
index 75f11b9d4..3fe12fc9a 100644
--- a/apps/opencs/model/tools/scriptcheck.hpp
+++ b/apps/opencs/model/tools/scriptcheck.hpp
@@ -23,7 +23,7 @@ namespace CSMTools
             CSMWorld::ScriptContext mContext;
             std::string mId;
             std::string mFile;
-            Messages *mMessages;
+            CSMDoc::Messages *mMessages;
 
             virtual void report (const std::string& message, const Compiler::TokenLoc& loc, Type type);
             ///< Report error to the user.
@@ -38,7 +38,7 @@ namespace CSMTools
             virtual int setup();
             ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages);
+            virtual void perform (int stage, CSMDoc::Messages& messages);
             ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/skillcheck.cpp b/apps/opencs/model/tools/skillcheck.cpp
index 630516c72..e061e042c 100644
--- a/apps/opencs/model/tools/skillcheck.cpp
+++ b/apps/opencs/model/tools/skillcheck.cpp
@@ -16,7 +16,7 @@ int CSMTools::SkillCheckStage::setup()
     return mSkills.getSize();
 }
 
-void CSMTools::SkillCheckStage::perform (int stage, Messages& messages)
+void CSMTools::SkillCheckStage::perform (int stage, CSMDoc::Messages& messages)
 {
     const CSMWorld::Record<ESM::Skill>& record = mSkills.getRecord (stage);
 
diff --git a/apps/opencs/model/tools/skillcheck.hpp b/apps/opencs/model/tools/skillcheck.hpp
index cf5d53b5c..93b06fe71 100644
--- a/apps/opencs/model/tools/skillcheck.hpp
+++ b/apps/opencs/model/tools/skillcheck.hpp
@@ -21,7 +21,7 @@ namespace CSMTools
             virtual int setup();
             ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages);
+            virtual void perform (int stage, CSMDoc::Messages& messages);
             ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/soundcheck.cpp b/apps/opencs/model/tools/soundcheck.cpp
index 3d222e909..e122ced91 100644
--- a/apps/opencs/model/tools/soundcheck.cpp
+++ b/apps/opencs/model/tools/soundcheck.cpp
@@ -16,7 +16,7 @@ int CSMTools::SoundCheckStage::setup()
     return mSounds.getSize();
 }
 
-void CSMTools::SoundCheckStage::perform (int stage, Messages& messages)
+void CSMTools::SoundCheckStage::perform (int stage, CSMDoc::Messages& messages)
 {
     const CSMWorld::Record<ESM::Sound>& record = mSounds.getRecord (stage);
 
diff --git a/apps/opencs/model/tools/soundcheck.hpp b/apps/opencs/model/tools/soundcheck.hpp
index a82a0eb6d..52f2d3714 100644
--- a/apps/opencs/model/tools/soundcheck.hpp
+++ b/apps/opencs/model/tools/soundcheck.hpp
@@ -21,7 +21,7 @@ namespace CSMTools
             virtual int setup();
             ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages);
+            virtual void perform (int stage, CSMDoc::Messages& messages);
             ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/spellcheck.cpp b/apps/opencs/model/tools/spellcheck.cpp
index 3d0be46fd..0b59dc862 100644
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@@ -17,7 +17,7 @@ int CSMTools::SpellCheckStage::setup()
     return mSpells.getSize();
 }
 
-void CSMTools::SpellCheckStage::perform (int stage, Messages& messages)
+void CSMTools::SpellCheckStage::perform (int stage, CSMDoc::Messages& messages)
 {
     const CSMWorld::Record<ESM::Spell>& record = mSpells.getRecord (stage);
 
diff --git a/apps/opencs/model/tools/spellcheck.hpp b/apps/opencs/model/tools/spellcheck.hpp
index 182f1888b..9c3ea8885 100644
--- a/apps/opencs/model/tools/spellcheck.hpp
+++ b/apps/opencs/model/tools/spellcheck.hpp
@@ -21,7 +21,7 @@ namespace CSMTools
             virtual int setup();
             ///< \return number of steps
 
-            virtual void perform (int stage, Messages& messages);
+            virtual void perform (int stage, CSMDoc::Messages& messages);
             ///< Messages resulting from this tage will be appended to \a messages.
     };
 }
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index 79b0b18b0..6e157f664 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -48,8 +48,8 @@ CSMDoc::Operation *CSMTools::Tools::getVerifier()
         connect (mVerifier, SIGNAL (progress (int, int, int)), this, SIGNAL (progress (int, int, int)));
         connect (mVerifier, SIGNAL (done (int, bool)), this, SIGNAL (done (int, bool)));
         connect (mVerifier,
-            SIGNAL (reportMessage (const CSMWorld::UniversalId&, const std::string&, int)),
-            this, SLOT (verifierMessage (const CSMWorld::UniversalId&, const std::string&, int)));
+            SIGNAL (reportMessage (const CSMWorld::UniversalId&, const std::string&, const std::string&, int)),
+            this, SLOT (verifierMessage (const CSMWorld::UniversalId&, const std::string&, const std::string&, int)));
 
         std::vector<std::string> mandatoryIds; //  I want C++11, damn it!
         mandatoryIds.push_back ("Day");
@@ -155,11 +155,11 @@ CSMTools::ReportModel *CSMTools::Tools::getReport (const CSMWorld::UniversalId&
 }
 
 void CSMTools::Tools::verifierMessage (const CSMWorld::UniversalId& id, const std::string& message,
-    int type)
+    const std::string& hint, int type)
 {
     std::map<int, int>::iterator iter = mActiveReports.find (type);
 
     if (iter!=mActiveReports.end())
-        mReports[iter->second]->add (id, message);
+        mReports[iter->second]->add (id, message, hint);
 }
 
diff --git a/apps/opencs/model/tools/tools.hpp b/apps/opencs/model/tools/tools.hpp
index 7ca30e6b9..5125a3638 100644
--- a/apps/opencs/model/tools/tools.hpp
+++ b/apps/opencs/model/tools/tools.hpp
@@ -64,7 +64,7 @@ namespace CSMTools
         private slots:
 
             void verifierMessage (const CSMWorld::UniversalId& id, const std::string& message,
-                int type);
+                const std::string& hint, int type);
 
         signals:
 
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 6f830e6e3..eba73cf0b 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -272,7 +272,7 @@ namespace CSMWorld
         {
             ESXRecordT record2 = record.get();
 
-            record2.mData.mUseValue[mIndex] = data.toInt();
+            record2.mData.mUseValue[mIndex] = data.toFloat();
 
             record.setModified (record2);
         }
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 9cb0299c4..67f6822c7 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -671,16 +671,24 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
     return mReader->getRecordCount();
 }
 
-bool CSMWorld::Data::continueLoading (CSMDoc::Stage::Messages& messages)
+bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
 {
     if (!mReader)
         throw std::logic_error ("can't continue loading, because no load has been started");
 
     if (!mReader->hasMoreRecs())
     {
-        // Don't delete the Reader yet. Some record types store a reference to the Reader to handle on-demand loading
-        boost::shared_ptr<ESM::ESMReader> ptr(mReader);
-        mReaders.push_back(ptr);
+        if (mBase)
+        {
+            // Don't delete the Reader yet. Some record types store a reference to the Reader to handle on-demand loading.
+            // We don't store non-base reader, because everything going into modified will be
+            // fully loaded during the initial loading process.
+            boost::shared_ptr<ESM::ESMReader> ptr(mReader);
+            mReaders.push_back(ptr);
+        }
+        else
+            delete mReader;
+
         mReader = 0;
 
         mDialogue = 0;
@@ -713,7 +721,18 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Stage::Messages& messages)
         case ESM::REC_PGRD: mPathgrids.load (*mReader, mBase); break;
 
         case ESM::REC_LTEX: mLandTextures.load (*mReader, mBase); break;
-        case ESM::REC_LAND: mLand.load(*mReader, mBase); break;
+
+        case ESM::REC_LAND:
+        {
+            int index = mLand.load(*mReader, mBase);
+
+            if (index!=-1 && !mBase)
+                mLand.getRecord (index).mModified.mLand->loadData (
+                    ESM::Land::DATA_VHGT | ESM::Land::DATA_VNML | ESM::Land::DATA_VCLR |
+                    ESM::Land::DATA_VTEX);
+
+            break;
+        }
 
         case ESM::REC_CELL:
         {
@@ -775,8 +794,8 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Stage::Messages& messages)
                 }
                 else
                 {
-                    messages.push_back (std::make_pair (UniversalId::Type_None,
-                        "Trying to delete dialogue record " + id + " which does not exist"));
+                    messages.add (UniversalId::Type_None,
+                        "Trying to delete dialogue record " + id + " which does not exist");
                 }
             }
             else
@@ -792,8 +811,8 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Stage::Messages& messages)
         {
             if (!mDialogue)
             {
-                messages.push_back (std::make_pair (UniversalId::Type_None,
-                    "Found info record not following a dialogue record"));
+                messages.add (UniversalId::Type_None,
+                    "Found info record not following a dialogue record");
 
                 mReader->skipRecord();
                 break;
@@ -836,8 +855,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Stage::Messages& messages)
 
     if (unhandledRecord)
     {
-        messages.push_back (std::make_pair (UniversalId::Type_None,
-            "Unsupported record type: " + n.toString()));
+        messages.add (UniversalId::Type_None, "Unsupported record type: " + n.toString());
 
         mReader->skipRecord();
     }
diff --git a/apps/opencs/model/world/data.hpp b/apps/opencs/model/world/data.hpp
index 37d4d4b8a..02f7bc452 100644
--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@@ -244,7 +244,7 @@ namespace CSMWorld
             ///
             ///< \return estimated number of records
 
-            bool continueLoading (CSMDoc::Stage::Messages& messages);
+            bool continueLoading (CSMDoc::Messages& messages);
             ///< \return Finished?
 
             bool hasId (const std::string& id) const;
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index 0129ba3d8..f00ea447a 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -15,12 +15,15 @@ namespace CSMWorld
 
         public:
 
-            void load (ESM::ESMReader& reader, bool base);
+            /// \return Index of loaded record (-1 if no record was loaded)
+            int load (ESM::ESMReader& reader, bool base);
 
             /// \param index Index at which the record can be found.
             /// Special values: -2 index unknown, -1 record does not exist yet and therefore
             /// does not have an index
-            void load (const ESXRecordT& record, bool base, int index = -2);
+            ///
+            /// \return index
+            int load (const ESXRecordT& record, bool base, int index = -2);
 
             bool tryDelete (const std::string& id);
             ///< Try deleting \a id. If the id does not exist or can't be deleted the call is ignored.
@@ -36,7 +39,7 @@ namespace CSMWorld
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
-    void IdCollection<ESXRecordT, IdAccessorT>::load (ESM::ESMReader& reader, bool base)
+    int IdCollection<ESXRecordT, IdAccessorT>::load (ESM::ESMReader& reader, bool base)
     {
         std::string id = reader.getHNOString ("NAME");
 
@@ -64,6 +67,8 @@ namespace CSMWorld
                 record.mState = RecordBase::State_Deleted;
                 this->setRecord (index, record);
             }
+
+            return -1;
         }
         else
         {
@@ -88,12 +93,12 @@ namespace CSMWorld
                     index = newIndex;
             }
 
-            load (record, base, index);
+            return load (record, base, index);
         }
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
-    void IdCollection<ESXRecordT, IdAccessorT>::load (const ESXRecordT& record, bool base,
+    int IdCollection<ESXRecordT, IdAccessorT>::load (const ESXRecordT& record, bool base,
         int index)
     {
         if (index==-2)
@@ -106,6 +111,7 @@ namespace CSMWorld
             record2.mState = base ? RecordBase::State_BaseOnly : RecordBase::State_ModifiedOnly;
             (base ? record2.mBase : record2.mModified) = record;
 
+            index = this->getSize();
             this->appendRecord (record2);
         }
         else
@@ -120,6 +126,8 @@ namespace CSMWorld
 
             this->setRecord (index, record2);
         }
+
+        return index;
     }
 
     template<typename ESXRecordT, typename IdAccessorT>
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index c516e2c3e..47f0276c6 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -11,7 +11,7 @@
 #include "record.hpp"
 
 void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool base,
-    std::map<ESM::RefNum, std::string>& cache, CSMDoc::Stage::Messages& messages)
+    std::map<ESM::RefNum, std::string>& cache, CSMDoc::Messages& messages)
 {
     Record<Cell> cell = mCells.getRecord (cellIndex);
 
@@ -36,8 +36,7 @@ void CSMWorld::RefCollection::load (ESM::ESMReader& reader, int cellIndex, bool
                 CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_Cell,
                     mCells.getId (cellIndex));
 
-                messages.push_back (std::make_pair (id,
-                    "Attempt to delete a non-existing reference"));
+                messages.add (id, "Attempt to delete a non-existing reference");
 
                 continue;
             }
diff --git a/apps/opencs/model/world/refcollection.hpp b/apps/opencs/model/world/refcollection.hpp
index 63d369ed9..4ecc32b2f 100644
--- a/apps/opencs/model/world/refcollection.hpp
+++ b/apps/opencs/model/world/refcollection.hpp
@@ -28,7 +28,7 @@ namespace CSMWorld
 
             void load (ESM::ESMReader& reader, int cellIndex, bool base,
                 std::map<ESM::RefNum, std::string>& cache,
-                CSMDoc::Stage::Messages& messages);
+                CSMDoc::Messages& messages);
             ///< Load a sequence of references.
 
             std::string getNewId();
diff --git a/apps/opencs/model/world/resources.cpp b/apps/opencs/model/world/resources.cpp
index 8e255bc96..13c8df84d 100644
--- a/apps/opencs/model/world/resources.cpp
+++ b/apps/opencs/model/world/resources.cpp
@@ -3,6 +3,7 @@
 
 #include <sstream>
 #include <stdexcept>
+#include <algorithm>
 
 #include <OgreResourceGroupManager.h>
 
@@ -55,7 +56,9 @@ CSMWorld::Resources::Resources (const std::string& baseDirectory, UniversalId::T
 
             std::string file = iter->substr (baseSize+1);
             mFiles.push_back (file);
-            mIndex.insert (std::make_pair (file, static_cast<int> (mFiles.size())-1));
+            std::replace (file.begin(), file.end(), '\\', '/');
+            mIndex.insert (std::make_pair (
+                Misc::StringUtils::lowerCase (file), static_cast<int> (mFiles.size())-1));
         }
     }
 }
@@ -89,6 +92,8 @@ int CSMWorld::Resources::searchId (const std::string& id) const
 {
     std::string id2 = Misc::StringUtils::lowerCase (id);
 
+    std::replace (id2.begin(), id2.end(), '\\', '/');
+
     std::map<std::string, int>::const_iterator iter = mIndex.find (id2);
 
     if (iter==mIndex.end())
diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp
index d64d36aec..0d2b6060e 100644
--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@@ -16,7 +16,6 @@
 #include "../../model/world/idtable.hpp"
 
 #include "../world/subviews.hpp"
-#include "../world/physicsmanager.hpp"
 
 #include "../tools/subviews.hpp"
 
@@ -407,8 +406,6 @@ CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int to
     mSubViewFactory.add (CSMWorld::UniversalId::Type_RunLog, new SubViewFactory<RunLogSubView>);
 
     connect (mOperations, SIGNAL (abortOperation (int)), this, SLOT (abortOperation (int)));
-
-    CSVWorld::PhysicsManager::instance()->setupPhysics(document);
 }
 
 CSVDoc::View::~View()
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index c4fd66884..5f6b6b46a 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -16,7 +16,6 @@
 #include "../world/vartypedelegate.hpp"
 #include "../world/recordstatusdelegate.hpp"
 #include "../world/idtypedelegate.hpp"
-#include "../world/physicsmanager.hpp"
 
 #include "../../model/settings/usersettings.hpp"
 
@@ -219,7 +218,6 @@ void CSVDoc::ViewManager::removeDocAndView (CSMDoc::Document *document)
             mDocumentManager.removeDocument(document);
             (*iter)->deleteLater();
             mViews.erase (iter);
-            CSVWorld::PhysicsManager::instance()->removeDocument(document);
 
             updateIndices();
             return;
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 12e00ca46..821920a47 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -119,7 +119,7 @@ bool CSVRender::Cell::addObjects (int start, int end)
 }
 
 CSVRender::Cell::Cell (CSMWorld::Data& data, Ogre::SceneManager *sceneManager,
-    const std::string& id, CSVWorld::PhysicsSystem *physics, const Ogre::Vector3& origin)
+    const std::string& id, boost::shared_ptr<CSVWorld::PhysicsSystem> physics, const Ogre::Vector3& origin)
 : mData (data), mId (Misc::StringUtils::lowerCase (id)), mSceneMgr(sceneManager), mPhysics(physics),
     mPathgridId("")
 {
diff --git a/apps/opencs/view/render/cell.hpp b/apps/opencs/view/render/cell.hpp
index 8a7f01f20..0ac8a8c3a 100644
--- a/apps/opencs/view/render/cell.hpp
+++ b/apps/opencs/view/render/cell.hpp
@@ -5,6 +5,8 @@
 #include <map>
 #include <memory>
 
+#include <boost/shared_ptr.hpp>
+
 #include <OgreVector3.h>
 
 #include <components/terrain/terraingrid.hpp>
@@ -50,7 +52,7 @@ namespace CSVRender
             std::string mPathgridId; // FIXME: temporary storage until saving to document
 
             std::auto_ptr<Terrain::TerrainGrid> mTerrain;
-            CSVWorld::PhysicsSystem *mPhysics;
+            boost::shared_ptr<CSVWorld::PhysicsSystem> mPhysics;
             Ogre::SceneManager *mSceneMgr;
             int mX;
             int mY;
@@ -68,7 +70,7 @@ namespace CSVRender
         public:
 
             Cell (CSMWorld::Data& data, Ogre::SceneManager *sceneManager, const std::string& id,
-                CSVWorld::PhysicsSystem *physics, const Ogre::Vector3& origin = Ogre::Vector3 (0, 0, 0));
+                boost::shared_ptr<CSVWorld::PhysicsSystem> physics, const Ogre::Vector3& origin = Ogre::Vector3 (0, 0, 0));
 
             ~Cell();
 
diff --git a/apps/opencs/view/render/elements.hpp b/apps/opencs/view/render/elements.hpp
index 784e41212..5a37956e9 100644
--- a/apps/opencs/view/render/elements.hpp
+++ b/apps/opencs/view/render/elements.hpp
@@ -8,10 +8,10 @@ namespace CSVRender
     {
         // elements that are part of the actual scene
         Element_Reference = 0x1,
-        Element_Terrain = 0x2,
+        Element_Pathgrid = 0x2,
         Element_Water = 0x4,
-        Element_Pathgrid = 0x8,
-        Element_Fog = 0x10,
+        Element_Fog = 0x8,
+        Element_Terrain = 0x10,
 
         // control elements
         Element_CellMarker = 0x10000,
diff --git a/apps/opencs/view/render/mousestate.cpp b/apps/opencs/view/render/mousestate.cpp
index 41908d11c..5de09cf8a 100644
--- a/apps/opencs/view/render/mousestate.cpp
+++ b/apps/opencs/view/render/mousestate.cpp
@@ -56,7 +56,7 @@ namespace CSVRender
     //
 
     MouseState::MouseState(WorldspaceWidget *parent)
-        : mParent(parent), mPhysics(parent->getPhysics()), mSceneManager(parent->getSceneManager())
+        : mParent(parent), mPhysics(parent->mDocument.getPhysics()), mSceneManager(parent->getSceneManager())
         , mCurrentObj(""), mMouseState(Mouse_Default), mOldCursorPos(0,0), mMouseEventTimer(0)
         , mGrabbedSceneNode(""), mGrabbedRefId(""), mOrigObjPos(Ogre::Vector3())
         , mOrigMousePos(Ogre::Vector3()), mOldMousePos(Ogre::Vector3()), mPlane(0)
diff --git a/apps/opencs/view/render/mousestate.hpp b/apps/opencs/view/render/mousestate.hpp
index cde53f2c5..02d54a8b9 100644
--- a/apps/opencs/view/render/mousestate.hpp
+++ b/apps/opencs/view/render/mousestate.hpp
@@ -2,6 +2,7 @@
 #define OPENCS_VIEW_MOUSESTATE_H
 
 #include <map>
+#include <boost/shared_ptr.hpp>
 #include <QPoint>
 #include <OgreVector3.h>
 
@@ -43,7 +44,7 @@ namespace CSVRender
             MouseStates mMouseState;
 
             WorldspaceWidget *mParent;
-            CSVWorld::PhysicsSystem *mPhysics; // local copy
+            boost::shared_ptr<CSVWorld::PhysicsSystem> mPhysics;
             Ogre::SceneManager *mSceneManager; // local copy
 
             QPoint mOldCursorPos;
diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp
index e27371766..d92b4aaa2 100644
--- a/apps/opencs/view/render/object.cpp
+++ b/apps/opencs/view/render/object.cpp
@@ -93,7 +93,6 @@ void CSVRender::Object::update()
             Ogre::Quaternion yr (Ogre::Radian (-reference.mPos.rot[1]), Ogre::Vector3::UNIT_Y);
             Ogre::Quaternion zr (Ogre::Radian (-reference.mPos.rot[2]), Ogre::Vector3::UNIT_Z);
 
-            mPhysicsObject = mReferenceId;
             mPhysics->addObject("meshes\\" + model, mBase->getName(), mReferenceId, reference.mScale, position, xr*yr*zr);
         }
     }
@@ -133,9 +132,9 @@ const CSMWorld::CellRef& CSVRender::Object::getReference() const
 }
 
 CSVRender::Object::Object (const CSMWorld::Data& data, Ogre::SceneNode *cellNode,
-    const std::string& id, bool referenceable, CSVWorld::PhysicsSystem *physics,
+    const std::string& id, bool referenceable, boost::shared_ptr<CSVWorld::PhysicsSystem> physics,
     bool forceBaseToZero)
-: mData (data), mBase (0), mForceBaseToZero (forceBaseToZero), mPhysics(physics), mPhysicsObject("")
+: mData (data), mBase (0), mForceBaseToZero (forceBaseToZero), mPhysics(physics)
 {
     mBase = cellNode->createChildSceneNode();
 
@@ -157,7 +156,7 @@ CSVRender::Object::~Object()
 {
     clear();
 
-    if(mPhysicsObject != "")
+    if(mPhysics) // preview may not have physics enabled
         mPhysics->removeObject(mBase->getName());
 
     if (mBase)
diff --git a/apps/opencs/view/render/object.hpp b/apps/opencs/view/render/object.hpp
index 8ce204e1c..780d19e80 100644
--- a/apps/opencs/view/render/object.hpp
+++ b/apps/opencs/view/render/object.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENCS_VIEW_OBJECT_H
 #define OPENCS_VIEW_OBJECT_H
 
+#include <boost/shared_ptr.hpp>
+
 #include <components/nifogre/ogrenifloader.hpp>
 
 class QModelIndex;
@@ -31,7 +33,7 @@ namespace CSVRender
             Ogre::SceneNode *mBase;
             NifOgre::ObjectScenePtr mObject;
             bool mForceBaseToZero;
-            CSVWorld::PhysicsSystem *mPhysics;
+            boost::shared_ptr<CSVWorld::PhysicsSystem> mPhysics;
             std::string mPhysicsObject;
 
             /// Not implemented
@@ -59,7 +61,8 @@ namespace CSVRender
 
             Object (const CSMWorld::Data& data, Ogre::SceneNode *cellNode,
                 const std::string& id, bool referenceable,
-                CSVWorld::PhysicsSystem *physics = NULL, bool forceBaseToZero = false);
+                boost::shared_ptr<CSVWorld::PhysicsSystem> physics = boost::shared_ptr<CSVWorld::PhysicsSystem> (),
+                bool forceBaseToZero = false);
             /// \param forceBaseToZero If this is a reference ignore the coordinates and place
             /// it at 0, 0, 0 instead.
 
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index a7a059ca0..9c42e471e 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -22,6 +22,7 @@
 
 #include "../widget/scenetooltoggle.hpp"
 #include "../widget/scenetoolmode.hpp"
+#include "../widget/scenetooltoggle2.hpp"
 #include "../world/physicssystem.hpp"
 
 #include "pathgridpoint.hpp"
@@ -113,7 +114,7 @@ bool CSVRender::PagedWorldspaceWidget::adjustCells()
             mCells.find (*iter)==mCells.end())
         {
             Cell *cell = new Cell (mDocument.getData(), getSceneManager(),
-                    iter->getId (mWorldspace), getPhysics());
+                    iter->getId (mWorldspace), mDocument.getPhysics());
             mCells.insert (std::make_pair (*iter, cell));
 
             float height = cell->getTerrainHeightAt(Ogre::Vector3(
@@ -214,6 +215,14 @@ void CSVRender::PagedWorldspaceWidget::mouseDoubleClickEvent (QMouseEvent *event
     WorldspaceWidget::mouseDoubleClickEvent(event);
 }
 
+void CSVRender::PagedWorldspaceWidget::addVisibilitySelectorButtons (
+    CSVWidget::SceneToolToggle2 *tool)
+{
+    WorldspaceWidget::addVisibilitySelectorButtons (tool);
+    tool->addButton (Element_Terrain, "Terrain");
+    tool->addButton (Element_Fog, "Fog", "", true);
+}
+
 void CSVRender::PagedWorldspaceWidget::addEditModeSelectorButtons (
     CSVWidget::SceneToolMode *tool)
 {
@@ -474,9 +483,12 @@ CSVRender::PagedWorldspaceWidget::~PagedWorldspaceWidget()
         delete iter->second;
     }
 
+    if(mOverlayMask)
+    {
     removeRenderTargetListener(mOverlayMask);
     delete mOverlayMask;
 }
+}
 
 void CSVRender::PagedWorldspaceWidget::useViewHint (const std::string& hint)
 {
diff --git a/apps/opencs/view/render/pagedworldspacewidget.hpp b/apps/opencs/view/render/pagedworldspacewidget.hpp
index fb52ee240..45e5dd8f7 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.hpp
@@ -8,9 +8,13 @@
 #include "worldspacewidget.hpp"
 #include "cell.hpp"
 
+namespace CSVWidget
+{
+   class SceneToolToggle;
+}
+
 namespace CSVRender
 {
-
     class TextOverlay;
     class OverlayMask;
 
@@ -87,6 +91,8 @@ namespace CSVRender
 
         protected:
 
+            virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
+
             virtual void addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool);
 
             virtual void updateOverlay();
diff --git a/apps/opencs/view/render/previewwidget.cpp b/apps/opencs/view/render/previewwidget.cpp
index f972c6361..da18e7c89 100644
--- a/apps/opencs/view/render/previewwidget.cpp
+++ b/apps/opencs/view/render/previewwidget.cpp
@@ -10,7 +10,7 @@
 CSVRender::PreviewWidget::PreviewWidget (CSMWorld::Data& data,
     const std::string& id, bool referenceable, QWidget *parent)
 : SceneWidget (parent), mData (data),
-  mObject (data, getSceneManager()->getRootSceneNode(), id, referenceable, NULL, true)
+  mObject (data, getSceneManager()->getRootSceneNode(), id, referenceable, boost::shared_ptr<CSVWorld::PhysicsSystem>(), true)
 {
     setNavigation (&mOrbit);
 
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index a1a8a8921..237bfabf5 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -15,6 +15,7 @@
 #include "../../model/world/tablemimedata.hpp"
 
 #include "../widget/scenetooltoggle.hpp"
+#include "../widget/scenetooltoggle2.hpp"
 
 #include "elements.hpp"
 
@@ -32,14 +33,6 @@ void CSVRender::UnpagedWorldspaceWidget::update()
     flagAsModified();
 }
 
-void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
-    CSVWidget::SceneToolToggle *tool)
-{
-    WorldspaceWidget::addVisibilitySelectorButtons (tool);
-
-    tool->addButton (":armor.png", Element_Fog, ":armor.png", "Fog");
-}
-
 CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string& cellId, CSMDoc::Document& document, QWidget* parent)
 : WorldspaceWidget (document, parent), mCellId (cellId)
 {
@@ -56,7 +49,7 @@ CSVRender::UnpagedWorldspaceWidget::UnpagedWorldspaceWidget (const std::string&
 
     update();
 
-    mCell.reset (new Cell (document.getData(), getSceneManager(), mCellId, getPhysics()));
+    mCell.reset (new Cell (document.getData(), getSceneManager(), mCellId, document.getPhysics()));
 }
 
 void CSVRender::UnpagedWorldspaceWidget::cellDataChanged (const QModelIndex& topLeft,
@@ -98,7 +91,7 @@ bool CSVRender::UnpagedWorldspaceWidget::handleDrop (const std::vector<CSMWorld:
         return false;
 
     mCellId = data.begin()->getId();
-    mCell.reset (new Cell (getDocument().getData(), getSceneManager(), mCellId, getPhysics()));
+    mCell.reset (new Cell (getDocument().getData(), getSceneManager(), mCellId, getDocument().getPhysics()));
 
     update();
     emit cellChanged(*data.begin());
@@ -160,6 +153,14 @@ void CSVRender::UnpagedWorldspaceWidget::referenceAdded (const QModelIndex& pare
             flagAsModified();
 }
 
+void CSVRender::UnpagedWorldspaceWidget::addVisibilitySelectorButtons (
+    CSVWidget::SceneToolToggle2 *tool)
+{
+    WorldspaceWidget::addVisibilitySelectorButtons (tool);
+    tool->addButton (Element_Terrain, "Terrain", "", true);
+    tool->addButton (Element_Fog, "Fog");
+}
+
 //void CSVRender::UnpagedWorldspaceWidget::pathgridAdded (const QModelIndex& parent,
 //    int start, int end)
 //{
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.hpp b/apps/opencs/view/render/unpagedworldspacewidget.hpp
index ee397d467..11bfaeca3 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.hpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.hpp
@@ -32,10 +32,6 @@ namespace CSVRender
 
             void update();
 
-        protected:
-
-            virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle *tool);
-
         public:
 
             UnpagedWorldspaceWidget (const std::string& cellId, CSMDoc::Document& document,
@@ -70,6 +66,10 @@ namespace CSVRender
 
             virtual std::string getStartupInstruction();
 
+        protected:
+
+            virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
+
         private slots:
 
             void cellDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight);
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index a162bc7c6..8418a32a6 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -14,17 +14,16 @@
 #include "../../model/world/idtable.hpp"
 
 #include "../widget/scenetoolmode.hpp"
-#include "../widget/scenetooltoggle.hpp"
+#include "../widget/scenetooltoggle2.hpp"
 #include "../widget/scenetoolrun.hpp"
 
-#include "../world/physicsmanager.hpp"
 #include "../world/physicssystem.hpp"
 
 #include "elements.hpp"
 #include "editmode.hpp"
 
 CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
-: SceneWidget (parent), mDocument(document), mSceneElements(0), mRun(0), mPhysics(0), mMouse(0),
+: SceneWidget (parent), mDocument(document), mSceneElements(0), mRun(0), mPhysics(boost::shared_ptr<CSVWorld::PhysicsSystem>()), mMouse(0),
   mInteractionMask (0)
 {
     setAcceptDrops(true);
@@ -67,9 +66,7 @@ CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidg
     //connect (pathgrids, SIGNAL (rowsAboutToBeRemoved (const QModelIndex&, int, int)),
         //this, SLOT (pathgridAboutToBeRemoved (const QModelIndex&, int, int)));
 
-    // associate WorldSpaceWidgets (and their SceneManagers) with Documents
-    // then create physics if there is a new document
-    mPhysics = CSVWorld::PhysicsManager::instance()->addSceneWidget(document, this);
+    mPhysics = document.getPhysics(); // create physics if one doesn't exist
     mPhysics->addSceneManager(getSceneManager(), this);
     mMouse = new MouseState(this);
 }
@@ -78,7 +75,6 @@ CSVRender::WorldspaceWidget::~WorldspaceWidget ()
 {
     delete mMouse;
     mPhysics->removeSceneManager(getSceneManager());
-    CSVWorld::PhysicsManager::instance()->removeSceneWidget(this);
 }
 
 void CSVRender::WorldspaceWidget::selectNavigationMode (const std::string& mode)
@@ -138,10 +134,10 @@ CSVWidget::SceneToolMode *CSVRender::WorldspaceWidget::makeNavigationSelector (
     return tool;
 }
 
-CSVWidget::SceneToolToggle *CSVRender::WorldspaceWidget::makeSceneVisibilitySelector (CSVWidget::SceneToolbar *parent)
+CSVWidget::SceneToolToggle2 *CSVRender::WorldspaceWidget::makeSceneVisibilitySelector (CSVWidget::SceneToolbar *parent)
 {
-    mSceneElements= new CSVWidget::SceneToolToggle (parent,
-        "Scene Element Visibility", ":placeholder");
+    mSceneElements = new CSVWidget::SceneToolToggle2 (parent,
+        "Scene Element Visibility", ":scenetoolbar/scene-view-c", ":scenetoolbar/scene-view-");
 
     addVisibilitySelectorButtons (mSceneElements);
 
@@ -183,7 +179,7 @@ CSVWidget::SceneToolRun *CSVRender::WorldspaceWidget::makeRunTool (
     std::sort (profiles.begin(), profiles.end());
 
     mRun = new CSVWidget::SceneToolRun (parent, "Run OpenMW from the current camera position",
-        ":placeholder", ":placeholder", profiles);
+        ":scenetoolbar/play", profiles);
 
     connect (mRun, SIGNAL (runRequest (const std::string&)),
         this, SLOT (runRequest (const std::string&)));
@@ -271,12 +267,11 @@ unsigned int CSVRender::WorldspaceWidget::getInteractionMask() const
 }
 
 void CSVRender::WorldspaceWidget::addVisibilitySelectorButtons (
-    CSVWidget::SceneToolToggle *tool)
+    CSVWidget::SceneToolToggle2 *tool)
 {
-    tool->addButton (":placeholder", Element_Reference, ":placeholder", "References");
-    tool->addButton (":placeholder", Element_Terrain, ":placeholder", "Terrain");
-    tool->addButton (":placeholder", Element_Water, ":placeholder", "Water");
-    tool->addButton (":placeholder", Element_Pathgrid, ":placeholder", "Pathgrid");
+    tool->addButton (Element_Reference, "References");
+    tool->addButton (Element_Water, "Water");
+    tool->addButton (Element_Pathgrid, "Pathgrid");
 }
 
 void CSVRender::WorldspaceWidget::addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool)
@@ -380,12 +375,6 @@ void CSVRender::WorldspaceWidget::updateOverlay()
 {
 }
 
-CSVWorld::PhysicsSystem *CSVRender::WorldspaceWidget::getPhysics()
-{
-    assert(mPhysics);
-    return mPhysics;
-}
-
 void CSVRender::WorldspaceWidget::mouseMoveEvent (QMouseEvent *event)
 {
     if(event->buttons() & Qt::RightButton)
diff --git a/apps/opencs/view/render/worldspacewidget.hpp b/apps/opencs/view/render/worldspacewidget.hpp
index da2d78d6c..efd2ee8c0 100644
--- a/apps/opencs/view/render/worldspacewidget.hpp
+++ b/apps/opencs/view/render/worldspacewidget.hpp
@@ -1,6 +1,8 @@
 #ifndef OPENCS_VIEW_WORLDSPACEWIDGET_H
 #define OPENCS_VIEW_WORLDSPACEWIDGET_H
 
+#include <boost/shared_ptr.hpp>
+
 #include "scenewidget.hpp"
 #include "mousestate.hpp"
 
@@ -18,7 +20,7 @@ namespace CSMWorld
 namespace CSVWidget
 {
     class SceneToolMode;
-    class SceneToolToggle;
+    class SceneToolToggle2;
     class SceneToolbar;
     class SceneToolRun;
 }
@@ -37,10 +39,10 @@ namespace CSVRender
             CSVRender::Navigation1st m1st;
             CSVRender::NavigationFree mFree;
             CSVRender::NavigationOrbit mOrbit;
-            CSVWidget::SceneToolToggle *mSceneElements;
+            CSVWidget::SceneToolToggle2 *mSceneElements;
             CSVWidget::SceneToolRun *mRun;
             CSMDoc::Document& mDocument;
-            CSVWorld::PhysicsSystem *mPhysics;
+            boost::shared_ptr<CSVWorld::PhysicsSystem> mPhysics;
             MouseState *mMouse;
             unsigned int mInteractionMask;
 
@@ -71,7 +73,7 @@ namespace CSVRender
 
             /// \attention The created tool is not added to the toolbar (via addTool). Doing
             /// that is the responsibility of the calling function.
-            CSVWidget::SceneToolToggle *makeSceneVisibilitySelector (
+            CSVWidget::SceneToolToggle2 *makeSceneVisibilitySelector (
                 CSVWidget::SceneToolbar *parent);
 
             /// \attention The created tool is not added to the toolbar (via addTool). Doing
@@ -107,7 +109,7 @@ namespace CSVRender
 
         protected:
 
-            virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle *tool);
+            virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool);
 
             virtual void addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool);
 
@@ -115,8 +117,6 @@ namespace CSVRender
 
             virtual void updateOverlay();
 
-            CSVWorld::PhysicsSystem *getPhysics();
-
             virtual void mouseMoveEvent (QMouseEvent *event);
             virtual void mousePressEvent (QMouseEvent *event);
             virtual void mouseReleaseEvent (QMouseEvent *event);
diff --git a/apps/opencs/view/tools/reportsubview.cpp b/apps/opencs/view/tools/reportsubview.cpp
index 5a2523789..df1a5298c 100644
--- a/apps/opencs/view/tools/reportsubview.cpp
+++ b/apps/opencs/view/tools/reportsubview.cpp
@@ -1,31 +1,15 @@
 
 #include "reportsubview.hpp"
 
-#include <QTableView>
-#include <QHeaderView>
-
-#include "../../model/tools/reportmodel.hpp"
-
-#include "../../view/world/idtypedelegate.hpp"
+#include "reporttable.hpp"
 
 CSVTools::ReportSubView::ReportSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
-: CSVDoc::SubView (id), mModel (document.getReport (id))
+: CSVDoc::SubView (id)
 {
-    setWidget (mTable = new QTableView (this));
-    mTable->setModel (mModel);
+    setWidget (mTable = new ReportTable (document, id, this));
 
-    mTable->horizontalHeader()->setResizeMode (QHeaderView::Interactive);
-    mTable->verticalHeader()->hide();
-    mTable->setSortingEnabled (true);
-    mTable->setSelectionBehavior (QAbstractItemView::SelectRows);
-    mTable->setSelectionMode (QAbstractItemView::ExtendedSelection);
-
-    mIdTypeDelegate = CSVWorld::IdTypeDelegateFactory().makeDelegate (
-        document, this);
-
-    mTable->setItemDelegateForColumn (0, mIdTypeDelegate);
-
-    connect (mTable, SIGNAL (doubleClicked (const QModelIndex&)), this, SLOT (show (const QModelIndex&)));
+    connect (mTable, SIGNAL (editRequest (const CSMWorld::UniversalId&, const std::string&)),
+        SIGNAL (focusId (const CSMWorld::UniversalId&, const std::string&)));
 }
 
 void CSVTools::ReportSubView::setEditLock (bool locked)
@@ -33,13 +17,7 @@ void CSVTools::ReportSubView::setEditLock (bool locked)
     // ignored. We don't change document state anyway.
 }
 
-void CSVTools::ReportSubView::updateUserSetting
-                                (const QString &name, const QStringList &list)
+void CSVTools::ReportSubView::updateUserSetting (const QString &name, const QStringList &list)
 {
-    mIdTypeDelegate->updateUserSetting (name, list);
-}
-
-void CSVTools::ReportSubView::show (const QModelIndex& index)
-{
-    focusId (mModel->getUniversalId (index.row()), "");
+    mTable->updateUserSetting (name, list);
 }
diff --git a/apps/opencs/view/tools/reportsubview.hpp b/apps/opencs/view/tools/reportsubview.hpp
index 9f6a4c1da..7e8a08e3c 100644
--- a/apps/opencs/view/tools/reportsubview.hpp
+++ b/apps/opencs/view/tools/reportsubview.hpp
@@ -11,27 +11,15 @@ namespace CSMDoc
     class Document;
 }
 
-namespace CSMTools
-{
-    class ReportModel;
-}
-
-namespace CSVWorld
-{
-    class CommandDelegate;
-}
-
 namespace CSVTools
 {
-    class Table;
+    class ReportTable;
 
     class ReportSubView : public CSVDoc::SubView
     {
             Q_OBJECT
 
-            CSMTools::ReportModel *mModel;
-            QTableView *mTable;
-            CSVWorld::CommandDelegate *mIdTypeDelegate;
+            ReportTable *mTable;
 
         public:
 
@@ -39,12 +27,7 @@ namespace CSVTools
 
             virtual void setEditLock (bool locked);
 
-            virtual void updateUserSetting
-                                        (const QString &, const QStringList &);
-
-        private slots:
-
-            void show (const QModelIndex& index);
+            virtual void updateUserSetting (const QString &, const QStringList &);
     };
 }
 
diff --git a/apps/opencs/view/tools/reporttable.cpp b/apps/opencs/view/tools/reporttable.cpp
new file mode 100644
index 000000000..4cd11925e
--- /dev/null
+++ b/apps/opencs/view/tools/reporttable.cpp
@@ -0,0 +1,136 @@
+
+#include "reporttable.hpp"
+
+#include <algorithm>
+
+#include <QHeaderView>
+#include <QAction>
+#include <QMenu>
+
+#include "../../model/tools/reportmodel.hpp"
+
+#include "../../view/world/idtypedelegate.hpp"
+
+void CSVTools::ReportTable::contextMenuEvent (QContextMenuEvent *event)
+{
+    QModelIndexList selectedRows = selectionModel()->selectedRows();
+
+    // create context menu
+    QMenu menu (this);
+
+    if (!selectedRows.empty())
+    {
+        menu.addAction (mShowAction);
+        menu.addAction (mRemoveAction);
+    }
+
+    menu.exec (event->globalPos());
+}
+
+void CSVTools::ReportTable::mouseMoveEvent (QMouseEvent *event)
+{
+    if (event->buttons() & Qt::LeftButton)
+        startDrag (*this);
+}
+
+void CSVTools::ReportTable::mouseDoubleClickEvent (QMouseEvent *event)
+{
+    Qt::KeyboardModifiers modifiers =
+        event->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier);
+
+    QModelIndex index = currentIndex();
+
+    selectionModel()->select (index,
+        QItemSelectionModel::Clear | QItemSelectionModel::Select | QItemSelectionModel::Rows);
+
+    switch (modifiers)
+    {
+        case 0:
+
+            event->accept();
+            showSelection();
+            break;
+
+        case Qt::ShiftModifier:
+
+            event->accept();
+            removeSelection();
+            break;
+
+        case Qt::ControlModifier:
+
+            event->accept();
+            showSelection();
+            removeSelection();
+            break;
+    }
+}
+
+CSVTools::ReportTable::ReportTable (CSMDoc::Document& document,
+    const CSMWorld::UniversalId& id, QWidget *parent)
+: CSVWorld::DragRecordTable (document, parent), mModel (document.getReport (id))
+{
+    horizontalHeader()->setResizeMode (QHeaderView::Interactive);
+    verticalHeader()->hide();
+    setSortingEnabled (true);
+    setSelectionBehavior (QAbstractItemView::SelectRows);
+    setSelectionMode (QAbstractItemView::ExtendedSelection);
+
+    setModel (mModel);
+    setColumnHidden (2, true);
+
+    mIdTypeDelegate = CSVWorld::IdTypeDelegateFactory().makeDelegate (
+        document, this);
+
+    setItemDelegateForColumn (0, mIdTypeDelegate);
+
+    mShowAction = new QAction (tr ("Show"), this);
+    connect (mShowAction, SIGNAL (triggered()), this, SLOT (showSelection()));
+    addAction (mShowAction);
+
+    mRemoveAction = new QAction (tr ("Remove from list"), this);
+    connect (mRemoveAction, SIGNAL (triggered()), this, SLOT (removeSelection()));
+    addAction (mRemoveAction);
+}
+
+std::vector<CSMWorld::UniversalId> CSVTools::ReportTable::getDraggedRecords() const
+{
+    std::vector<CSMWorld::UniversalId> ids;
+
+    QModelIndexList selectedRows = selectionModel()->selectedRows();
+
+    for (QModelIndexList::const_iterator iter (selectedRows.begin()); iter!=selectedRows.end();
+        ++iter)
+    {
+        ids.push_back (mModel->getUniversalId (iter->row()));
+    }
+
+    return ids;
+}
+
+void CSVTools::ReportTable::updateUserSetting (const QString& name, const QStringList& list)
+{
+    mIdTypeDelegate->updateUserSetting (name, list);
+}
+
+void CSVTools::ReportTable::showSelection()
+{
+    QModelIndexList selectedRows = selectionModel()->selectedRows();
+
+    for (QModelIndexList::const_iterator iter (selectedRows.begin()); iter!=selectedRows.end();
+        ++iter)
+        emit editRequest (mModel->getUniversalId (iter->row()), mModel->getHint (iter->row()));
+}
+
+void CSVTools::ReportTable::removeSelection()
+{
+    QModelIndexList selectedRows = selectionModel()->selectedRows();
+
+    std::reverse (selectedRows.begin(), selectedRows.end());
+
+    for (QModelIndexList::const_iterator iter (selectedRows.begin()); iter!=selectedRows.end();
+        ++iter)
+        mModel->removeRows (iter->row(), 1);
+
+    selectionModel()->clear();
+}
\ No newline at end of file
diff --git a/apps/opencs/view/tools/reporttable.hpp b/apps/opencs/view/tools/reporttable.hpp
new file mode 100644
index 000000000..7a5b232f9
--- /dev/null
+++ b/apps/opencs/view/tools/reporttable.hpp
@@ -0,0 +1,58 @@
+#ifndef CSV_TOOLS_REPORTTABLE_H
+#define CSV_TOOLS_REPORTTABLE_H
+
+#include "../world/dragrecordtable.hpp"
+
+class QAction;
+
+namespace CSMTools
+{
+    class ReportModel;
+}
+
+namespace CSVWorld
+{
+    class CommandDelegate;
+}
+
+namespace CSVTools
+{
+    class ReportTable : public CSVWorld::DragRecordTable
+    {
+            Q_OBJECT
+
+            CSMTools::ReportModel *mModel;
+            CSVWorld::CommandDelegate *mIdTypeDelegate;
+            QAction *mShowAction;
+            QAction *mRemoveAction;
+
+        private:
+
+            void contextMenuEvent (QContextMenuEvent *event);
+
+            void mouseMoveEvent (QMouseEvent *event);
+
+            virtual void mouseDoubleClickEvent (QMouseEvent *event);
+
+        public:
+
+            ReportTable (CSMDoc::Document& document, const CSMWorld::UniversalId& id,
+                QWidget *parent = 0);
+
+            virtual std::vector<CSMWorld::UniversalId> getDraggedRecords() const;
+
+            void updateUserSetting (const QString& name, const QStringList& list);
+
+        private slots:
+
+            void showSelection();
+
+            void removeSelection();
+
+        signals:
+
+            void editRequest (const CSMWorld::UniversalId& id, const std::string& hint);
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/widget/pushbutton.cpp b/apps/opencs/view/widget/pushbutton.cpp
index f23462585..d4e600794 100644
--- a/apps/opencs/view/widget/pushbutton.cpp
+++ b/apps/opencs/view/widget/pushbutton.cpp
@@ -72,6 +72,11 @@ CSVWidget::PushButton::PushButton (const QIcon& icon, Type type, const QString&
     QWidget *parent)
 : QPushButton (icon, "", parent), mKeepOpen (false), mType (type), mToolTip (tooltip)
 {
+    if (type==Type_Mode || type==Type_Toggle)
+    {
+        setCheckable (true);
+        connect (this, SIGNAL (toggled (bool)), this, SLOT (checkedStateChanged (bool)));
+    }
     setCheckable (type==Type_Mode || type==Type_Toggle);
     setExtendedToolTip();
 }
@@ -96,4 +101,9 @@ QString CSVWidget::PushButton::getBaseToolTip() const
 CSVWidget::PushButton::Type CSVWidget::PushButton::getType() const
 {
     return mType;
+}
+
+void CSVWidget::PushButton::checkedStateChanged (bool checked)
+{
+    setExtendedToolTip();
 }
\ No newline at end of file
diff --git a/apps/opencs/view/widget/pushbutton.hpp b/apps/opencs/view/widget/pushbutton.hpp
index 35062a137..09cf22757 100644
--- a/apps/opencs/view/widget/pushbutton.hpp
+++ b/apps/opencs/view/widget/pushbutton.hpp
@@ -53,6 +53,10 @@ namespace CSVWidget
             QString getBaseToolTip() const;
 
             Type getType() const;
+
+        private slots:
+
+            void checkedStateChanged (bool checked);
     };
 }
 
diff --git a/apps/opencs/view/widget/scenetoolrun.cpp b/apps/opencs/view/widget/scenetoolrun.cpp
index 92f3193fe..0c7a4b9f0 100644
--- a/apps/opencs/view/widget/scenetoolrun.cpp
+++ b/apps/opencs/view/widget/scenetoolrun.cpp
@@ -26,7 +26,7 @@ void CSVWidget::SceneToolRun::adjustToolTips()
 
 void CSVWidget::SceneToolRun::updateIcon()
 {
-    setIcon (QIcon (mSelected==mProfiles.end() ? mIconDisabled : mIcon));
+    setDisabled (mSelected==mProfiles.end());
 }
 
 void CSVWidget::SceneToolRun::updatePanel()
@@ -46,11 +46,11 @@ void CSVWidget::SceneToolRun::updatePanel()
 }
 
 CSVWidget::SceneToolRun::SceneToolRun (SceneToolbar *parent, const QString& toolTip,
-    const QString& icon, const QString& iconDisabled, const std::vector<std::string>& profiles)
+    const QString& icon, const std::vector<std::string>& profiles)
 : SceneTool (parent, Type_TopAction), mProfiles (profiles.begin(), profiles.end()),
-  mSelected (mProfiles.begin()), mToolTip (toolTip), mIcon (icon),
-  mIconDisabled (iconDisabled)
+  mSelected (mProfiles.begin()), mToolTip (toolTip)
 {
+    setIcon (QIcon (icon));
     updateIcon();
     adjustToolTips();
 
diff --git a/apps/opencs/view/widget/scenetoolrun.hpp b/apps/opencs/view/widget/scenetoolrun.hpp
index 4396c2288..dd035462f 100644
--- a/apps/opencs/view/widget/scenetoolrun.hpp
+++ b/apps/opencs/view/widget/scenetoolrun.hpp
@@ -19,8 +19,6 @@ namespace CSVWidget
             std::set<std::string> mProfiles;
             std::set<std::string>::iterator mSelected;
             QString mToolTip;
-            QString mIcon;
-            QString mIconDisabled;
             QFrame *mPanel;
             QTableWidget *mTable;
 
@@ -35,7 +33,7 @@ namespace CSVWidget
         public:
 
             SceneToolRun (SceneToolbar *parent, const QString& toolTip, const QString& icon,
-                const QString& iconDisabled, const std::vector<std::string>& profiles);
+                const std::vector<std::string>& profiles);
 
             virtual void showPanel (const QPoint& position);
 
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
new file mode 100644
index 000000000..313e519cb
--- /dev/null
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -0,0 +1,142 @@
+
+#include "scenetooltoggle2.hpp"
+
+#include <stdexcept>
+#include <sstream>
+
+#include <QHBoxLayout>
+#include <QFrame>
+#include <QIcon>
+#include <QPainter>
+
+#include "scenetoolbar.hpp"
+#include "pushbutton.hpp"
+
+void CSVWidget::SceneToolToggle2::adjustToolTip()
+{
+    QString toolTip = mToolTip;
+
+    toolTip += "<p>Currently enabled: ";
+
+    bool first = true;
+
+    for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
+        iter!=mButtons.end(); ++iter)
+        if (iter->first->isChecked())
+        {
+            if (!first)
+                toolTip += ", ";
+            else
+                first = false;
+
+            toolTip += iter->second.mName;
+        }
+
+    if (first)
+        toolTip += "none";
+
+    toolTip += "<p>(left click to alter selection)";
+
+    setToolTip (toolTip);
+}
+
+void CSVWidget::SceneToolToggle2::adjustIcon()
+{
+    std::ostringstream stream;
+    stream << mCompositeIcon << getSelection();
+    setIcon (QIcon (QString::fromUtf8 (stream.str().c_str())));
+}
+
+CSVWidget::SceneToolToggle2::SceneToolToggle2 (SceneToolbar *parent, const QString& toolTip,
+    const std::string& compositeIcon, const std::string& singleIcon)
+: SceneTool (parent), mCompositeIcon (compositeIcon), mSingleIcon (singleIcon),
+  mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize()), mToolTip (toolTip),
+  mFirst (0)
+{
+    mPanel = new QFrame (this, Qt::Popup);
+
+    mLayout = new QHBoxLayout (mPanel);
+
+    mLayout->setContentsMargins (QMargins (0, 0, 0, 0));
+
+    mPanel->setLayout (mLayout);
+}
+
+void CSVWidget::SceneToolToggle2::showPanel (const QPoint& position)
+{
+    mPanel->move (position);
+    mPanel->show();
+
+    if (mFirst)
+        mFirst->setFocus (Qt::OtherFocusReason);
+}
+
+void CSVWidget::SceneToolToggle2::addButton (unsigned int id,
+    const QString& name, const QString& tooltip, bool disabled)
+{
+    std::ostringstream stream;
+    stream << mSingleIcon << id;
+
+    PushButton *button = new PushButton (QIcon (QPixmap (stream.str().c_str())),
+        PushButton::Type_Toggle, tooltip.isEmpty() ? name: tooltip, mPanel);
+
+    button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
+    button->setIconSize (QSize (mIconSize, mIconSize));
+    button->setFixedSize (mButtonSize, mButtonSize);
+
+    if (disabled)
+        button->setDisabled (true);
+
+    mLayout->addWidget (button);
+
+    ButtonDesc desc;
+    desc.mId = id;
+    desc.mName = name;
+    desc.mIndex = mButtons.size();
+
+    mButtons.insert (std::make_pair (button, desc));
+
+    connect (button, SIGNAL (clicked()), this, SLOT (selected()));
+
+    if (mButtons.size()==1 && !disabled)
+        mFirst = button;
+}
+
+unsigned int CSVWidget::SceneToolToggle2::getSelection() const
+{
+    unsigned int selection = 0;
+
+    for (std::map<PushButton *, ButtonDesc>::const_iterator iter (mButtons.begin());
+        iter!=mButtons.end(); ++iter)
+        if (iter->first->isChecked())
+            selection |= iter->second.mId;
+
+    return selection;
+}
+
+void CSVWidget::SceneToolToggle2::setSelection (unsigned int selection)
+{
+    for (std::map<PushButton *, ButtonDesc>::iterator iter (mButtons.begin());
+        iter!=mButtons.end(); ++iter)
+        iter->first->setChecked (selection & iter->second.mId);
+
+    adjustToolTip();
+    adjustIcon();
+}
+
+void CSVWidget::SceneToolToggle2::selected()
+{
+    std::map<PushButton *, ButtonDesc>::const_iterator iter =
+        mButtons.find (dynamic_cast<PushButton *> (sender()));
+
+    if (iter!=mButtons.end())
+    {
+        if (!iter->first->hasKeepOpen())
+            mPanel->hide();
+
+        adjustToolTip();
+        adjustIcon();
+
+        emit selectionChanged();
+    }
+}
diff --git a/apps/opencs/view/widget/scenetooltoggle2.hpp b/apps/opencs/view/widget/scenetooltoggle2.hpp
new file mode 100644
index 000000000..0bae780f9
--- /dev/null
+++ b/apps/opencs/view/widget/scenetooltoggle2.hpp
@@ -0,0 +1,76 @@
+#ifndef CSV_WIDGET_SCENETOOL_TOGGLE2_H
+#define CSV_WIDGET_SCENETOOL_TOGGLE2_H
+
+#include "scenetool.hpp"
+
+#include <map>
+
+class QHBoxLayout;
+class QRect;
+
+namespace CSVWidget
+{
+    class SceneToolbar;
+    class PushButton;
+
+    ///< \brief Multi-Toggle tool
+    ///
+    /// Top level button is using predefined icons instead building a composite icon.
+    class SceneToolToggle2 : public SceneTool
+    {
+            Q_OBJECT
+
+            struct ButtonDesc
+            {
+                unsigned int mId;
+                QString mName;
+                int mIndex;
+            };
+
+            std::string mCompositeIcon;
+            std::string mSingleIcon;
+            QWidget *mPanel;
+            QHBoxLayout *mLayout;
+            std::map<PushButton *, ButtonDesc> mButtons; // widget, id
+            int mButtonSize;
+            int mIconSize;
+            QString mToolTip;
+            PushButton *mFirst;
+
+            void adjustToolTip();
+
+            void adjustIcon();
+
+        public:
+
+            /// The top level icon is compositeIcon + sum of bitpatterns for active buttons (in
+            /// decimal)
+            ///
+            /// The icon for individual toggle buttons is signleIcon + bitmask for button (in
+            /// decimal)
+            SceneToolToggle2 (SceneToolbar *parent, const QString& toolTip,
+                const std::string& compositeIcon, const std::string& singleIcon);
+
+            virtual void showPanel (const QPoint& position);
+
+            /// \attention After the last button has been added, setSelection must be called at
+            /// least once to finalise the layout.
+            void addButton (unsigned int id,
+                const QString& name, const QString& tooltip = "", bool disabled = false);
+
+            unsigned int getSelection() const;
+
+            /// \param or'ed button IDs. IDs that do not exist will be ignored.
+            void setSelection (unsigned int selection);
+
+        signals:
+
+            void selectionChanged();
+
+        private slots:
+
+            void selected();
+    };
+}
+
+#endif
diff --git a/apps/opencs/view/world/physicsmanager.cpp b/apps/opencs/view/world/physicsmanager.cpp
deleted file mode 100644
index fa8db9e1e..000000000
--- a/apps/opencs/view/world/physicsmanager.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "physicsmanager.hpp"
-
-#include <iostream>
-
-#include <openengine/bullet/BulletShapeLoader.h>
-
-#include "../render/worldspacewidget.hpp"
-#include "physicssystem.hpp"
-
-namespace CSVWorld
-{
-    PhysicsManager *PhysicsManager::mPhysicsManagerInstance = 0;
-
-    PhysicsManager::PhysicsManager()
-    {
-        assert(!mPhysicsManagerInstance);
-        mPhysicsManagerInstance = this;
-    }
-
-    PhysicsManager::~PhysicsManager()
-    {
-        std::map<CSMDoc::Document *, CSVWorld::PhysicsSystem *>::iterator iter = mPhysics.begin();
-        for(; iter != mPhysics.end(); ++iter)
-            delete iter->second; // shouldn't be any left but just in case
-    }
-
-    PhysicsManager *PhysicsManager::instance()
-    {
-        assert(mPhysicsManagerInstance);
-        return mPhysicsManagerInstance;
-    }
-
-    // create a physics instance per document, called from CSVDoc::View() to get Document*
-    void PhysicsManager::setupPhysics(CSMDoc::Document *doc)
-    {
-        std::map<CSMDoc::Document *, std::list<CSVRender::SceneWidget *> >::iterator iter = mSceneWidgets.find(doc);
-        if(iter == mSceneWidgets.end())
-        {
-            mSceneWidgets[doc] = std::list<CSVRender::SceneWidget *> (); // zero elements
-            mPhysics[doc] = new PhysicsSystem();
-        }
-    }
-
-    // destroy physics, called from CSVDoc::ViewManager
-    void PhysicsManager::removeDocument(CSMDoc::Document *doc)
-    {
-        std::map<CSMDoc::Document *, CSVWorld::PhysicsSystem *>::iterator iter = mPhysics.find(doc);
-        if(iter != mPhysics.end())
-        {
-            delete iter->second;
-            mPhysics.erase(iter);
-        }
-
-        std::map<CSMDoc::Document *, std::list<CSVRender::SceneWidget *> >::iterator it = mSceneWidgets.find(doc);
-        if(it != mSceneWidgets.end())
-        {
-            mSceneWidgets.erase(it);
-        }
-
-        // cleanup global resources used by OEngine
-        if(mPhysics.empty())
-        {
-            delete OEngine::Physic::BulletShapeManager::getSingletonPtr();
-        }
-    }
-
-    // called from CSVRender::WorldspaceWidget() to get widgets' association with Document&
-    PhysicsSystem *PhysicsManager::addSceneWidget(CSMDoc::Document &doc, CSVRender::WorldspaceWidget *widget)
-    {
-        CSVRender::SceneWidget *sceneWidget = static_cast<CSVRender::SceneWidget *>(widget);
-
-        std::map<CSMDoc::Document *, std::list<CSVRender::SceneWidget *> >::iterator iter = mSceneWidgets.begin();
-        for(; iter != mSceneWidgets.end(); ++iter)
-        {
-            if((*iter).first == &doc)
-            {
-                (*iter).second.push_back(sceneWidget);
-                return mPhysics[(*iter).first];  // TODO: consider using shared_ptr instead
-            }
-        }
-
-        throw std::runtime_error("No physics system found for the given document.");
-    }
-
-    // deprecated by removeDocument() and may be deleted in future code updates
-    // however there may be some value in removing the deleted scene widgets from the
-    // list so that the list does not grow forever
-    void PhysicsManager::removeSceneWidget(CSVRender::WorldspaceWidget *widget)
-    {
-        CSVRender::SceneWidget *sceneWidget = static_cast<CSVRender::SceneWidget *>(widget);
-
-        std::map<CSMDoc::Document *, std::list<CSVRender::SceneWidget *> >::iterator iter = mSceneWidgets.begin();
-        for(; iter != mSceneWidgets.end(); ++iter)
-        {
-            std::list<CSVRender::SceneWidget *>::iterator itWidget = (*iter).second.begin();
-            for(; itWidget != (*iter).second.end(); ++itWidget)
-            {
-                if((*itWidget) == sceneWidget)
-                {
-                    (*iter).second.erase(itWidget);
-
-                    //if((*iter).second.empty()) // last one for the document
-                        // NOTE: do not delete physics until the document itself is closed
-
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/apps/opencs/view/world/physicsmanager.hpp b/apps/opencs/view/world/physicsmanager.hpp
deleted file mode 100644
index e17c9ac84..000000000
--- a/apps/opencs/view/world/physicsmanager.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef CSV_WORLD_PHYSICSMANAGER_H
-#define CSV_WORLD_PHYSICSMANAGER_H
-
-#include <map>
-#include <list>
-
-namespace Ogre
-{
-    class SceneManager;
-}
-
-namespace CSMDoc
-{
-    class Document;
-}
-
-namespace CSVRender
-{
-    class WorldspaceWidget;
-    class SceneWidget;
-}
-
-namespace CSVWorld
-{
-    class PhysicsSystem;
-}
-
-namespace CSVWorld
-{
-    class PhysicsManager
-    {
-            static PhysicsManager *mPhysicsManagerInstance;
-
-            std::map<CSMDoc::Document *, std::list<CSVRender::SceneWidget *> > mSceneWidgets;
-            std::map<CSMDoc::Document *, CSVWorld::PhysicsSystem *> mPhysics;
-
-        public:
-
-            PhysicsManager();
-            ~PhysicsManager();
-
-            static PhysicsManager *instance();
-
-            void setupPhysics(CSMDoc::Document *);
-
-            PhysicsSystem *addSceneWidget(CSMDoc::Document &doc, CSVRender::WorldspaceWidget *widget);
-
-            void removeSceneWidget(CSVRender::WorldspaceWidget *widget);
-
-            void removeDocument(CSMDoc::Document *doc);
-    };
-}
-
-#endif // CSV_WORLD_PHYSICSMANAGER_H
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index 5ddefcc6b..3fdf2f6e5 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -20,6 +20,7 @@
 #include "../widget/scenetoolbar.hpp"
 #include "../widget/scenetoolmode.hpp"
 #include "../widget/scenetooltoggle.hpp"
+#include "../widget/scenetooltoggle2.hpp"
 #include "../widget/scenetoolrun.hpp"
 
 #include "tablebottombox.hpp"
@@ -109,7 +110,7 @@ CSVWidget::SceneToolbar* CSVWorld::SceneSubView::makeToolbar (CSVRender::Worldsp
     CSVWidget::SceneToolMode *lightingTool = widget->makeLightingSelector (toolbar);
     toolbar->addTool (lightingTool);
 
-    CSVWidget::SceneToolToggle *sceneVisibilityTool =
+    CSVWidget::SceneToolToggle2 *sceneVisibilityTool =
         widget->makeSceneVisibilitySelector (toolbar);
     toolbar->addTool (sceneVisibilityTool);
 
diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp
index 22d8e7e51..9b50a61f8 100644
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@@ -47,6 +47,32 @@ void CSVWorld::ScriptSubView::setEditLock (bool locked)
     mEditor->setReadOnly (locked);
 }
 
+void CSVWorld::ScriptSubView::useHint (const std::string& hint)
+{
+    if (hint.empty())
+        return;
+
+    if (hint[0]=='l')
+    {
+        std::istringstream stream (hint.c_str()+1);
+
+        char ignore;
+        int line;
+        int column;
+
+        if (stream >> ignore >> line >> column)
+        {
+            QTextCursor cursor = mEditor->textCursor();
+
+            cursor.movePosition (QTextCursor::Start);
+            if (cursor.movePosition (QTextCursor::Down, QTextCursor::MoveAnchor, line))
+                cursor.movePosition (QTextCursor::Right, QTextCursor::MoveAnchor, column);
+
+            mEditor->setTextCursor (cursor);
+        }
+    }
+}
+
 void CSVWorld::ScriptSubView::textChanged()
 {
     if (mEditor->isChangeLocked())
diff --git a/apps/opencs/view/world/scriptsubview.hpp b/apps/opencs/view/world/scriptsubview.hpp
index 77127d9be..16ffc7b80 100644
--- a/apps/opencs/view/world/scriptsubview.hpp
+++ b/apps/opencs/view/world/scriptsubview.hpp
@@ -34,6 +34,8 @@ namespace CSVWorld
 
             virtual void setEditLock (bool locked);
 
+            virtual void useHint (const std::string& hint);
+
         public slots:
 
             void textChanged();
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index f8847abfc..c65e12c60 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -2,6 +2,8 @@
 #include "util.hpp"
 
 #include <stdexcept>
+#include <climits>
+#include <cfloat>
 
 #include <QUndoStack>
 #include <QMetaProperty>
@@ -157,16 +159,24 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
             return new QLineEdit(parent);
 
         case CSMWorld::ColumnBase::Display_Integer:
-
-            return new QSpinBox(parent);
+        {
+            QSpinBox *sb = new QSpinBox(parent);
+            sb->setRange(INT_MIN, INT_MAX);
+            return sb;
+        }
 
         case CSMWorld::ColumnBase::Display_Var:
 
             return new QLineEdit(parent);
 
         case CSMWorld::ColumnBase::Display_Float:
-
-            return new QDoubleSpinBox(parent);
+        {
+            QDoubleSpinBox *dsb = new QDoubleSpinBox(parent);
+            dsb->setRange(FLT_MIN, FLT_MAX);
+            dsb->setSingleStep(0.01f);
+            dsb->setDecimals(3);
+            return dsb;
+        }
 
         case CSMWorld::ColumnBase::Display_LongString:
         {
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 2eebb8c28..d7b23c096 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -79,8 +79,7 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
 {
     try
     {
-        float frametime = std::min(evt.timeSinceLastFrame, 0.2f);
-
+        float frametime = evt.timeSinceLastFrame;
         mEnvironment.setFrameDuration (frametime);
 
         // update input
@@ -478,9 +477,15 @@ void OMW::Engine::go()
     }
 
     // Start the main rendering loop
+    Ogre::Timer timer;
     while (!MWBase::Environment::get().getStateManager()->hasQuitRequest())
-        Ogre::Root::getSingleton().renderOneFrame();
+    {
+        float dt = timer.getMilliseconds()/1000.f;
+        dt = std::min(dt, 0.2f);
 
+        timer.reset();
+        Ogre::Root::getSingleton().renderOneFrame(dt);
+    }
     // Save user settings
     settings.saveUser(settingspath);
 
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index bfc4f3b33..d4f1afa32 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -330,11 +330,11 @@ namespace MWBase
             virtual void pinWindow (MWGui::GuiWindow window) = 0;
 
             /// Fade the screen in, over \a time seconds
-            virtual void fadeScreenIn(const float time) = 0;
+            virtual void fadeScreenIn(const float time, bool clearQueue=true) = 0;
             /// Fade the screen out to black, over \a time seconds
-            virtual void fadeScreenOut(const float time) = 0;
+            virtual void fadeScreenOut(const float time, bool clearQueue=true) = 0;
             /// Fade the screen to a specified percentage of black, over \a time seconds
-            virtual void fadeScreenTo(const int percent, const float time) = 0;
+            virtual void fadeScreenTo(const int percent, const float time, bool clearQueue=true) = 0;
             /// Darken the screen to a specified percentage
             virtual void setBlindness(const int percent) = 0;
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index c1a889913..2dd135f3d 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -279,6 +279,7 @@ namespace MWBase
             ///< Attempt to fix position so that the Ptr is no longer inside collision geometry.
 
             virtual void deleteObject (const MWWorld::Ptr& ptr) = 0;
+            virtual void undeleteObject (const MWWorld::Ptr& ptr) = 0;
 
             virtual void moveObject (const MWWorld::Ptr& ptr, float x, float y, float z) = 0;
 
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 179070aed..59e51e461 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -7,6 +7,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/failedaction.hpp"
@@ -21,7 +22,7 @@
 
 #include "../mwgui/tooltips.hpp"
 
-#include "../mwrender/objects.hpp"
+#include "../mwrender/actors.hpp"
 #include "../mwrender/renderinginterface.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
@@ -87,7 +88,8 @@ namespace MWClass
     {
         const std::string model = getModel(ptr);
         if (!model.empty()) {
-            renderingInterface.getObjects().insertModel(ptr, model);
+            MWRender::Actors& actors = renderingInterface.getActors();
+            actors.insertActivator(ptr);
         }
     }
 
@@ -96,6 +98,7 @@ namespace MWClass
         const std::string model = getModel(ptr);
         if(!model.empty())
             physics.addObject(ptr);
+        MWBase::Environment::get().getMechanicsManager()->add(ptr);
     }
 
     std::string Container::getModel(const MWWorld::Ptr &ptr) const
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index d3f86c03b..641edcc83 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -969,6 +969,9 @@ namespace MWClass
 
     float Npc::getJump(const MWWorld::Ptr &ptr) const
     {
+        if(getEncumbrance(ptr) > getCapacity(ptr))
+            return 0.f;
+
         const NpcCustomData *npcdata = static_cast<const NpcCustomData*>(ptr.getRefData().getCustomData());
         const GMST& gmst = getGmst();
         const MWMechanics::MagicEffects &mageffects = npcdata->mNpcStats.getMagicEffects();
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 6526b200f..eb548d596 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -533,9 +533,11 @@ namespace MWGui
 
         if (mGoodbye)
         {
+            Goodbye* link = new Goodbye();
+            mLinks.push_back(link);
             std::string goodbye = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sGoodbye")->getString();
             BookTypesetter::Style* questionStyle = typesetter->createHotStyle(body, linkNormal, linkHot, linkActive,
-                                                                              TypesetBook::InteractiveId(mLinks.back()));
+                                                                              TypesetBook::InteractiveId(link));
             typesetter->lineBreak();
             typesetter->write(questionStyle, to_utf8_span(goodbye.c_str()));
         }
@@ -654,7 +656,6 @@ namespace MWGui
 
     void DialogueWindow::goodbye()
     {
-        mLinks.push_back(new Goodbye());
         mGoodbye = true;
         mEnabled = false;
         updateHistory();
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index 2bfc4f141..bcb766f8f 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -128,11 +128,17 @@ namespace MWGui
         setRaceId(proto.mRace);
         recountParts();
 
-        std::string index = proto.mHead.substr(proto.mHead.size() - 2, 2);
-        mFaceIndex = boost::lexical_cast<int>(index) - 1;
+        for (unsigned int i=0; i<mAvailableHeads.size(); ++i)
+        {
+            if (mAvailableHeads[i] == proto.mHead)
+                mFaceIndex = i;
+        }
 
-        index = proto.mHair.substr(proto.mHair.size() - 2, 2);
-        mHairIndex = boost::lexical_cast<int>(index) - 1;
+        for (unsigned int i=0; i<mAvailableHairs.size(); ++i)
+        {
+            if (mAvailableHairs[i] == proto.mHair)
+                mHairIndex = i;
+        }
 
         mPreviewImage->setImageTexture (textureName);
 
@@ -162,6 +168,9 @@ namespace MWGui
 
     void RaceDialog::close()
     {
+        mPreviewImage->setImageTexture("");
+        const std::string textureName = "CharacterHeadPreview";
+        MyGUI::RenderManager::getInstance().destroyTexture(MyGUI::RenderManager::getInstance().getTexture(textureName));
         mPreview.reset(NULL);
     }
 
@@ -304,7 +313,15 @@ namespace MWGui
         record.mHead = mAvailableHeads[mFaceIndex];
         record.mHair = mAvailableHairs[mHairIndex];
 
-        mPreview->setPrototype(record);
+        try
+        {
+            mPreview->setPrototype(record);
+        }
+        catch (std::exception& e)
+        {
+            std::cerr << "Error creating preview: " << e.what() << std::endl;
+        }
+
         mPreviewDirty = true;
     }
 
diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp
index 948423a35..8ef0a331a 100644
--- a/apps/openmw/mwgui/settingswindow.cpp
+++ b/apps/openmw/mwgui/settingswindow.cpp
@@ -9,6 +9,8 @@
 
 #include <SDL_video.h>
 
+#include <components/widgets/sharedstatebutton.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -454,16 +456,21 @@ namespace MWGui
 
             std::string binding = MWBase::Environment::get().getInputManager()->getActionBindingName (*it);
 
-            MyGUI::TextBox* leftText = mControlsBox->createWidget<MyGUI::TextBox>("SandText", MyGUI::IntCoord(0,curH,w,h), MyGUI::Align::Default);
+            Gui::SharedStateButton* leftText = mControlsBox->createWidget<Gui::SharedStateButton>("SandTextButton", MyGUI::IntCoord(0,curH,w,h), MyGUI::Align::Default);
             leftText->setCaptionWithReplacing(desc);
 
-            MyGUI::Button* rightText = mControlsBox->createWidget<MyGUI::Button>("SandTextButton", MyGUI::IntCoord(0,curH,w,h), MyGUI::Align::Default);
+            Gui::SharedStateButton* rightText = mControlsBox->createWidget<Gui::SharedStateButton>("SandTextButton", MyGUI::IntCoord(0,curH,w,h), MyGUI::Align::Default);
             rightText->setCaptionWithReplacing(binding);
             rightText->setTextAlign (MyGUI::Align::Right);
             rightText->setUserData(*it); // save the action id for callbacks
             rightText->eventMouseButtonClick += MyGUI::newDelegate(this, &SettingsWindow::onRebindAction);
             rightText->eventMouseWheel += MyGUI::newDelegate(this, &SettingsWindow::onInputTabMouseWheel);
             curH += h;
+
+            Gui::ButtonGroup group;
+            group.push_back(leftText);
+            group.push_back(rightText);
+            Gui::SharedStateButton::createButtonGroup(group);
         }
 
         // Canvas size must be expressed with VScroll disabled, otherwise MyGUI would expand the scroll area when the scrollbar is hidden
diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp
index 97ebbcde2..7904c249a 100644
--- a/apps/openmw/mwgui/spellwindow.cpp
+++ b/apps/openmw/mwgui/spellwindow.cpp
@@ -3,6 +3,8 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 
+#include <components/widgets/sharedstatebutton.hpp>
+
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
@@ -177,7 +179,7 @@ namespace MWGui
         for (std::vector<std::string>::const_iterator it = spellList.begin(); it != spellList.end(); ++it)
         {
             const ESM::Spell* spell = esmStore.get<ESM::Spell>().find(*it);
-            MyGUI::Button* t = mSpellView->createWidget<MyGUI::Button>("SandTextButton",
+            Gui::SharedStateButton* t = mSpellView->createWidget<Gui::SharedStateButton>("SandTextButton",
                 MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
             t->setCaption(spell->mName);
             t->setTextAlign(MyGUI::Align::Left);
@@ -185,20 +187,28 @@ namespace MWGui
             t->setUserString("Spell", *it);
             t->eventMouseWheel += MyGUI::newDelegate(this, &SpellWindow::onMouseWheel);
             t->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellWindow::onSpellSelected);
-            t->setStateSelected(*it == MWBase::Environment::get().getWindowManager()->getSelectedSpell());
 
             // cost / success chance
-            MyGUI::Button* costChance = mSpellView->createWidget<MyGUI::Button>("SandTextButton",
+            Gui::SharedStateButton* costChance = mSpellView->createWidget<Gui::SharedStateButton>("SandTextButton",
                 MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
             std::string cost = boost::lexical_cast<std::string>(spell->mData.mCost);
             std::string chance = boost::lexical_cast<std::string>(int(MWMechanics::getSpellSuccessChance(*it, player)));
             costChance->setCaption(cost + "/" + chance);
             costChance->setTextAlign(MyGUI::Align::Right);
-            costChance->setNeedMouseFocus(false);
-            costChance->setStateSelected(*it == MWBase::Environment::get().getWindowManager()->getSelectedSpell());
+            costChance->setUserString("ToolTipType", "Spell");
+            costChance->setUserString("Spell", *it);
+            costChance->eventMouseWheel += MyGUI::newDelegate(this, &SpellWindow::onMouseWheel);
+            costChance->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellWindow::onSpellSelected);
 
             t->setSize(mWidth-12-costChance->getTextSize().width, t->getHeight());
 
+            Gui::ButtonGroup group;
+            group.push_back(t);
+            group.push_back(costChance);
+            Gui::SharedStateButton::createButtonGroup(group);
+
+            t->setStateSelected(*it == MWBase::Environment::get().getWindowManager()->getSelectedSpell());
+
             mHeight += spellHeight;
         }
 
@@ -224,7 +234,7 @@ namespace MWGui
                 }
             }
 
-            MyGUI::Button* t = mSpellView->createWidget<MyGUI::Button>(equipped ? "SandTextButton" : "SpellTextUnequipped",
+            Gui::SharedStateButton* t = mSpellView->createWidget<Gui::SharedStateButton>(equipped ? "SandTextButton" : "SpellTextUnequipped",
                 MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
             t->setCaption(item.getClass().getName(item));
             t->setTextAlign(MyGUI::Align::Left);
@@ -233,12 +243,9 @@ namespace MWGui
             t->setUserString("Equipped", equipped ? "true" : "false");
             t->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellWindow::onEnchantedItemSelected);
             t->eventMouseWheel += MyGUI::newDelegate(this, &SpellWindow::onMouseWheel);
-            if (store.getSelectedEnchantItem() != store.end())
-                t->setStateSelected(item == *store.getSelectedEnchantItem());
-
 
             // cost / charge
-            MyGUI::Button* costCharge = mSpellView->createWidget<MyGUI::Button>(equipped ? "SandTextButton" : "SpellTextUnequipped",
+            Gui::SharedStateButton* costCharge = mSpellView->createWidget<Gui::SharedStateButton>(equipped ? "SandTextButton" : "SpellTextUnequipped",
                 MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top);
 
             float enchantCost = enchant->mData.mCost;
@@ -257,11 +264,22 @@ namespace MWGui
                 charge = "100";
             }
 
+
+            costCharge->setUserData(item);
+            costCharge->setUserString("ToolTipType", "ItemPtr");
+            costCharge->setUserString("Equipped", equipped ? "true" : "false");
+            costCharge->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellWindow::onEnchantedItemSelected);
+            costCharge->eventMouseWheel += MyGUI::newDelegate(this, &SpellWindow::onMouseWheel);
             costCharge->setCaption(cost + "/" + charge);
             costCharge->setTextAlign(MyGUI::Align::Right);
-            costCharge->setNeedMouseFocus(false);
+
+            Gui::ButtonGroup group;
+            group.push_back(t);
+            group.push_back(costCharge);
+            Gui::SharedStateButton::createButtonGroup(group);
+
             if (store.getSelectedEnchantItem() != store.end())
-                costCharge->setStateSelected(item == *store.getSelectedEnchantItem());
+                t->setStateSelected(item == *store.getSelectedEnchantItem());
 
             t->setSize(mWidth-12-costCharge->getTextSize().width, t->getHeight());
 
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index 4608010ac..396c8fa48 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -633,8 +633,8 @@ namespace MWGui
         MWWorld::Store<ESM::Skill>::iterator it = skills.begin();
         for (; it != skills.end(); ++it)
         {
-            if (it->mData.mSpecialization == specId)
-                specText += std::string("\n#{") + ESM::Skill::sSkillNameIds[it->mIndex] + "}";
+            if (it->second.mData.mSpecialization == specId)
+                specText += std::string("\n#{") + ESM::Skill::sSkillNameIds[it->first] + "}";
         }
         widget->setUserString("Caption_CenteredCaptionText", specText);
         widget->setUserString("ToolTipLayout", "TextWithCenteredCaptionToolTip");
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 6ab8b94c5..48f28d300 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1748,21 +1748,24 @@ namespace MWGui
         updateVisible();
     }
 
-    void WindowManager::fadeScreenIn(const float time)
+    void WindowManager::fadeScreenIn(const float time, bool clearQueue)
     {
-        mScreenFader->clearQueue();
+        if (clearQueue)
+            mScreenFader->clearQueue();
         mScreenFader->fadeOut(time);
     }
 
-    void WindowManager::fadeScreenOut(const float time)
+    void WindowManager::fadeScreenOut(const float time, bool clearQueue)
     {
-        mScreenFader->clearQueue();
+        if (clearQueue)
+            mScreenFader->clearQueue();
         mScreenFader->fadeIn(time);
     }
 
-    void WindowManager::fadeScreenTo(const int percent, const float time)
+    void WindowManager::fadeScreenTo(const int percent, const float time, bool clearQueue)
     {
-        mScreenFader->clearQueue();
+        if (clearQueue)
+            mScreenFader->clearQueue();
         mScreenFader->fadeTo(percent, time);
     }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index aa5bd0fc9..94d8a93db 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -325,11 +325,11 @@ namespace MWGui
     virtual void pinWindow (MWGui::GuiWindow window);
 
     /// Fade the screen in, over \a time seconds
-    virtual void fadeScreenIn(const float time);
+    virtual void fadeScreenIn(const float time, bool clearQueue);
     /// Fade the screen out to black, over \a time seconds
-    virtual void fadeScreenOut(const float time);
+    virtual void fadeScreenOut(const float time, bool clearQueue);
     /// Fade the screen to a specified percentage of black, over \a time seconds
-    virtual void fadeScreenTo(const int percent, const float time);
+    virtual void fadeScreenTo(const int percent, const float time, bool clearQueue);
     /// Darken the screen to a specified percentage
     virtual void setBlindness(const int percent);
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 29b166a6a..b0d2bfeff 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -190,14 +190,12 @@ namespace MWInput
 
         int action = channel->getNumber();
 
-        if (action == A_Use)
+        if (mControlSwitch["playercontrols"])
         {
-            mPlayer->getPlayer().getClass().getCreatureStats(mPlayer->getPlayer()).setAttackingOrSpell(currentValue);
-        }
-
-        if (action == A_Jump)
-        {
-            mAttemptJump = (currentValue == 1.0 && previousValue == 0.0);
+            if (action == A_Use)
+                mPlayer->getPlayer().getClass().getCreatureStats(mPlayer->getPlayer()).setAttackingOrSpell(currentValue);
+            else if (action == A_Jump)
+                mAttemptJump = (currentValue == 1.0 && previousValue == 0.0);
         }
 
         if (currentValue == 1)
@@ -373,6 +371,7 @@ namespace MWInput
                 {
                     mPlayer->setUpDown (1);
                     triedToMove = true;
+                    mOverencumberedMessageDelay = 0.f;
                 }
 
                 if (mAlwaysRunActive)
@@ -603,7 +602,7 @@ namespace MWInput
             MyGUI::InputManager::getInstance().injectMouseMove( int(mMouseX), int(mMouseY), mMouseWheel);
         }
 
-        if (mMouseLookEnabled)
+        if (mMouseLookEnabled && !mControlsDisabled)
         {
             resetIdleTime();
 
@@ -622,10 +621,12 @@ namespace MWInput
                 mPlayer->pitch(y);
             }
 
-            if (arg.zrel && mControlSwitch["playerviewswitch"]) //Check to make sure you are allowed to zoomout and there is a change
+            if (arg.zrel && mControlSwitch["playerviewswitch"] && mControlSwitch["playercontrols"]) //Check to make sure you are allowed to zoomout and there is a change
             {
                 MWBase::Environment::get().getWorld()->changeVanityModeScale(arg.zrel);
-                MWBase::Environment::get().getWorld()->setCameraDistance(arg.zrel, true, true);
+
+                if (Settings::Manager::getBool("allow third person zoom", "Input"))
+                    MWBase::Environment::get().getWorld()->setCameraDistance(arg.zrel, true, true);
             }
         }
     }
@@ -680,7 +681,7 @@ namespace MWInput
         if (MWBase::Environment::get().getWindowManager()->isGuiMode()) return;
 
         // Not allowed before the magic window is accessible
-        if (!mControlSwitch["playermagic"])
+        if (!mControlSwitch["playermagic"] || !mControlSwitch["playercontrols"])
             return;
 
         // Not allowed if no spell selected
@@ -701,7 +702,7 @@ namespace MWInput
         if (MWBase::Environment::get().getWindowManager()->isGuiMode()) return;
 
         // Not allowed before the inventory window is accessible
-        if (!mControlSwitch["playerfighting"])
+        if (!mControlSwitch["playerfighting"] || !mControlSwitch["playercontrols"])
             return;
 
         MWMechanics::DrawState_ state = mPlayer->getDrawState();
@@ -713,6 +714,9 @@ namespace MWInput
 
     void InputManager::rest()
     {
+        if (!mControlSwitch["playercontrols"])
+            return;
+
         if (!MWBase::Environment::get().getWindowManager()->getRestEnabled () || MWBase::Environment::get().getWindowManager()->isGuiMode ())
             return;
 
@@ -734,6 +738,9 @@ namespace MWInput
 
     void InputManager::toggleInventory()
     {
+        if (!mControlSwitch["playercontrols"])
+            return;
+
         if (MyGUI::InputManager::getInstance ().isModalAny())
             return;
 
@@ -770,6 +777,8 @@ namespace MWInput
 
     void InputManager::toggleJournal()
     {
+        if (!mControlSwitch["playercontrols"])
+            return;
         if (MyGUI::InputManager::getInstance ().isModalAny())
             return;
 
@@ -787,6 +796,8 @@ namespace MWInput
 
     void InputManager::quickKey (int index)
     {
+        if (!mControlSwitch["playercontrols"])
+            return;
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
         if (player.getClass().getNpcStats(player).isWerewolf())
         {
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index e64a736c3..d87e22543 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -17,18 +17,35 @@ namespace MWMechanics
 
         MWWorld::TimeStamp now = MWBase::Environment::get().getWorld()->getTimeStamp();
 
-        // Erase no longer active spells
+        // Erase no longer active spells and effects
         if (mLastUpdate!=now)
         {
             TContainer::iterator iter (mSpells.begin());
             while (iter!=mSpells.end())
+            {
                 if (!timeToExpire (iter))
                 {
                     mSpells.erase (iter++);
                     rebuild = true;
                 }
                 else
+                {
+                    std::vector<ActiveEffect>& effects = iter->second.mEffects;
+                    for (std::vector<ActiveEffect>::iterator effectIt = effects.begin(); effectIt != effects.end();)
+                    {
+                        MWWorld::TimeStamp start = iter->second.mTimeStamp;
+                        MWWorld::TimeStamp end = start + static_cast<double>(effectIt->mDuration)*MWBase::Environment::get().getWorld()->getTimeScaleFactor()/(60*60);
+                        if (end <= now)
+                        {
+                            effectIt = effects.erase(effectIt);
+                            rebuild = true;
+                        }
+                        else
+                            ++effectIt;
+                    }
                     ++iter;
+                }
+            }
 
             mLastUpdate = now;
         }
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 2e835d57e..a3cfbfd49 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -396,11 +396,7 @@ namespace MWMechanics
     {
         CreatureStats& creatureStats = ptr.getClass().getCreatureStats (ptr);
 
-        int strength     = creatureStats.getAttribute(ESM::Attribute::Strength).getModified();
         int intelligence = creatureStats.getAttribute(ESM::Attribute::Intelligence).getModified();
-        int willpower    = creatureStats.getAttribute(ESM::Attribute::Willpower).getModified();
-        int agility      = creatureStats.getAttribute(ESM::Attribute::Agility).getModified();
-        int endurance    = creatureStats.getAttribute(ESM::Attribute::Endurance).getModified();
 
         float base = 1.f;
         if (ptr.getCellRef().getRefId() == "player")
@@ -415,11 +411,6 @@ namespace MWMechanics
         float diff = (static_cast<int>(magickaFactor*intelligence)) - magicka.getBase();
         magicka.modify(diff);
         creatureStats.setMagicka(magicka);
-
-        DynamicStat<float> fatigue = creatureStats.getFatigue();
-        diff = (strength+willpower+agility+endurance) - fatigue.getBase();
-        fatigue.modify(diff);
-        creatureStats.setFatigue(fatigue);
     }
 
     void Actors::restoreDynamicStats (const MWWorld::Ptr& ptr, bool sleep)
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 67fd54456..624960632 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -325,6 +325,11 @@ namespace MWMechanics
             currentAction = prepareNextAction(actor, target);
             actionCooldown = currentAction->getActionCooldown();
         }
+
+        // Stop attacking if target is not seen
+        if (!MWBase::Environment::get().getMechanicsManager()->awarenessCheck(target, actor))
+            return true;
+
         if (currentAction.get())
             currentAction->getCombatRange(rangeAttack, rangeFollow);
 
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index cc8279b1e..6b4ede305 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -9,6 +9,7 @@
 #include "../mwworld/actionequip.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/spellcasting.hpp"
 
 #include <components/esm/loadench.hpp>
 #include <components/esm/loadmgef.hpp>
@@ -166,6 +167,9 @@ namespace MWMechanics
     {
         const CreatureStats& stats = actor.getClass().getCreatureStats(actor);
 
+        if (MWMechanics::getSpellSuccessChance(spell, actor) == 0)
+            return 0.f;
+
         if (spell->mData.mType != ESM::Spell::ST_Spell)
             return 0.f;
 
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index df970f801..f1c9ec7d2 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -69,6 +69,7 @@ namespace MWMechanics
             /** \return If the actor has arrived at his destination **/
             bool pathTo(const MWWorld::Ptr& actor, ESM::Pathgrid::Point dest, float duration);
 
+            // TODO: all this does not belong here, move into temporary storage
             PathFinder mPathFinder;
             ObstacleCheck mObstacleCheck;
 
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index a70200833..c8a0c85d5 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -57,6 +57,8 @@ namespace MWMechanics
         bool mWalking;
         
         unsigned short mPlayedIdle;
+
+        PathFinder mPathFinder;
         
         AiWanderStorage():
             mTargetAngle(0),
@@ -211,9 +213,9 @@ namespace MWMechanics
         // Are we there yet?
         bool& chooseAction = storage.mChooseAction;
         if(walking &&
-           mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], pos.pos[2]))
+           storage.mPathFinder.checkPathCompleted(pos.pos[0], pos.pos[1], pos.pos[2]))
         {
-            stopWalking(actor);
+            stopWalking(actor, storage);
             moveNow = false;
             walking = false;
             chooseAction = true;
@@ -225,7 +227,7 @@ namespace MWMechanics
         if(walking) // have not yet reached the destination
         {
             // turn towards the next point in mPath
-            zTurn(actor, Ogre::Degree(mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1])));
+            zTurn(actor, Ogre::Degree(storage.mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1])));
             actor.getClass().getMovementSettings(actor).mPosition[1] = 1;
 
             // Returns true if evasive action needs to be taken
@@ -236,9 +238,9 @@ namespace MWMechanics
                 {
                     // remove allowed points then select another random destination
                     mTrimCurrentNode = true;
-                    trimAllowedNodes(mAllowedNodes, mPathFinder);
+                    trimAllowedNodes(mAllowedNodes, storage.mPathFinder);
                     mObstacleCheck.clear();
-                    mPathFinder.clearPath();
+                    storage.mPathFinder.clearPath();
                     walking = false;
                     moveNow = true;
                 }
@@ -249,7 +251,7 @@ namespace MWMechanics
                     actor.getClass().getMovementSettings(actor).mPosition[0] = 1;
                     actor.getClass().getMovementSettings(actor).mPosition[1] = 0.1f;
                     // change the angle a bit, too
-                    zTurn(actor, Ogre::Degree(mPathFinder.getZAngleToNext(pos.pos[0] + 1, pos.pos[1])));
+                    zTurn(actor, Ogre::Degree(storage.mPathFinder.getZAngleToNext(pos.pos[0] + 1, pos.pos[1])));
                 }
                 mStuckCount++;  // TODO: maybe no longer needed
             }
@@ -260,7 +262,7 @@ namespace MWMechanics
                 //std::cout << "Reset \""<< cls.getName(actor) << "\"" << std::endl;
                 mObstacleCheck.clear();
 
-                stopWalking(actor);
+                stopWalking(actor, storage);
                 moveNow = false;
                 walking = false;
                 chooseAction = true;
@@ -280,6 +282,58 @@ namespace MWMechanics
                 rotate = false;
         }
 
+        // Check if idle animation finished
+        short unsigned& playedIdle = storage.mPlayedIdle;
+        GreetingState& greetingState = storage.mSaidGreeting;
+        if(idleNow && !checkIdle(actor, playedIdle) && (greetingState == Greet_Done || greetingState == Greet_None))
+        {
+            playedIdle = 0;
+            idleNow = false;
+            chooseAction = true;
+        }
+
+        MWBase::World *world = MWBase::Environment::get().getWorld();
+
+        if(chooseAction)
+        {
+            playedIdle = 0;
+            getRandomIdle(playedIdle); // NOTE: sets mPlayedIdle with a random selection
+
+            if(!playedIdle && mDistance)
+            {
+                chooseAction = false;
+                moveNow = true;
+            }
+            else
+            {
+                // Play idle animation and recreate vanilla (broken?) behavior of resetting start time of AIWander:
+                MWWorld::TimeStamp currentTime = world->getTimeStamp();
+                mStartTime = currentTime;
+                playIdle(actor, playedIdle);
+                chooseAction = false;
+                idleNow = true;
+
+                // Play idle voiced dialogue entries randomly
+                int hello = cStats.getAiSetting(CreatureStats::AI_Hello).getModified();
+                if (hello > 0)
+                {
+                    int roll = std::rand()/ (static_cast<double> (RAND_MAX) + 1) * 100; // [0, 99]
+                    MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+
+                    // Don't bother if the player is out of hearing range
+                    static float fVoiceIdleOdds = MWBase::Environment::get().getWorld()->getStore()
+                            .get<ESM::GameSetting>().find("fVoiceIdleOdds")->getFloat();
+
+                    // Only say Idle voices when player is in LOS
+                    // A bit counterintuitive, likely vanilla did this to reduce the appearance of
+                    // voices going through walls?
+                    if (roll < fVoiceIdleOdds && Ogre::Vector3(player.getRefData().getPosition().pos).squaredDistance(Ogre::Vector3(pos.pos)) < 1500*1500
+                            && MWBase::Environment::get().getWorld()->getLOS(player, actor))
+                        MWBase::Environment::get().getDialogueManager()->say(actor, "idle");
+                }
+            }
+        }
+
         float& lastReaction = storage.mReaction;
         lastReaction += duration;
         if(lastReaction < REACTION_INTERVAL)
@@ -291,7 +345,6 @@ namespace MWMechanics
 
         // NOTE: everything below get updated every REACTION_INTERVAL seconds
 
-        MWBase::World *world = MWBase::Environment::get().getWorld();
         if(mDuration)
         {
             // End package if duration is complete or mid-night hits:
@@ -300,7 +353,7 @@ namespace MWMechanics
             {
                 if(!mRepeat)
                 {
-                    stopWalking(actor);
+                    stopWalking(actor, storage);
                     return true;
                 }
                 else
@@ -310,7 +363,7 @@ namespace MWMechanics
             {
                 if(!mRepeat)
                 {
-                    stopWalking(actor);
+                    stopWalking(actor, storage);
                     return true;
                 }
                 else
@@ -411,7 +464,7 @@ namespace MWMechanics
             chooseAction = false;
             idleNow = false;
 
-            if (!mPathFinder.isPathConstructed())
+            if (!storage.mPathFinder.isPathConstructed())
             {
                 Ogre::Vector3 destNodePos = mReturnPosition;
 
@@ -427,9 +480,9 @@ namespace MWMechanics
                 start.mZ = pos.pos[2];
 
                 // don't take shortcuts for wandering
-                mPathFinder.buildPath(start, dest, actor.getCell(), false);
+                storage.mPathFinder.buildPath(start, dest, actor.getCell(), false);
 
-                if(mPathFinder.isPathConstructed())
+                if(storage.mPathFinder.isPathConstructed())
                 {
                     moveNow = false;
                     walking = true;
@@ -437,48 +490,6 @@ namespace MWMechanics
             }
         }
 
-        AiWander::GreetingState& greetingState = storage.mSaidGreeting;
-        short unsigned& playedIdle = storage.mPlayedIdle;
-        if(chooseAction)
-        {
-            playedIdle = 0;
-            getRandomIdle(playedIdle); // NOTE: sets mPlayedIdle with a random selection
-
-            if(!playedIdle && mDistance)
-            {
-                chooseAction = false;
-                moveNow = true;
-            }
-            else
-            {
-                // Play idle animation and recreate vanilla (broken?) behavior of resetting start time of AIWander:
-                MWWorld::TimeStamp currentTime = world->getTimeStamp();
-                mStartTime = currentTime;
-                playIdle(actor, playedIdle);
-                chooseAction = false;
-                idleNow = true;
-
-                // Play idle voiced dialogue entries randomly
-                int hello = cStats.getAiSetting(CreatureStats::AI_Hello).getModified();
-                if (hello > 0)
-                {
-                    int roll = std::rand()/ (static_cast<double> (RAND_MAX) + 1) * 100; // [0, 99]
-                    MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-
-                    // Don't bother if the player is out of hearing range
-                    static float fVoiceIdleOdds = MWBase::Environment::get().getWorld()->getStore()
-                            .get<ESM::GameSetting>().find("fVoiceIdleOdds")->getFloat();
-
-                    // Only say Idle voices when player is in LOS
-                    // A bit counterintuitive, likely vanilla did this to reduce the appearance of
-                    // voices going through walls?
-                    if (roll < fVoiceIdleOdds && Ogre::Vector3(player.getRefData().getPosition().pos).squaredDistance(Ogre::Vector3(pos.pos)) < 1500*1500
-                            && MWBase::Environment::get().getWorld()->getLOS(player, actor))
-                        MWBase::Environment::get().getDialogueManager()->say(actor, "idle");
-                }
-            }
-        }
-
         // Allow interrupting a walking actor to trigger a greeting
         if(idleNow || walking)
         {
@@ -494,7 +505,7 @@ namespace MWMechanics
             Ogre::Vector3 playerPos(player.getRefData().getPosition().pos);
             Ogre::Vector3 actorPos(actor.getRefData().getPosition().pos);
             float playerDistSqr = playerPos.squaredDistance(actorPos);
-            
+
             int& greetingTimer = storage.mGreetingTimer;
             if (greetingState == Greet_None)
             {
@@ -517,7 +528,7 @@ namespace MWMechanics
                 
                 if(walking)
                 {
-                    stopWalking(actor);
+                    stopWalking(actor, storage);
                     moveNow = false;
                     walking = false;
                     mObstacleCheck.clear();
@@ -554,20 +565,12 @@ namespace MWMechanics
                 if (playerDistSqr >= fGreetDistanceReset*fGreetDistanceReset)
                     greetingState = Greet_None;
             }
-
-            // Check if idle animation finished
-            if(!checkIdle(actor, playedIdle) && (playerDistSqr > helloDistance*helloDistance || greetingState == MWMechanics::AiWander::Greet_Done))
-            {
-                playedIdle = 0;
-                idleNow = false;
-                chooseAction = true;
-            }
         }
 
         if(moveNow && mDistance)
         {
             // Construct a new path if there isn't one
-            if(!mPathFinder.isPathConstructed())
+            if(!storage.mPathFinder.isPathConstructed())
             {
                 assert(mAllowedNodes.size());
                 unsigned int randNode = (int)(rand() / ((double)RAND_MAX + 1) * mAllowedNodes.size());
@@ -589,16 +592,16 @@ namespace MWMechanics
                 start.mZ = pos.pos[2];
 
                 // don't take shortcuts for wandering
-                mPathFinder.buildPath(start, dest, actor.getCell(), false);
+                storage.mPathFinder.buildPath(start, dest, actor.getCell(), false);
 
-                if(mPathFinder.isPathConstructed())
+                if(storage.mPathFinder.isPathConstructed())
                 {
                     // buildPath inserts dest in case it is not a pathgraph point
                     // index which is a duplicate for AiWander.  However below code
                     // does not work since getPath() returns a copy of path not a
                     // reference
-                    //if(mPathFinder.getPathSize() > 1)
-                        //mPathFinder.getPath().pop_back();
+                    //if(storage.mPathFinder.getPathSize() > 1)
+                        //storage.mPathFinder.getPath().pop_back();
 
                     // Remove this node as an option and add back the previously used node (stops NPC from picking the same node):
                     ESM::Pathgrid::Point temp = mAllowedNodes[randNode];
@@ -616,7 +619,7 @@ namespace MWMechanics
                 // Choose a different node and delete this one from possible nodes because it is uncreachable:
                 else
                     mAllowedNodes.erase(mAllowedNodes.begin() + randNode);
-            }
+            } 
         }
 
         return false; // AiWander package not yet completed
@@ -653,9 +656,9 @@ namespace MWMechanics
         return TypeIdWander;
     }
 
-    void AiWander::stopWalking(const MWWorld::Ptr& actor)
+    void AiWander::stopWalking(const MWWorld::Ptr& actor, AiWanderStorage& storage)
     {
-        mPathFinder.clearPath();
+        storage.mPathFinder.clearPath();
         actor.getClass().getMovementSettings(actor).mPosition[1] = 0;
     }
 
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index 0600909ba..b9b394a26 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -27,6 +27,8 @@ namespace MWMechanics
 {    
     
     
+    struct AiWanderStorage;
+
     /// \brief Causes the Actor to wander within a specified range
     class AiWander : public AiPackage
     {
@@ -65,7 +67,7 @@ namespace MWMechanics
             // NOTE: mDistance and mDuration must be set already
             void init();
             
-            void stopWalking(const MWWorld::Ptr& actor);
+            void stopWalking(const MWWorld::Ptr& actor, AiWanderStorage& storage);
             void playIdle(const MWWorld::Ptr& actor, unsigned short idleSelect);
             bool checkIdle(const MWWorld::Ptr& actor, unsigned short idleSelect);
             void getRandomIdle(unsigned short& playedIdle);
@@ -101,7 +103,6 @@ namespace MWMechanics
             void trimAllowedNodes(std::vector<ESM::Pathgrid::Point>& nodes,
                                   const PathFinder& pathfinder);
 
-//             PathFinder mPathFinder;
 
 //             ObstacleCheck mObstacleCheck;
             float mDoorCheckDuration;
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 72a9bbfde..46e06f460 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1072,7 +1072,8 @@ bool CharacterController::updateWeaponState()
         }
         else if (mHitState == CharState_KnockDown)
         {
-            mUpperBodyState = UpperCharState_WeapEquiped;
+            if (mUpperBodyState > UpperCharState_WeapEquiped)
+                mUpperBodyState = UpperCharState_WeapEquiped;
             mAnimation->disable(mCurrentWeapon);
         }
     }
@@ -1414,29 +1415,32 @@ void CharacterController::update(float duration)
         {
             // Started a jump.
             float z = cls.getJump(mPtr);
-            if(vec.x == 0 && vec.y == 0)
-                vec = Ogre::Vector3(0.0f, 0.0f, z);
-            else
+            if (z > 0)
             {
-                Ogre::Vector3 lat = Ogre::Vector3(vec.x, vec.y, 0.0f).normalisedCopy();
-                vec = Ogre::Vector3(lat.x, lat.y, 1.0f) * z * 0.707f;
+                if(vec.x == 0 && vec.y == 0)
+                    vec = Ogre::Vector3(0.0f, 0.0f, z);
+                else
+                {
+                    Ogre::Vector3 lat = Ogre::Vector3(vec.x, vec.y, 0.0f).normalisedCopy();
+                    vec = Ogre::Vector3(lat.x, lat.y, 1.0f) * z * 0.707f;
+                }
+
+                // advance acrobatics
+                if (mPtr.getRefData().getHandle() == "player")
+                    cls.skillUsageSucceeded(mPtr, ESM::Skill::Acrobatics, 0);
+
+                // decrease fatigue
+                const MWWorld::Store<ESM::GameSetting> &gmst = world->getStore().get<ESM::GameSetting>();
+                const float fatigueJumpBase = gmst.find("fFatigueJumpBase")->getFloat();
+                const float fatigueJumpMult = gmst.find("fFatigueJumpMult")->getFloat();
+                float normalizedEncumbrance = mPtr.getClass().getNormalizedEncumbrance(mPtr);
+                if (normalizedEncumbrance > 1)
+                    normalizedEncumbrance = 1;
+                const int fatigueDecrease = fatigueJumpBase + (1 - normalizedEncumbrance) * fatigueJumpMult;
+                DynamicStat<float> fatigue = cls.getCreatureStats(mPtr).getFatigue();
+                fatigue.setCurrent(fatigue.getCurrent() - fatigueDecrease);
+                cls.getCreatureStats(mPtr).setFatigue(fatigue);
             }
-
-            // advance acrobatics
-            if (mPtr.getRefData().getHandle() == "player")
-                cls.skillUsageSucceeded(mPtr, ESM::Skill::Acrobatics, 0);
-
-            // decrease fatigue
-            const MWWorld::Store<ESM::GameSetting> &gmst = world->getStore().get<ESM::GameSetting>();
-            const float fatigueJumpBase = gmst.find("fFatigueJumpBase")->getFloat();
-            const float fatigueJumpMult = gmst.find("fFatigueJumpMult")->getFloat();
-            float normalizedEncumbrance = mPtr.getClass().getNormalizedEncumbrance(mPtr);
-            if (normalizedEncumbrance > 1)
-                normalizedEncumbrance = 1;
-            const int fatigueDecrease = fatigueJumpBase + (1 - normalizedEncumbrance) * fatigueJumpMult;
-            DynamicStat<float> fatigue = cls.getCreatureStats(mPtr).getFatigue();
-            fatigue.setCurrent(fatigue.getCurrent() - fatigueDecrease);
-            cls.getCreatureStats(mPtr).setFatigue(fatigue);
         }
         else if(mJumpState == JumpState_InAir)
         {
@@ -1645,6 +1649,8 @@ void CharacterController::playGroup(const std::string &groupname, int mode, int
         }
         else if(mode == 0)
         {
+            if (!mAnimQueue.empty())
+                mAnimation->stopLooping(mAnimQueue.front().first);
             mAnimQueue.resize(1);
             mAnimQueue.push_back(std::make_pair(groupname, count-1));
         }
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index c4d316ad6..21fd2203f 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -20,7 +20,7 @@ namespace MWMechanics
           mAttacked (false),
           mAttackingOrSpell(false),
           mIsWerewolf(false),
-          mFallHeight(0), mRecalcDynamicStats(false), mKnockdown(false), mKnockdownOneFrame(false),
+          mFallHeight(0), mRecalcMagicka(false), mKnockdown(false), mKnockdownOneFrame(false),
           mKnockdownOverOneFrame(false), mHitRecovery(false), mBlock(false),
           mMovementFlags(0), mDrawState (DrawState_Nothing), mAttackStrength(0.f),
           mLastRestock(0,0), mGoldPool(0), mActorId(-1),
@@ -147,16 +147,28 @@ namespace MWMechanics
 
         if (value != currentValue)
         {
-            if (index != ESM::Attribute::Luck
-                    && index != ESM::Attribute::Personality
-                    && index != ESM::Attribute::Speed)
-                mRecalcDynamicStats = true;
-        }
+            if(!mIsWerewolf)
+                mAttributes[index] = value;
+            else
+                mWerewolfAttributes[index] = value;
 
-        if(!mIsWerewolf)
-            mAttributes[index] = value;
-        else
-            mWerewolfAttributes[index] = value;
+            if (index == ESM::Attribute::Intelligence)
+                mRecalcMagicka = true;
+            else if (index == ESM::Attribute::Strength ||
+                     index == ESM::Attribute::Willpower ||
+                     index == ESM::Attribute::Agility ||
+                     index == ESM::Attribute::Endurance)
+            {
+                int strength     = getAttribute(ESM::Attribute::Strength).getModified();
+                int willpower    = getAttribute(ESM::Attribute::Willpower).getModified();
+                int agility      = getAttribute(ESM::Attribute::Agility).getModified();
+                int endurance    = getAttribute(ESM::Attribute::Endurance).getModified();
+                DynamicStat<float> fatigue = getFatigue();
+                float diff = (strength+willpower+agility+endurance) - fatigue.getBase();
+                fatigue.modify(diff);
+                setFatigue(fatigue);
+            }
+        }
     }
 
     void CreatureStats::setHealth(const DynamicStat<float> &value)
@@ -184,6 +196,7 @@ namespace MWMechanics
         if (index==0 && mDynamic[index].getCurrent()<1)
         {
             mDead = true;
+            mDynamic[index].setCurrent(0);
 
             if (MWBase::Environment::get().getWorld()->getGodModeState())
                 MWBase::Environment::get().getMechanicsManager()->keepPlayerAlive();
@@ -199,7 +212,7 @@ namespace MWMechanics
     {
         if (effects.get(ESM::MagicEffect::FortifyMaximumMagicka).getModifier()
                 != mMagicEffects.get(ESM::MagicEffect::FortifyMaximumMagicka).getModifier())
-            mRecalcDynamicStats = true;
+            mRecalcMagicka = true;
 
         mMagicEffects.setModifiers(effects);
     }
@@ -360,9 +373,9 @@ namespace MWMechanics
 
     bool CreatureStats::needToRecalcDynamicStats()
     {
-         if (mRecalcDynamicStats)
+         if (mRecalcMagicka)
          {
-             mRecalcDynamicStats = false;
+             mRecalcMagicka = false;
              return true;
          }
          return false;
@@ -370,7 +383,7 @@ namespace MWMechanics
 
     void CreatureStats::setNeedRecalcDynamicStats(bool val)
     {
-        mRecalcDynamicStats = val;
+        mRecalcMagicka = val;
     }
 
     void CreatureStats::setKnockedDown(bool value)
@@ -497,7 +510,7 @@ namespace MWMechanics
         state.mAttackStrength = mAttackStrength;
         state.mFallHeight = mFallHeight; // TODO: vertical velocity (move from PhysicActor to CreatureStats?)
         state.mLastHitObject = mLastHitObject;
-        state.mRecalcDynamicStats = mRecalcDynamicStats;
+        state.mRecalcDynamicStats = mRecalcMagicka;
         state.mDrawState = mDrawState;
         state.mLevel = mLevel;
         state.mActorId = mActorId;
@@ -545,7 +558,7 @@ namespace MWMechanics
         mAttackStrength = state.mAttackStrength;
         mFallHeight = state.mFallHeight;
         mLastHitObject = state.mLastHitObject;
-        mRecalcDynamicStats = state.mRecalcDynamicStats;
+        mRecalcMagicka = state.mRecalcDynamicStats;
         mDrawState = DrawState_(state.mDrawState);
         mLevel = state.mLevel;
         mActorId = state.mActorId;
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 5e169ffb0..f830dd310 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -53,8 +53,7 @@ namespace MWMechanics
 
         std::string mLastHitObject; // The last object to hit this actor
 
-        // Do we need to recalculate stats derived from attributes or other factors?
-        bool mRecalcDynamicStats;
+        bool mRecalcMagicka;
 
         // For merchants: the last time items were restocked and gold pool refilled.
         MWWorld::TimeStamp mLastRestock;
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index f7949f1ec..9cafe9b3c 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -143,9 +143,9 @@ namespace MWMechanics
             MWWorld::Store<ESM::Skill>::iterator iter = skills.begin();
             for (; iter != skills.end(); ++iter)
             {
-                if (iter->mData.mSpecialization==class_->mData.mSpecialization)
+                if (iter->second.mData.mSpecialization==class_->mData.mSpecialization)
                 {
-                    int index = iter->mIndex;
+                    int index = iter->first;
 
                     if (index>=0 && index<27)
                     {
@@ -930,20 +930,6 @@ namespace MWMechanics
 
         const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
-        // What amount of alarm did this crime generate?
-        int alarm = 0;
-        if (type == OT_Trespassing || type == OT_SleepingInOwnedBed)
-            alarm = esmStore.get<ESM::GameSetting>().find("iAlarmTresspass")->getInt();
-        else if (type == OT_Pickpocket)
-            alarm = esmStore.get<ESM::GameSetting>().find("iAlarmPickPocket")->getInt();
-        else if (type == OT_Assault)
-            alarm = esmStore.get<ESM::GameSetting>().find("iAlarmAttack")->getInt();
-        else if (type == OT_Murder)
-            alarm = esmStore.get<ESM::GameSetting>().find("iAlarmKilling")->getInt();
-        else if (type == OT_Theft)
-            alarm = esmStore.get<ESM::GameSetting>().find("iAlarmStealing")->getInt();
-
-        bool reported = false;
 
         // Find all the actors within the alarm radius
         std::vector<MWWorld::Ptr> neighbors;
@@ -960,6 +946,8 @@ namespace MWMechanics
         bool victimAware = false;
 
         // Find actors who directly witnessed the crime
+        bool crimeSeen = false;
+        bool reported = false;
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
             if (*it == player)
@@ -987,15 +975,17 @@ namespace MWMechanics
                 if (it->getClass().getCreatureStats(*it).getAiSequence().isInCombat(victim))
                     continue;
 
-                // Will the witness report the crime?
-                if (it->getClass().getCreatureStats(*it).getAiSetting(CreatureStats::AI_Alarm).getBase() >= alarm)
-                {
-                    reported = true;
-                }
+                crimeSeen = true;
+            }
+
+            // Will the witness report the crime?
+            if (it->getClass().getCreatureStats(*it).getAiSetting(CreatureStats::AI_Alarm).getBase() >= 100)
+            {
+                reported = true;
             }
         }
 
-        if (reported)
+        if (crimeSeen && reported)
             reportCrime(player, victim, type, arg);
         else if (victimAware && !victim.isEmpty() && type == OT_Assault)
             startCombat(victim, player);
diff --git a/apps/openmw/mwrender/activatoranimation.cpp b/apps/openmw/mwrender/activatoranimation.cpp
index de0457e57..540876a3e 100644
--- a/apps/openmw/mwrender/activatoranimation.cpp
+++ b/apps/openmw/mwrender/activatoranimation.cpp
@@ -4,6 +4,8 @@
 
 #include "../mwbase/world.hpp"
 
+#include "../mwworld/class.hpp"
+
 #include "renderconst.hpp"
 
 namespace MWRender
@@ -16,17 +18,14 @@ ActivatorAnimation::~ActivatorAnimation()
 ActivatorAnimation::ActivatorAnimation(const MWWorld::Ptr &ptr)
   : Animation(ptr, ptr.getRefData().getBaseNode())
 {
-    MWWorld::LiveCellRef<ESM::Activator> *ref = mPtr.get<ESM::Activator>();
+    const std::string& model = mPtr.getClass().getModel(mPtr);
 
-    assert(ref->mBase != NULL);
-    if(!ref->mBase->mModel.empty())
+    if(!model.empty())
     {
-        const std::string name = "meshes\\"+ref->mBase->mModel;
-
-        setObjectRoot(name, false);
+        setObjectRoot(model, false);
         setRenderProperties(mObjectRoot, RV_Misc, RQG_Main, RQG_Alpha);
 
-        addAnimSource(name);
+        addAnimSource(model);
     }
 }
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 29db648d0..ecaaba0b9 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -114,10 +114,6 @@ void Animation::setObjectRoot(const std::string &model, bool baseonly)
     mObjectRoot = (!baseonly ? NifOgre::Loader::createObjects(mInsert, mdlname) :
                                NifOgre::Loader::createObjectBase(mInsert, mdlname));
 
-    // Fast forward auto-play particles, which will have been set up as Emitting by the loader.
-    for (unsigned int i=0; i<mObjectRoot->mParticles.size(); ++i)
-        mObjectRoot->mParticles[i]->fastForward(1, 0.1);
-
     if(mObjectRoot->mSkelBase)
     {
         mSkelBase = mObjectRoot->mSkelBase;
@@ -574,7 +570,8 @@ float Animation::getVelocity(const std::string &groupname) const
 
 static void updateBoneTree(const Ogre::SkeletonInstance *skelsrc, Ogre::Bone *bone)
 {
-    if(skelsrc->hasBone(bone->getName()))
+    if(bone->getName() != " " // really should be != "", but see workaround in skeleton.cpp for empty node names
+            && skelsrc->hasBone(bone->getName()))
     {
         Ogre::Bone *srcbone = skelsrc->getBone(bone->getName());
         if(!srcbone->getParent() || !bone->getParent())
@@ -842,6 +839,17 @@ void Animation::changeGroups(const std::string &groupname, int groups)
         return;
     }
 }
+
+void Animation::stopLooping(const std::string& groupname)
+{
+    AnimStateMap::iterator stateiter = mStates.find(groupname);
+    if(stateiter != mStates.end())
+    {
+        stateiter->second.mLoopCount = 0;
+        return;
+    }
+}
+
 void Animation::play(const std::string &groupname, int priority, int groups, bool autodisable, float speedmult, const std::string &start, const std::string &stop, float startpoint, size_t loops)
 {
     if(!mSkelBase || mAnimSources.empty())
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 8ca3582dc..a8a9ee11e 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -260,6 +260,10 @@ public:
               float speedmult, const std::string &start, const std::string &stop,
               float startpoint, size_t loops);
 
+    /** If the given animation group is currently playing, set its remaining loop count to '0'.
+     */
+    void stopLooping(const std::string& groupName);
+
     /** Adjust the speed multiplier of an already playing animation.
      */
     void adjustSpeedMult (const std::string& groupname, float speedmult);
diff --git a/apps/openmw/mwrender/characterpreview.cpp b/apps/openmw/mwrender/characterpreview.cpp
index d9c953133..92d0bcd55 100644
--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@@ -115,8 +115,8 @@ namespace MWRender
 
     void CharacterPreview::rebuild()
     {
-        assert(mAnimation);
         delete mAnimation;
+        mAnimation = NULL;
         mAnimation = new NpcAnimation(mCharacter, mNode,
                                       0, true, true, (renderHeadOnly() ? NpcAnimation::VM_HeadOnly : NpcAnimation::VM_Normal));
 
@@ -187,6 +187,9 @@ namespace MWRender
 
     void InventoryPreview::update()
     {
+        if (!mAnimation)
+            return;
+
         mAnimation->updateParts();
 
         MWWorld::InventoryStore &inv = mCharacter.getClass().getInventoryStore(mCharacter);
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index c43d3663e..f2bc3df95 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -60,6 +60,21 @@ std::string getVampireHead(const std::string& race, bool female)
     return "meshes\\" + sVampireMapping[thisCombination]->mModel;
 }
 
+bool isSkinned (NifOgre::ObjectScenePtr scene)
+{
+    if (scene->mSkelBase == NULL)
+        return false;
+    for(size_t j = 0; j < scene->mEntities.size(); j++)
+    {
+        Ogre::Entity *ent = scene->mEntities[j];
+        if(scene->mSkelBase != ent && ent->hasSkeleton())
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
 }
 
 
@@ -556,10 +571,6 @@ NifOgre::ObjectScenePtr NpcAnimation::insertBoundedPart(const std::string &model
     std::for_each(objects->mEntities.begin(), objects->mEntities.end(), SetObjectGroup(group));
     std::for_each(objects->mParticles.begin(), objects->mParticles.end(), SetObjectGroup(group));
 
-    // Fast forward auto-play particles, which will have been set up as Emitting by the loader.
-    for (unsigned int i=0; i<objects->mParticles.size(); ++i)
-        objects->mParticles[i]->fastForward(1, 0.1);
-
     if(objects->mSkelBase)
     {
         Ogre::AnimationStateSet *aset = objects->mSkelBase->getAllAnimationStates();
@@ -611,10 +622,11 @@ Ogre::Vector3 NpcAnimation::runAnimation(float timepassed)
         for(;ctrl != mObjectParts[i]->mControllers.end();++ctrl)
             ctrl->update();
 
-        Ogre::Entity *ent = mObjectParts[i]->mSkelBase;
-        if(!ent) continue;
-        updateSkeletonInstance(baseinst, ent->getSkeleton());
-        ent->getAllAnimationStates()->_notifyDirty();
+        if (!isSkinned(mObjectParts[i]))
+            continue;
+
+        updateSkeletonInstance(baseinst, mObjectParts[i]->mSkelBase->getSkeleton());
+        mObjectParts[i]->mSkelBase->getAllAnimationStates()->_notifyDirty();
     }
 
     return ret;
@@ -660,7 +672,15 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
     removeIndividualPart(type);
     mPartslots[type] = group;
     mPartPriorities[type] = priority;
-    mObjectParts[type] = insertBoundedPart(mesh, group, sPartList.at(type), enchantedGlow, glowColor);
+    try
+    {
+        mObjectParts[type] = insertBoundedPart(mesh, group, sPartList.at(type), enchantedGlow, glowColor);
+    }
+    catch (std::exception& e)
+    {
+        std::cerr << "Error adding NPC part: " << e.what() << std::endl;
+        return false;
+    }
 
     if (!mSoundsDisabled)
     {
@@ -697,7 +717,8 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
             }
         }
 
-        updateSkeletonInstance(mSkelBase->getSkeleton(), skel);
+        if (isSkinned(mObjectParts[type]))
+            updateSkeletonInstance(mSkelBase->getSkeleton(), skel);
     }
 
     std::vector<Ogre::Controller<Ogre::Real> >::iterator ctrl(mObjectParts[type]->mControllers.begin());
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index ccef74efb..184102127 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -34,6 +34,41 @@
 using namespace MWRender;
 using namespace Ogre;
 
+namespace
+{
+
+void setAlpha (NifOgre::ObjectScenePtr scene, Ogre::MovableObject* movable, float alpha)
+{
+    Ogre::MaterialPtr mat = scene->mMaterialControllerMgr.getWritableMaterial(movable);
+    Ogre::Material::TechniqueIterator techs = mat->getTechniqueIterator();
+    while(techs.hasMoreElements())
+    {
+        Ogre::Technique *tech = techs.getNext();
+        Ogre::Technique::PassIterator passes = tech->getPassIterator();
+        while(passes.hasMoreElements())
+        {
+            Ogre::Pass *pass = passes.getNext();
+            Ogre::ColourValue diffuse = pass->getDiffuse();
+            diffuse.a = alpha;
+            pass->setDiffuse(diffuse);
+        }
+    }
+
+}
+
+void setAlpha (NifOgre::ObjectScenePtr scene, float alpha)
+{
+    for(size_t i = 0; i < scene->mParticles.size(); ++i)
+        setAlpha(scene, scene->mParticles[i], alpha);
+    for(size_t i = 0; i < scene->mEntities.size(); ++i)
+    {
+        if (scene->mEntities[i] != scene->mSkelBase)
+            setAlpha(scene, scene->mEntities[i], alpha);
+    }
+}
+
+}
+
 BillboardObject::BillboardObject( const String& textureName,
                     const float initialSize,
                     const Vector3& position,
@@ -660,6 +695,11 @@ void SkyManager::setWeather(const MWWorld::WeatherResult& weather)
     mSun->setVisibility(weather.mGlareView * strength);
 
     mAtmosphereNight->setVisible(weather.mNight && mEnabled);
+
+    if (mParticle.get())
+        setAlpha(mParticle, weather.mEffectFade);
+    for (std::map<Ogre::SceneNode*, NifOgre::ObjectScenePtr>::iterator it = mRainModels.begin(); it != mRainModels.end(); ++it)
+        setAlpha(it->second, weather.mEffectFade);
 }
 
 void SkyManager::setGlare(const float glare)
diff --git a/apps/openmw/mwrender/weaponanimation.cpp b/apps/openmw/mwrender/weaponanimation.cpp
index a409e8807..c59a93feb 100644
--- a/apps/openmw/mwrender/weaponanimation.cpp
+++ b/apps/openmw/mwrender/weaponanimation.cpp
@@ -55,6 +55,7 @@ void WeaponAnimation::attachArrow(MWWorld::Ptr actor)
             return;
         std::string model = ammo->getClass().getModel(*ammo);
 
+        assert(weapon->mSkelBase && "Need a skeleton to attach the arrow to");
         mAmmunition = NifOgre::Loader::createObjects(weapon->mSkelBase, "ArrowBone", weapon->mSkelBase->getParentSceneNode(), model);
         configureAddedObject(mAmmunition, *ammo, MWWorld::InventoryStore::Slot_Ammunition);
     }
diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp
index 52de8e042..613cf7d24 100644
--- a/apps/openmw/mwscript/animationextensions.cpp
+++ b/apps/openmw/mwscript/animationextensions.cpp
@@ -55,7 +55,7 @@ namespace MWScript
                             throw std::runtime_error ("animation mode out of range");
                     }
 
-                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, 1);
+                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, std::numeric_limits<int>::max());
                }
         };
 
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index afc745beb..1d34adbca 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -210,6 +210,12 @@ namespace MWScript
             {
                 bool state = MWBase::Environment::get().getWindowManager()->toggleGui();
                 runtime.getContext().report(state ? "GUI -> On" : "GUI -> Off");
+
+                if (!state)
+                {
+                    while (MWBase::Environment::get().getWindowManager()->getMode() != MWGui::GM_None) // don't use isGuiMode, or we get an infinite loop for modal message boxes!
+                        MWBase::Environment::get().getWindowManager()->popGuiMode();
+                }
             }
         };
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index c7d221139..ec2048e11 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -246,7 +246,7 @@ namespace MWScript
                     Interpreter::Type_Float time = runtime[0].mFloat;
                     runtime.pop();
 
-                    MWBase::Environment::get().getWindowManager()->fadeScreenIn(time);
+                    MWBase::Environment::get().getWindowManager()->fadeScreenIn(time, false);
                 }
         };
 
@@ -259,7 +259,7 @@ namespace MWScript
                     Interpreter::Type_Float time = runtime[0].mFloat;
                     runtime.pop();
 
-                    MWBase::Environment::get().getWindowManager()->fadeScreenOut(time);
+                    MWBase::Environment::get().getWindowManager()->fadeScreenOut(time, false);
                 }
         };
 
@@ -275,7 +275,7 @@ namespace MWScript
                     Interpreter::Type_Float time = runtime[0].mFloat;
                     runtime.pop();
 
-                    MWBase::Environment::get().getWindowManager()->fadeScreenTo(alpha, time);
+                    MWBase::Environment::get().getWindowManager()->fadeScreenTo(alpha, time, false);
                 }
         };
 
@@ -571,6 +571,10 @@ namespace MWScript
 
                     if (parameter == 1)
                         MWBase::Environment::get().getWorld()->deleteObject(ptr);
+                    else if (parameter == 0)
+                        MWBase::Environment::get().getWorld()->undeleteObject(ptr);
+                    else
+                        throw std::runtime_error("SetDelete: unexpected parameter");
                 }
         };
 
@@ -964,6 +968,9 @@ namespace MWScript
                         msg << "Grid: " << cell->getCell()->getGridX() << " " << cell->getCell()->getGridY() << std::endl;
                     Ogre::Vector3 pos (ptr.getRefData().getPosition().pos);
                     msg << "Coordinates: " << pos << std::endl;
+                    msg << "Model: " << ptr.getClass().getModel(ptr) << std::endl;
+                    if (!ptr.getClass().getScript(ptr).empty())
+                        msg << "Script: " << ptr.getClass().getScript(ptr) << std::endl;
                 }
 
                 std::string notes = runtime.getStringLiteral (runtime[0].mInteger);
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index befb8d82e..09ab0183c 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -278,7 +278,9 @@ namespace MWScript
                     MWMechanics::DynamicStat<float> stat (ptr.getClass().getCreatureStats (ptr)
                         .getDynamic (mIndex));
 
-                    stat.setCurrent (diff + current, true);
+                    // for fatigue, a negative current value is allowed and means the actor will be knocked down
+                    bool allowDecreaseBelowZero = (mIndex == 2);
+                    stat.setCurrent (diff + current, allowDecreaseBelowZero);
 
                     ptr.getClass().getCreatureStats (ptr).setDynamic (mIndex, stat);
                 }
@@ -1177,7 +1179,15 @@ namespace MWScript
                 virtual void execute (Interpreter::Runtime& runtime)
                 {
                     MWWorld::Ptr ptr = R()(runtime);
-                    ptr.getClass().getCreatureStats(ptr).resurrect();
+
+                    if (ptr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+                        ptr.getClass().getCreatureStats(ptr).resurrect();
+                    else if (ptr.getClass().getCreatureStats(ptr).isDead())
+                    {
+                        MWBase::Environment::get().getWorld()->undeleteObject(ptr);
+                        // resets runtime state such as inventory, stats and AI. does not reset position in the world
+                        ptr.getRefData().setCustomData(NULL);
+                    }
                 }
         };
 
diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp
index e74388eff..8e6d925b7 100644
--- a/apps/openmw/mwscript/transformationextensions.cpp
+++ b/apps/openmw/mwscript/transformationextensions.cpp
@@ -319,12 +319,11 @@ namespace MWScript
                         ptr = MWWorld::Ptr(ptr.getBase(), store);
                         float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees();
                         float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees();
-                        if(ptr.getTypeName() == typeid(ESM::NPC).name())//some morrowind oddity
-                        {
-                            ax = ax/60.;
-                            ay = ay/60.;
+                        // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
+                        // except for when you position the player, then degrees must be used.
+                        // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
+                        if(ptr != MWBase::Environment::get().getWorld()->getPlayerPtr())
                             zRot = zRot/60.;
-                        }
                         MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
 
                         ptr.getClass().adjustPosition(ptr, false);
@@ -378,12 +377,11 @@ namespace MWScript
 
                     float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees();
                     float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees();
-                    if(ptr.getTypeName() == typeid(ESM::NPC).name())//some morrowind oddity
-                    {
-                        ax = ax/60.;
-                        ay = ay/60.;
+                    // Note that you must specify ZRot in minutes (1 degree = 60 minutes; north = 0, east = 5400, south = 10800, west = 16200)
+                    // except for when you position the player, then degrees must be used.
+                    // See "Morrowind Scripting for Dummies (9th Edition)" pages 50 and 54 for reference.
+                    if(ptr != MWBase::Environment::get().getWorld()->getPlayerPtr())
                         zRot = zRot/60.;
-                    }
                     MWBase::Environment::get().getWorld()->rotateObject(ptr,ax,ay,zRot);
                     ptr.getClass().adjustPosition(ptr, false);
                 }
diff --git a/apps/openmw/mwworld/cellreflist.hpp b/apps/openmw/mwworld/cellreflist.hpp
index 9c3370f08..cf1289654 100644
--- a/apps/openmw/mwworld/cellreflist.hpp
+++ b/apps/openmw/mwworld/cellreflist.hpp
@@ -27,7 +27,7 @@ namespace MWWorld
         LiveRef *find (const std::string& name)
         {
             for (typename List::iterator iter (mList.begin()); iter!=mList.end(); ++iter)
-                if (iter->mData.getCount() > 0 && iter->mRef.getRefId() == name)
+                if (iter->mRef.getRefId() == name)
                     return &*iter;
 
             return 0;
@@ -42,7 +42,7 @@ namespace MWWorld
         LiveCellRef<X> *searchViaHandle (const std::string& handle)
         {
             for (typename List::iterator iter (mList.begin()); iter!=mList.end(); ++iter)
-                if (iter->mData.getCount()>0 && iter->mData.getBaseNode() &&
+                if (iter->mData.getBaseNode() &&
                     iter->mData.getHandle()==handle)
                     return &*iter;
 
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index ce8d77758..52e70fef2 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -156,7 +156,7 @@ namespace MWWorld
             LiveRef liveCellRef (ref, ptr);
 
             if (deleted)
-                liveCellRef.mData.setCount (0);
+                liveCellRef.mData.setDeleted(true);
 
             if (iter != mList.end())
                 *iter = liveCellRef;
diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index e322ef4a4..eba627b3e 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -196,7 +196,7 @@ namespace MWWorld
                 for (typename List::List::iterator iter (list.mList.begin()); iter!=list.mList.end();
                     ++iter)
                 {
-                    if (!iter->mData.getCount())
+                    if (iter->mData.isDeletedByContentFile())
                         continue;
                     if (!functor (MWWorld::Ptr(&*iter, this)))
                         return false;
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index f3a647124..d74aab694 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -17,7 +17,7 @@ namespace
             cellRefList.mList.begin());
             iter!=cellRefList.mList.end(); ++iter)
         {
-            if (!iter->mBase->mScript.empty() && iter->mData.getCount())
+            if (!iter->mBase->mScript.empty() && !iter->mData.isDeleted())
             {
                 localScripts.add (iter->mBase->mScript, MWWorld::Ptr (&*iter, cell));
             }
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index f4bc64b70..c2a5e5f83 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -23,6 +23,7 @@ namespace MWWorld
         mPosition = refData.mPosition;
         mLocalRotation = refData.mLocalRotation;
         mChanged = refData.mChanged;
+        mDeleted = refData.mDeleted;
 
         mCustomData = refData.mCustomData ? refData.mCustomData->clone() : 0;
     }
@@ -36,7 +37,7 @@ namespace MWWorld
     }
 
     RefData::RefData()
-    : mBaseNode(0), mHasLocals (false), mEnabled (true), mCount (1), mCustomData (0), mChanged(false)
+    : mBaseNode(0), mHasLocals (false), mEnabled (true), mCount (1), mCustomData (0), mChanged(false), mDeleted(false)
     {
         for (int i=0; i<3; ++i)
         {
@@ -49,7 +50,8 @@ namespace MWWorld
     RefData::RefData (const ESM::CellRef& cellRef)
     : mBaseNode(0), mHasLocals (false), mEnabled (true), mCount (1), mPosition (cellRef.mPos),
       mCustomData (0),
-      mChanged(false) // Loading from ESM/ESP files -> assume unchanged
+      mChanged(false), // Loading from ESM/ESP files -> assume unchanged
+      mDeleted(false)
     {
         mLocalRotation.rot[0]=0;
         mLocalRotation.rot[1]=0;
@@ -59,7 +61,8 @@ namespace MWWorld
     RefData::RefData (const ESM::ObjectState& objectState)
     : mBaseNode (0), mHasLocals (false), mEnabled (objectState.mEnabled),
       mCount (objectState.mCount), mPosition (objectState.mPosition), mCustomData (0),
-      mChanged(true) // Loading from a savegame -> assume changed
+      mChanged(true), // Loading from a savegame -> assume changed
+      mDeleted(false)
     {   
         for (int i=0; i<3; ++i)
             mLocalRotation.rot[i] = objectState.mLocalRotation[i];
@@ -167,6 +170,21 @@ namespace MWWorld
         mCount = count;
     }
 
+    void RefData::setDeleted(bool deleted)
+    {
+        mDeleted = deleted;
+    }
+
+    bool RefData::isDeleted() const
+    {
+        return mDeleted || mCount == 0;
+    }
+
+    bool RefData::isDeletedByContentFile() const
+    {
+        return mDeleted;
+    }
+
     MWScript::Locals& RefData::getLocals()
     {
         return mLocals;
diff --git a/apps/openmw/mwworld/refdata.hpp b/apps/openmw/mwworld/refdata.hpp
index db66c091b..da7986ba0 100644
--- a/apps/openmw/mwworld/refdata.hpp
+++ b/apps/openmw/mwworld/refdata.hpp
@@ -37,6 +37,8 @@ namespace MWWorld
             bool mEnabled;
             int mCount; // 0: deleted
 
+            bool mDeleted; // separate delete flag used for deletion by a content file
+
             ESM::Position mPosition;
 
             LocalRotation mLocalRotation;
@@ -86,12 +88,21 @@ namespace MWWorld
             void setLocals (const ESM::Script& script);
 
             void setCount (int count);
-            /// Set object count (an object pile is a simple object with a count >1).
+            ///< Set object count (an object pile is a simple object with a count >1).
             ///
             /// \warning Do not call setCount() to add or remove objects from a
             /// container or an actor's inventory. Call ContainerStore::add() or
             /// ContainerStore::remove() instead.
 
+            /// This flag is only used for content stack loading and will not be stored in the savegame.
+            /// If the object was deleted by gameplay, then use setCount(0) instead.
+            void setDeleted(bool deleted);
+
+            /// Returns true if the object was either deleted by the content file or by gameplay.
+            bool isDeleted() const;
+            /// Returns true if the object was deleted by a content file.
+            bool isDeletedByContentFile() const;
+
             MWScript::Locals& getLocals();
 
             bool isEnabled() const;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 6f18a6ef3..02c9db9ea 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -75,7 +75,7 @@ namespace
                 ptr.getCellRef().setScale(2);
         }
 
-        if (ptr.getRefData().getCount() && ptr.getRefData().isEnabled())
+        if (!ptr.getRefData().isDeleted() && ptr.getRefData().isEnabled())
         {
             try
             {
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 55c5b8191..c8fa087c2 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -842,76 +842,48 @@ namespace MWWorld
     template <>
     class Store<ESM::Pathgrid> : public StoreBase
     {
-    public:
-        typedef std::vector<ESM::Pathgrid>::const_iterator iterator;
-
     private:
-        std::vector<ESM::Pathgrid>  mStatic;
+        typedef std::map<std::string, ESM::Pathgrid> Interior;
+        typedef std::map<std::pair<int, int>, ESM::Pathgrid> Exterior;
 
-        std::vector<ESM::Pathgrid>::iterator mIntBegin, mIntEnd, mExtBegin, mExtEnd;
-
-        struct IntExtOrdering
-        {
-            bool operator()(const ESM::Pathgrid &x, const ESM::Pathgrid &y) const {
-                // interior pathgrids precedes exterior ones (x < y)
-                if ((x.mData.mX == 0 && x.mData.mY == 0) &&
-                    (y.mData.mX != 0 || y.mData.mY != 0))
-                {
-                    return true;
-                }
-                return false;
-            }
-        };
-
-        struct ExtCompare
-        {
-            bool operator()(const ESM::Pathgrid &x, const ESM::Pathgrid &y) const {
-                if (x.mData.mX == y.mData.mX) {
-                    return x.mData.mY < y.mData.mY;
-                }
-                return x.mData.mX < y.mData.mX;
-            }
-        };
+        Interior mInt;
+        Exterior mExt;
 
     public:
 
         void load(ESM::ESMReader &esm, const std::string &id) {
-            mStatic.push_back(ESM::Pathgrid());
-            mStatic.back().load(esm);
+
+            ESM::Pathgrid pathgrid;
+            pathgrid.load(esm);
+
+            // Try to overwrite existing record
+            if (!pathgrid.mCell.empty())
+            {
+                std::pair<Interior::iterator, bool> ret = mInt.insert(std::make_pair(pathgrid.mCell, pathgrid));
+                if (!ret.second)
+                    ret.first->second = pathgrid;
+            }
+            else
+            {
+                std::pair<Exterior::iterator, bool> ret = mExt.insert(std::make_pair(std::make_pair(pathgrid.mData.mX, pathgrid.mData.mY),
+                                                                                       pathgrid));
+                if (!ret.second)
+                    ret.first->second = pathgrid;
+            }
         }
 
         size_t getSize() const {
-            return mStatic.size();
+            return mInt.size() + mExt.size();
         }
 
         void setUp() {
-            IntExtOrdering cmp;
-            std::sort(mStatic.begin(), mStatic.end(), cmp);
-
-            ESM::Pathgrid pg;
-            pg.mData.mX = pg.mData.mY = 1;
-            mExtBegin =
-                std::lower_bound(mStatic.begin(), mStatic.end(), pg, cmp);
-            mExtEnd = mStatic.end();
-
-            mIntBegin = mStatic.begin();
-            mIntEnd = mExtBegin;
-
-            std::sort(mIntBegin, mIntEnd, RecordCmp());
-            std::sort(mExtBegin, mExtEnd, ExtCompare());
         }
 
         const ESM::Pathgrid *search(int x, int y) const {
-            ESM::Pathgrid pg;
-            pg.mData.mX = x;
-            pg.mData.mY = y;
-
-            iterator it =
-                std::lower_bound(mExtBegin, mExtEnd, pg, ExtCompare());
-            if (it != mExtEnd && it->mData.mX == x && it->mData.mY == y) {
-                return &(*it);
-            }
-            return 0;
+            Exterior::const_iterator it = mExt.find(std::make_pair(x,y));
+            if (it != mExt.end())
+                return &(it->second);
+            return NULL;
         }
 
         const ESM::Pathgrid *find(int x, int y) const {
@@ -925,14 +897,10 @@ namespace MWWorld
         }
 
         const ESM::Pathgrid *search(const std::string &name) const {
-            ESM::Pathgrid pg;
-            pg.mCell = name;
-
-            iterator it = std::lower_bound(mIntBegin, mIntEnd, pg, RecordCmp());
-            if (it != mIntEnd && Misc::StringUtils::ciEqual(it->mCell, name)) {
-                return &(*it);
-            }
-            return 0;
+            Interior::const_iterator it = mInt.find(name);
+            if (it != mInt.end())
+                return &(it->second);
+            return NULL;
         }
 
         const ESM::Pathgrid *find(const std::string &name) const {
@@ -958,53 +926,20 @@ namespace MWWorld
             }
             return find(cell.mData.mX, cell.mData.mY);
         }
-
-        iterator begin() const {
-            return mStatic.begin();
-        }
-
-        iterator end() const {
-            return mStatic.end();
-        }
-
-        iterator interiorPathsBegin() const {
-            return mIntBegin;
-        }
-
-        iterator interiorPathsEnd() const {
-            return mIntEnd;
-        }
-
-        iterator exteriorPathsBegin() const {
-            return mExtBegin;
-        }
-
-        iterator exteriorPathsEnd() const {
-            return mExtEnd;
-        }
     };
 
     template <class T>
     class IndexedStore
     {
-        struct Compare
-        {
-            bool operator()(const T &x, const T &y) const {
-                return x.mIndex < y.mIndex;
-            }
-        };
     protected:
-        std::vector<T> mStatic;
+        typedef typename std::map<int, T> Static;
+        Static mStatic;
 
     public:
-        typedef typename std::vector<T>::const_iterator iterator;
+        typedef typename std::map<int, T>::const_iterator iterator;
 
         IndexedStore() {}
 
-        IndexedStore(unsigned int size) {
-            mStatic.reserve(size);
-        }
-
         iterator begin() const {
             return mStatic.begin();
         }
@@ -1013,10 +948,14 @@ namespace MWWorld
             return mStatic.end();
         }
 
-        /// \todo refine loading order
         void load(ESM::ESMReader &esm) {
-            mStatic.push_back(T());
-            mStatic.back().load(esm);
+            T record;
+            record.load(esm);
+
+            // Try to overwrite existing record
+            std::pair<typename Static::iterator, bool> ret = mStatic.insert(std::make_pair(record.mIndex, record));
+            if (!ret.second)
+                ret.first->second = record;
         }
 
         int getSize() const {
@@ -1024,40 +963,13 @@ namespace MWWorld
         }
 
         void setUp() {
-            /// \note This method sorts indexed values for further
-            /// searches. Every loaded item is present in storage, but
-            /// latest loaded shadows any previous while searching.
-            /// If memory cost will be too high, it is possible to remove
-            /// unused values.
-
-            Compare cmp;
-
-            std::stable_sort(mStatic.begin(), mStatic.end(), cmp);
-
-            typename std::vector<T>::iterator first, next;
-            next = first = mStatic.begin();
-
-            while (first != mStatic.end() && ++next != mStatic.end()) {
-                while (next != mStatic.end() && !cmp(*first, *next)) {
-                    ++next;
-                }
-                if (first != --next) {
-                    std::swap(*first, *next);
-                }
-                first = ++next;
-            }
         }
 
         const T *search(int index) const {
-            T item;
-            item.mIndex = index;
-
-            iterator it =
-                std::lower_bound(mStatic.begin(), mStatic.end(), item, Compare());
-            if (it != mStatic.end() && it->mIndex == index) {
-                return &(*it);
-            }
-            return 0;
+            typename Static::const_iterator it = mStatic.find(index);
+            if (it != mStatic.end())
+                return &(it->second);
+            return NULL;
         }
 
         const T *find(int index) const {
@@ -1075,18 +987,12 @@ namespace MWWorld
     struct Store<ESM::Skill> : public IndexedStore<ESM::Skill>
     {
         Store() {}
-        Store(unsigned int size)
-          : IndexedStore<ESM::Skill>(size)
-        {}
     };
 
     template <>
     struct Store<ESM::MagicEffect> : public IndexedStore<ESM::MagicEffect>
     {
         Store() {}
-        Store(unsigned int size)
-          : IndexedStore<ESM::MagicEffect>(size)
-        {}
     };
 
     template <>
diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index f738734b1..3f9b7d562 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -6,6 +6,8 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 
+#include "../mwsound/sound.hpp"
+
 #include "../mwrender/renderingmanager.hpp"
 
 #include "player.hpp"
@@ -152,12 +154,12 @@ WeatherManager::WeatherManager(MWRender::RenderingManager* rendering,MWWorld::Fa
     setFallbackWeather(foggy,"foggy");
 
     Weather thunderstorm;
-    thunderstorm.mRainLoopSoundID = "rain heavy";
+    thunderstorm.mAmbientLoopSoundID = "rain heavy";
     thunderstorm.mRainEffect = "meshes\\raindrop.nif";
     setFallbackWeather(thunderstorm,"thunderstorm");
 
     Weather rain;
-    rain.mRainLoopSoundID = "rain";
+    rain.mAmbientLoopSoundID = "rain";
     rain.mRainEffect = "meshes\\raindrop.nif";
     setFallbackWeather(rain,"rain");
 
@@ -186,7 +188,7 @@ WeatherManager::WeatherManager(MWRender::RenderingManager* rendering,MWWorld::Fa
 
 WeatherManager::~WeatherManager()
 {
-    stopSounds(true);
+    stopSounds();
 }
 
 void WeatherManager::setWeather(const String& weather, bool instant)
@@ -228,6 +230,8 @@ void WeatherManager::setResult(const String& weatherType)
     mResult.mCloudSpeed = current.mCloudSpeed;
     mResult.mGlareView = current.mGlareView;
     mResult.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
+    mResult.mAmbientSoundVolume = 1.f;
+    mResult.mEffectFade = 1.f;
     mResult.mSunColor = current.mSunDiscSunsetColor;
 
     mResult.mIsStorm = current.mIsStorm;
@@ -341,11 +345,30 @@ void WeatherManager::transition(float factor)
 
     mResult.mNight = current.mNight;
 
-    mResult.mIsStorm = current.mIsStorm;
-    mResult.mParticleEffect = current.mParticleEffect;
-    mResult.mRainEffect = current.mRainEffect;
-    mResult.mRainSpeed = current.mRainSpeed;
-    mResult.mRainFrequency = current.mRainFrequency;
+    if (factor < 0.5)
+    {
+        mResult.mIsStorm = current.mIsStorm;
+        mResult.mParticleEffect = current.mParticleEffect;
+        mResult.mRainEffect = current.mRainEffect;
+        mResult.mParticleEffect = current.mParticleEffect;
+        mResult.mRainSpeed = current.mRainSpeed;
+        mResult.mRainFrequency = current.mRainFrequency;
+        mResult.mAmbientSoundVolume = 1-(factor*2);
+        mResult.mEffectFade = mResult.mAmbientSoundVolume;
+        mResult.mAmbientLoopSoundID = current.mAmbientLoopSoundID;
+    }
+    else
+    {
+        mResult.mIsStorm = other.mIsStorm;
+        mResult.mParticleEffect = other.mParticleEffect;
+        mResult.mRainEffect = other.mRainEffect;
+        mResult.mParticleEffect = other.mParticleEffect;
+        mResult.mRainSpeed = other.mRainSpeed;
+        mResult.mRainFrequency = other.mRainFrequency;
+        mResult.mAmbientSoundVolume = 2*(factor-0.5);
+        mResult.mEffectFade = mResult.mAmbientSoundVolume;
+        mResult.mAmbientLoopSoundID = other.mAmbientLoopSoundID;
+    }
 }
 
 void WeatherManager::update(float duration, bool paused)
@@ -361,7 +384,7 @@ void WeatherManager::update(float duration, bool paused)
     {
         mRendering->skyDisable();
         mRendering->getSkyManager()->setLightningStrength(0.f);
-        stopSounds(true);
+        stopSounds();
         return;
     }
 
@@ -541,40 +564,25 @@ void WeatherManager::update(float duration, bool paused)
     mRendering->getSkyManager()->setWeather(mResult);
 
     // Play sounds
-    if (mNextWeather == "")
+    if (mPlayingSoundID != mResult.mAmbientLoopSoundID)
     {
-        std::string ambientSnd = mWeatherSettings[mCurrentWeather].mAmbientLoopSoundID;
-        if (!ambientSnd.empty() && std::find(mSoundsPlaying.begin(), mSoundsPlaying.end(), ambientSnd) == mSoundsPlaying.end())
-        {
-            mSoundsPlaying.push_back(ambientSnd);
-            MWBase::Environment::get().getSoundManager()->playSound(ambientSnd, 1.0, 1.0, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
-        }
+        stopSounds();
+        if (!mResult.mAmbientLoopSoundID.empty())
+            mAmbientSound = MWBase::Environment::get().getSoundManager()->playSound(mResult.mAmbientLoopSoundID, 1.0, 1.0, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
 
-        std::string rainSnd = mWeatherSettings[mCurrentWeather].mRainLoopSoundID;
-        if (!rainSnd.empty() && std::find(mSoundsPlaying.begin(), mSoundsPlaying.end(), rainSnd) == mSoundsPlaying.end())
-        {
-            mSoundsPlaying.push_back(rainSnd);
-            MWBase::Environment::get().getSoundManager()->playSound(rainSnd, 1.0, 1.0, MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Loop);
-        }
+        mPlayingSoundID = mResult.mAmbientLoopSoundID;
     }
-
-    stopSounds(false);
+    if (mAmbientSound.get())
+        mAmbientSound->setVolume(mResult.mAmbientSoundVolume);
 }
 
-void WeatherManager::stopSounds(bool stopAll)
+void WeatherManager::stopSounds()
 {
-    std::vector<std::string>::iterator it = mSoundsPlaying.begin();
-    while (it!=mSoundsPlaying.end())
+    if (mAmbientSound.get())
     {
-        if (stopAll ||
-                !((*it == mWeatherSettings[mCurrentWeather].mAmbientLoopSoundID) ||
-                (*it == mWeatherSettings[mCurrentWeather].mRainLoopSoundID)))
-        {
-            MWBase::Environment::get().getSoundManager()->stopSound(*it);
-            it = mSoundsPlaying.erase(it);
-        }
-        else
-            ++it;
+        MWBase::Environment::get().getSoundManager()->stopSound(mAmbientSound);
+        mAmbientSound.reset();
+        mPlayingSoundID.clear();
     }
 }
 
@@ -764,7 +772,7 @@ bool WeatherManager::readRecord(ESM::ESMReader& reader, int32_t type)
         state.load(reader);
 
         // reset other temporary state, now that we loaded successfully
-        stopSounds(true); // let's hope this never throws
+        stopSounds(); // let's hope this never throws
         mRegionOverrides.clear();
         mRegionMods.clear();
         mThunderFlash = 0.0;
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index 97897fda9..dee9fc52a 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -7,6 +7,8 @@
 #include <OgreColourValue.h>
 #include <OgreVector3.h>
 
+#include "../mwbase/soundmanager.hpp"
+
 namespace ESM
 {
     struct Region;
@@ -61,10 +63,12 @@ namespace MWWorld
         bool mIsStorm;
 
         std::string mAmbientLoopSoundID;
+        float mAmbientSoundVolume;
 
         std::string mParticleEffect;
-
         std::string mRainEffect;
+        float mEffectFade;
+
         float mRainSpeed;
         float mRainFrequency;
     };
@@ -125,9 +129,6 @@ namespace MWWorld
         // This is used for Blight, Ashstorm and Blizzard (Bloodmoon)
         std::string mAmbientLoopSoundID;
 
-        // Rain sound effect
-        std::string mRainLoopSoundID;
-
         // Is this an ash storm / blight storm? If so, the following will happen:
         // - The particles and clouds will be oriented so they appear to come from the Red Mountain.
         // - Characters will animate their hand to protect eyes from the storm when looking in its direction (idlestorm animation)
@@ -173,7 +174,7 @@ namespace MWWorld
          */
         void update(float duration, bool paused = false);
 
-        void stopSounds(bool stopAll);
+        void stopSounds();
 
         void setHour(const float hour);
 
@@ -206,6 +207,9 @@ namespace MWWorld
         bool mIsStorm;
         Ogre::Vector3 mStormDirection;
 
+        MWBase::SoundPtr mAmbientSound;
+        std::string mPlayingSoundID;
+
         MWWorld::Fallback* mFallback;
         void setFallbackWeather(Weather& weather,const std::string& name);
         MWRender::RenderingManager* mRendering;
@@ -214,8 +218,6 @@ namespace MWWorld
 
         std::map<std::string, std::string> mRegionOverrides;
 
-        std::vector<std::string> mSoundsPlaying;
-
         std::string mCurrentWeather;
         std::string mNextWeather;
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 4c2bd669b..d783857f1 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1057,7 +1057,7 @@ namespace MWWorld
 
     void World::deleteObject (const Ptr& ptr)
     {
-        if (ptr.getRefData().getCount() > 0)
+        if (!ptr.getRefData().isDeleted())
         {
             ptr.getRefData().setCount(0);
 
@@ -1072,6 +1072,25 @@ namespace MWWorld
         }
     }
 
+    void World::undeleteObject(const Ptr& ptr)
+    {
+        if (ptr.getCellRef().getRefNum().mContentFile == -1)
+            return;
+        if (ptr.getRefData().isDeleted())
+        {
+            ptr.getRefData().setCount(1);
+            if (mWorldScene->getActiveCells().find(ptr.getCell()) != mWorldScene->getActiveCells().end()
+                    && ptr.getRefData().isEnabled())
+            {
+                mWorldScene->addObjectToScene(ptr);
+                std::string script = ptr.getClass().getScript(ptr);
+                if (!script.empty())
+                    mLocalScripts.add(script, ptr);
+                addContainerScripts(ptr, ptr.getCell());
+            }
+        }
+    }
+
     void World::moveObject(const Ptr &ptr, CellStore* newCell, float x, float y, float z)
     {
         ESM::Position pos = ptr.getRefData().getPosition();
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index fef279705..2da6a6e05 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -338,6 +338,7 @@ namespace MWWorld
             virtual std::pair<MWWorld::Ptr,Ogre::Vector3> getHitContact(const MWWorld::Ptr &ptr, float distance);
 
             virtual void deleteObject (const Ptr& ptr);
+            virtual void undeleteObject (const Ptr& ptr);
 
             virtual void moveObject (const Ptr& ptr, float x, float y, float z);
             virtual void moveObject (const Ptr& ptr, CellStore* newCell, float x, float y, float z);
diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
index f2defd031..b8cc3fda4 100644
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@@ -1,10 +1,20 @@
+if (WIN32) # windows users can just run the morrowind installer
+    set(OPENMW_USE_UNSHIELD FALSE)
+else()
+    set(OPENMW_USE_UNSHIELD TRUE)
+
+    find_package(LIBUNSHIELD REQUIRED)
+    if(NOT LIBUNSHIELD_FOUND)
+        message(FATAL_ERROR "Failed to find Unshield library")
+    endif(NOT LIBUNSHIELD_FOUND)
+endif()
+
 set(WIZARD
     componentselectionpage.cpp
     conclusionpage.cpp
     existinginstallationpage.cpp
     importpage.cpp
     inisettings.cpp
-    installationpage.cpp
     installationtargetpage.cpp
     intropage.cpp
     languageselectionpage.cpp
@@ -12,26 +22,25 @@ set(WIZARD
     mainwizard.cpp
     methodselectionpage.cpp
 
-    unshield/unshieldworker.cpp
-
     utils/componentlistwidget.cpp
 )
 
+if(WIN32)
+    list(APPEND WIZARD ${CMAKE_SOURCE_DIR}/files/windows/openmw-wizard.rc)
+endif()
+
 set(WIZARD_HEADER
     componentselectionpage.hpp
     conclusionpage.hpp
     existinginstallationpage.hpp
     importpage.hpp
     inisettings.hpp
-    installationpage.hpp
     installationtargetpage.hpp
     intropage.hpp
     languageselectionpage.hpp
     mainwizard.hpp
     methodselectionpage.hpp
 
-    unshield/unshieldworker.hpp
-
     utils/componentlistwidget.hpp
 )
 
@@ -41,15 +50,12 @@ set(WIZARD_HEADER_MOC
     conclusionpage.hpp
     existinginstallationpage.hpp
     importpage.hpp
-    installationpage.hpp
     installationtargetpage.hpp
     intropage.hpp
     languageselectionpage.hpp
     mainwizard.hpp
     methodselectionpage.hpp
 
-    unshield/unshieldworker.hpp
-
     utils/componentlistwidget.hpp
 )
 
@@ -58,13 +64,21 @@ set(WIZARD_UI
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/conclusionpage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/existinginstallationpage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/importpage.ui
-    ${CMAKE_SOURCE_DIR}/files/ui/wizard/installationpage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/installationtargetpage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/intropage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/languageselectionpage.ui
     ${CMAKE_SOURCE_DIR}/files/ui/wizard/methodselectionpage.ui
 )
 
+if (OPENMW_USE_UNSHIELD)
+    set (WIZARD ${WIZARD} installationpage.cpp unshield/unshieldworker.cpp)
+    set (WIZARD_HEADER ${WIZARD_HEADER} installationpage.hpp unshield/unshieldworker.hpp)
+    set (WIZARD_HEADER_MOC ${WIZARD_HEADER_MOC} installationpage.hpp unshield/unshieldworker.hpp)
+    set (WIZARD_UI ${WIZARD_UI} ${CMAKE_SOURCE_DIR}/files/ui/wizard/installationpage.ui)
+    add_definitions(-DOPENMW_USE_UNSHIELD)
+endif (OPENMW_USE_UNSHIELD)
+
+
 source_group(wizard FILES ${WIZARD} ${WIZARD_HEADER})
 
 find_package(Qt4 REQUIRED)
@@ -82,7 +96,11 @@ QT4_WRAP_UI(UI_HDRS ${WIZARD_UI})
 
 
 include(${QT_USE_FILE})
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${LIBUNSHIELD_INCLUDE})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+if (OPENMW_USE_UNSHIELD)
+    include_directories(${LIBUNSHIELD_INCLUDE_DIR})
+endif()
 
 add_executable(openmw-wizard
     ${GUI_TYPE}
@@ -96,10 +114,14 @@ add_executable(openmw-wizard
 target_link_libraries(openmw-wizard
     ${Boost_LIBRARIES}
     ${QT_LIBRARIES}
-    ${LIBUNSHIELD_LIBRARY}
     components
 )
 
+if (OPENMW_USE_UNSHIELD)
+    target_link_libraries(openmw-wizard ${LIBUNSHIELD_LIBRARY})
+endif()
+
+
 if(DPKG_PROGRAM)
     INSTALL(TARGETS openmw-wizard RUNTIME DESTINATION games COMPONENT openmw-wizard)
 endif()
diff --git a/apps/wizard/componentselectionpage.cpp b/apps/wizard/componentselectionpage.cpp
index d372f677d..1fcde7857 100644
--- a/apps/wizard/componentselectionpage.cpp
+++ b/apps/wizard/componentselectionpage.cpp
@@ -62,7 +62,7 @@ void Wizard::ComponentSelectionPage::initializePage()
 
     if (field(QLatin1String("installation.new")).toBool() == true)
     {
-        morrowindItem->setFlags(morrowindItem->flags() & !Qt::ItemIsEnabled & Qt::ItemIsUserCheckable);
+        morrowindItem->setFlags((morrowindItem->flags() & ~Qt::ItemIsEnabled) | Qt::ItemIsUserCheckable);
         morrowindItem->setData(Qt::CheckStateRole, Qt::Checked);
         componentsList->addItem(morrowindItem);
 
@@ -77,7 +77,7 @@ void Wizard::ComponentSelectionPage::initializePage()
 
         if (mWizard->mInstallations[path].hasMorrowind) {
             morrowindItem->setText(tr("Morrowind\t\t(installed)"));
-            morrowindItem->setFlags(morrowindItem->flags() & !Qt::ItemIsEnabled & Qt::ItemIsUserCheckable);
+            morrowindItem->setFlags((morrowindItem->flags() & ~Qt::ItemIsEnabled) | Qt::ItemIsUserCheckable);
             morrowindItem->setData(Qt::CheckStateRole, Qt::Unchecked);
         } else {
             morrowindItem->setText(tr("Morrowind"));
@@ -88,7 +88,7 @@ void Wizard::ComponentSelectionPage::initializePage()
 
         if (mWizard->mInstallations[path].hasTribunal) {
             tribunalItem->setText(tr("Tribunal\t\t(installed)"));
-            tribunalItem->setFlags(tribunalItem->flags() & !Qt::ItemIsEnabled & Qt::ItemIsUserCheckable);
+            tribunalItem->setFlags((tribunalItem->flags() & ~Qt::ItemIsEnabled) | Qt::ItemIsUserCheckable);
             tribunalItem->setData(Qt::CheckStateRole, Qt::Unchecked);
         } else {
             tribunalItem->setText(tr("Tribunal"));
@@ -99,7 +99,7 @@ void Wizard::ComponentSelectionPage::initializePage()
 
         if (mWizard->mInstallations[path].hasBloodmoon) {
             bloodmoonItem->setText(tr("Bloodmoon\t\t(installed)"));
-            bloodmoonItem->setFlags(bloodmoonItem->flags() & !Qt::ItemIsEnabled & Qt::ItemIsUserCheckable);
+            bloodmoonItem->setFlags((bloodmoonItem->flags() & ~Qt::ItemIsEnabled) | Qt::ItemIsUserCheckable);
             bloodmoonItem->setData(Qt::CheckStateRole, Qt::Unchecked);
         } else {
             bloodmoonItem->setText(tr("Bloodmoon"));
diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
index d539793ec..e68070c4d 100644
--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@@ -15,10 +15,13 @@
 #include "existinginstallationpage.hpp"
 #include "installationtargetpage.hpp"
 #include "componentselectionpage.hpp"
-#include "installationpage.hpp"
 #include "importpage.hpp"
 #include "conclusionpage.hpp"
 
+#ifdef OPENMW_USE_UNSHIELD
+#include "installationpage.hpp"
+#endif
+
 using namespace Process;
 
 Wizard::MainWizard::MainWizard(QWidget *parent) :
@@ -322,7 +325,9 @@ void Wizard::MainWizard::setupPages()
     setPage(Page_ExistingInstallation, new ExistingInstallationPage(this));
     setPage(Page_InstallationTarget, new InstallationTargetPage(this, mCfgMgr));
     setPage(Page_ComponentSelection, new ComponentSelectionPage(this));
+#ifdef OPENMW_USE_UNSHIELD
     setPage(Page_Installation, new InstallationPage(this));
+#endif
     setPage(Page_Import, new ImportPage(this));
     setPage(Page_Conclusion, new ConclusionPage(this));
     setStartId(Page_Intro);
diff --git a/apps/wizard/methodselectionpage.cpp b/apps/wizard/methodselectionpage.cpp
index d7c64f3b0..5f3917bd5 100644
--- a/apps/wizard/methodselectionpage.cpp
+++ b/apps/wizard/methodselectionpage.cpp
@@ -9,6 +9,11 @@ Wizard::MethodSelectionPage::MethodSelectionPage(QWidget *parent) :
 
     setupUi(this);
 
+#ifndef OPENMW_USE_UNSHIELD
+    newLocationRadioButton->setEnabled(false);
+    existingLocationRadioButton->setChecked(true);
+#endif
+
     registerField(QLatin1String("installation.new"), newLocationRadioButton);
 }
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 6a1db371d..234325718 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -96,7 +96,7 @@ add_component_dir (ogreinit
     )
 
 add_component_dir (widgets
-    box imagebutton tags list numericeditbox widgets
+    box imagebutton tags list numericeditbox sharedstatebutton widgets
     )
 
 add_component_dir (fontloader
diff --git a/components/compiler/streamerrorhandler.cpp b/components/compiler/streamerrorhandler.cpp
index 8a74ad086..fc1a05943 100644
--- a/components/compiler/streamerrorhandler.cpp
+++ b/components/compiler/streamerrorhandler.cpp
@@ -16,7 +16,7 @@ namespace Compiler
             mStream << "warning ";
 
         mStream
-            << "line " << loc.mLine << ", column " << loc.mColumn
+            << "line " << loc.mLine+1 << ", column " << loc.mColumn+1
             << " (" << loc.mLiteral << ")" << std::endl
             << "    " << message << std::endl;
     }
diff --git a/components/esm/loadcell.cpp b/components/esm/loadcell.cpp
index bbd6696f1..347f3fde4 100644
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@@ -177,9 +177,9 @@ bool Cell::getNextRef(ESMReader &esm, CellRef &ref, bool& deleted)
     // NOTE: We should not need this check. It is a safety check until we have checked
     // more plugins, and how they treat these moved references.
     if (esm.isNextSub("MVRF")) {
-        esm.skipRecord(); // skip MVRF
-        esm.skipRecord(); // skip CNDT
-        // That should be it, I haven't seen any other fields yet.
+        // skip rest of cell record (moved references), they are handled elsewhere
+        esm.skipRecord(); // skip MVRF, CNDT
+        return false;
     }
 
     ref.load (esm);
diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index ff0362aa2..f2da8f377 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -63,6 +63,8 @@ void Dialogue::readInfo(ESMReader &esm, bool merge)
     std::map<std::string, ESM::Dialogue::InfoContainer::iterator>::iterator lookup;
 
     lookup = mLookup.find(id);
+
+    ESM::DialInfo info;
     if (lookup != mLookup.end())
     {
         it = lookup->second;
@@ -70,13 +72,17 @@ void Dialogue::readInfo(ESMReader &esm, bool merge)
         // Merge with existing record. Only the subrecords that are present in
         // the new record will be overwritten.
         it->load(esm);
-        return;
-    }
+        info = *it;
 
-    // New record
-    ESM::DialInfo info;
-    info.mId = id;
-    info.load(esm);
+        // Since the record merging may have changed the next/prev linked list connection, we need to re-insert the record
+        mInfo.erase(it);
+        mLookup.erase(lookup);
+    }
+    else
+    {
+        info.mId = id;
+        info.load(esm);
+    }
 
     if (info.mNext.empty())
     {
diff --git a/components/esm/loadscpt.cpp b/components/esm/loadscpt.cpp
index 19e3f3bb3..07561c2ea 100644
--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@@ -30,7 +30,14 @@ void Script::load(ESMReader &esm)
         int s = mData.mStringTableSize;
 
         std::vector<char> tmp (s);
-        esm.getHExact (&tmp[0], s);
+        // not using getHExact, vanilla doesn't seem to mind unused bytes at the end
+        esm.getSubHeader();
+        int left = esm.getSubSize();
+        if (left < s)
+            esm.fail("SCVR string list is smaller than specified");
+        esm.getExact(&tmp[0], s);
+        if (left > s)
+            esm.skip(left-s); // skip the leftover junk
 
         // Set up the list of variable names
         mVarNames.resize(mData.mNumShorts + mData.mNumLongs + mData.mNumFloats);
diff --git a/components/files/androidpath.cpp b/components/files/androidpath.cpp
index e2f9e948a..117626095 100644
--- a/components/files/androidpath.cpp
+++ b/components/files/androidpath.cpp
@@ -5,11 +5,37 @@
 #include <cstdlib>
 #include <cstring>
 #include <pwd.h>
+#include "androidpath.h"
 #include <unistd.h>
 #include <boost/filesystem/fstream.hpp>
 
+
+class Buffer {
+    public:
+      static void setData(char const *data);
+      static char const * getData();
+};
+static char const *path;
+
+void Buffer::setData(char const *data)
+{
+    path=data;
+}
+char const * Buffer::getData()
+{
+    return path;
+}
+
+
+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_getPathToJni(JNIEnv *env, jobject obj, jstring prompt)
+{
+    jboolean iscopy;
+    Buffer::setData((env)->GetStringUTFChars(prompt, &iscopy));
+}
+
 namespace
 {
+
     boost::filesystem::path getUserHome()
     {
         const char* dir = getenv("HOME");
@@ -53,22 +79,30 @@ AndroidPath::AndroidPath(const std::string& application_name)
 
 boost::filesystem::path AndroidPath::getUserConfigPath() const
 {
-    return getEnv("XDG_CONFIG_HOME",  "/sdcard/libopenmw/config") / mName;
+    std::string buffer = ""; 
+    buffer = buffer + Buffer::getData() +"/config";
+    return getEnv("XDG_CONFIG_HOME", buffer) / mName;
 }
 
 boost::filesystem::path AndroidPath::getUserDataPath() const
 {
-    return getEnv("XDG_DATA_HOME", "/sdcard/libopenmw/share") / mName;
+    std::string buffer = ""; 
+    buffer = buffer + Buffer::getData() +"/share";
+    return getEnv("XDG_DATA_HOME", buffer) / mName;
 }
 
 boost::filesystem::path AndroidPath::getCachePath() const
 {
-    return getEnv("XDG_CACHE_HOME", "/sdcard/libopenmw/cache") / mName;
+    std::string buffer = ""; 
+    buffer = buffer + Buffer::getData() +"/cache";
+    return getEnv("XDG_CACHE_HOME", buffer) / mName;
 }
 
 boost::filesystem::path AndroidPath::getGlobalConfigPath() const
 {
-    boost::filesystem::path globalPath("/sdcard/libopenmw/"); 
+    std::string buffer = ""; 
+    buffer = buffer + Buffer::getData() +"/";
+    boost::filesystem::path globalPath(buffer); 
     return globalPath / mName;
 }
 
@@ -79,7 +113,9 @@ boost::filesystem::path AndroidPath::getLocalPath() const
 
 boost::filesystem::path AndroidPath::getGlobalDataPath() const
 {
-    boost::filesystem::path globalDataPath("/sdcard/libopenmw/data");
+    std::string buffer = ""; 
+    buffer = buffer + Buffer::getData() +"/data";
+    boost::filesystem::path globalDataPath(buffer);
     return globalDataPath / mName;
 }
 
diff --git a/components/files/androidpath.h b/components/files/androidpath.h
new file mode 100644
index 000000000..3157c067f
--- /dev/null
+++ b/components/files/androidpath.h
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+
+#ifndef _Included_org_libsdl_app_SDLActivity_getPathToJni
+#define _Included_org_libsdl_app_SDLActivity_getPathToJni
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     Java_org_libsdl_app_SDLActivity_getPathToJni
+ * Method:    getPathToJni
+ * Signature: (I)I
+ */
+JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_getPathToJni(JNIEnv *env, jobject obj, jstring prompt);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/components/files/androidpath.hpp b/components/files/androidpath.hpp
index 792462fc6..a8124e6db 100644
--- a/components/files/androidpath.hpp
+++ b/components/files/androidpath.hpp
@@ -7,12 +7,15 @@
 /**
  * \namespace Files
  */
+
+
 namespace Files
 {
 
 struct AndroidPath
 {
     AndroidPath(const std::string& application_name);
+    
 
     /**
      * \brief Return path to the user directory.
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index f3b5a27f8..d9de12fb5 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -272,7 +272,7 @@ class NiSkinData : public Record
 public:
     struct BoneTrafo
     {
-        Ogre::Matrix3 rotationScale; // Rotation offset from bone, non-uniform scale
+        Ogre::Matrix3 rotation; // Rotation offset from bone?
         Ogre::Vector3 trans;    // Translation
         float scale;            // Probably scale (always 1)
     };
@@ -295,7 +295,7 @@ public:
 
     void read(NIFStream *nif)
     {
-        trafo.rotationScale = nif->getMatrix3();
+        trafo.rotation = nif->getMatrix3();
         trafo.trans = nif->getVector3();
         trafo.scale = nif->getFloat();
 
@@ -307,7 +307,7 @@ public:
         {
             BoneInfo &bi = bones[i];
 
-            bi.trafo.rotationScale = nif->getMatrix3();
+            bi.trafo.rotation = nif->getMatrix3();
             bi.trafo.trans = nif->getVector3();
             bi.trafo.scale = nif->getFloat();
             bi.unknown = nif->getVector4();
@@ -350,8 +350,11 @@ struct NiMorphData : public Record
 struct NiKeyframeData : public Record
 {
     QuaternionKeyMap mRotations;
-    //\FIXME mXYZ_Keys are read, but not used.
-    FloatKeyMap mXYZ_Keys;
+
+    FloatKeyMap mXRotations;
+    FloatKeyMap mYRotations;
+    FloatKeyMap mZRotations;
+
     Vector3KeyMap mTranslations;
     FloatKeyMap mScales;
 
@@ -362,12 +365,9 @@ struct NiKeyframeData : public Record
         {
             //Chomp unused float
             nif->getFloat();
-            for(size_t i=0;i<3;++i)
-            {
-                //Read concatenates items together. 
-                mXYZ_Keys.read(nif,true);
-            }
-            nif->file->warn("XYZ_ROTATION_KEY read, but not used!");
+            mXRotations.read(nif, true);
+            mYRotations.read(nif, true);
+            mZRotations.read(nif, true);
         }
         mTranslations.read(nif);
         mScales.read(nif);
diff --git a/components/nif/nifkey.hpp b/components/nif/nifkey.hpp
index b0db80914..cb8142720 100644
--- a/components/nif/nifkey.hpp
+++ b/components/nif/nifkey.hpp
@@ -49,9 +49,7 @@ struct KeyMapT {
         if(count == 0 && !force)
             return;
 
-        //If we aren't forcing things, make sure that read clears any previous keys
-        if(!force)
-            mKeys.clear();
+        mKeys.clear();
 
         mInterpolationType = nif->getUInt();
 
@@ -88,7 +86,7 @@ struct KeyMapT {
         //XYZ keys aren't actually read here.
         //data.hpp sees that the last type read was sXYZInterpolation and:
         //    Eats a floating point number, then
-        //    Re-runs the read function 3 more times, with force enabled so that the previous values aren't cleared.
+        //    Re-runs the read function 3 more times.
         //        When it does that it's reading in a bunch of sLinearInterpolation keys, not sXYZInterpolation.
         else if(mInterpolationType == sXYZInterpolation)
         {
diff --git a/components/nif/nifstream.cpp b/components/nif/nifstream.cpp
index 527d1a2af..a6fd5ef5a 100644
--- a/components/nif/nifstream.cpp
+++ b/components/nif/nifstream.cpp
@@ -76,7 +76,7 @@ Transformation NIFStream::getTrafo()
 {
     Transformation t;
     t.pos = getVector3();
-    t.rotationScale = getMatrix3();
+    t.rotation = getMatrix3();
     t.scale = getFloat();
     return t;
 }
diff --git a/components/nif/niftypes.hpp b/components/nif/niftypes.hpp
index f9235ec45..786c48b65 100644
--- a/components/nif/niftypes.hpp
+++ b/components/nif/niftypes.hpp
@@ -35,7 +35,7 @@ namespace Nif
 struct Transformation
 {
     Ogre::Vector3 pos;
-    Ogre::Matrix3 rotationScale;
+    Ogre::Matrix3 rotation;
     float scale;
 
     static const Transformation& getIdentity()
diff --git a/components/nif/node.cpp b/components/nif/node.cpp
index 7529e602d..fb68da548 100644
--- a/components/nif/node.cpp
+++ b/components/nif/node.cpp
@@ -9,10 +9,11 @@ void Node::getProperties(const Nif::NiTexturingProperty *&texprop,
                          const Nif::NiVertexColorProperty *&vertprop,
                          const Nif::NiZBufferProperty *&zprop,
                          const Nif::NiSpecularProperty *&specprop,
-                         const Nif::NiWireframeProperty *&wireprop) const
+                         const Nif::NiWireframeProperty *&wireprop,
+                         const Nif::NiStencilProperty *&stencilprop) const
 {
     if(parent)
-        parent->getProperties(texprop, matprop, alphaprop, vertprop, zprop, specprop, wireprop);
+        parent->getProperties(texprop, matprop, alphaprop, vertprop, zprop, specprop, wireprop, stencilprop);
 
     for(size_t i = 0;i < props.length();i++)
     {
@@ -35,6 +36,8 @@ void Node::getProperties(const Nif::NiTexturingProperty *&texprop,
             specprop = static_cast<const Nif::NiSpecularProperty*>(pr);
         else if(pr->recType == Nif::RC_NiWireframeProperty)
             wireprop = static_cast<const Nif::NiWireframeProperty*>(pr);
+        else if (pr->recType == Nif::RC_NiStencilProperty)
+            stencilprop = static_cast<const Nif::NiStencilProperty*>(pr);
         else
             std::cerr<< "Unhandled property type: "<<pr->recName <<std::endl;
     }
@@ -42,9 +45,8 @@ void Node::getProperties(const Nif::NiTexturingProperty *&texprop,
 
 Ogre::Matrix4 Node::getLocalTransform() const
 {
-    Ogre::Matrix4 mat4 = Ogre::Matrix4(trafo.rotationScale);
-    mat4.setTrans(trafo.pos);
-    mat4.setScale(Ogre::Vector3(trafo.rotationScale[0][0], trafo.rotationScale[1][1], trafo.rotationScale[2][2]) * trafo.scale);
+    Ogre::Matrix4 mat4 = Ogre::Matrix4(Ogre::Matrix4::IDENTITY);
+    mat4.makeTransform(trafo.pos, Ogre::Vector3(trafo.scale), Ogre::Quaternion(trafo.rotation));
     return mat4;
 }
 
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index c8c0b6db9..a26480d59 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -98,7 +98,8 @@ public:
                        const Nif::NiVertexColorProperty *&vertprop,
                        const Nif::NiZBufferProperty *&zprop,
                        const Nif::NiSpecularProperty *&specprop,
-                       const Nif::NiWireframeProperty *&wireprop) const;
+                       const Nif::NiWireframeProperty *&wireprop,
+                       const Nif::NiStencilProperty *&stencilprop) const;
 
     Ogre::Matrix4 getLocalTransform() const;
     Ogre::Matrix4 getWorldTransform() const;
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index b366216de..3abe0c171 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -133,8 +133,6 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
     mResourceName = mShape->getName();
     mShape->mCollide = false;
     mBoundingBox = NULL;
-    mShape->mBoxTranslation = Ogre::Vector3(0,0,0);
-    mShape->mBoxRotation = Ogre::Quaternion::IDENTITY;
     mStaticMesh = NULL;
     mCompoundShape = NULL;
 
diff --git a/components/nifogre/material.cpp b/components/nifogre/material.cpp
index 517f29f4e..90930bca8 100644
--- a/components/nifogre/material.cpp
+++ b/components/nifogre/material.cpp
@@ -54,6 +54,28 @@ static const char *getTestMode(int mode)
     return "less_equal";
 }
 
+static void setTextureProperties(sh::MaterialInstance* material, const std::string& textureSlotName, const Nif::NiTexturingProperty::Texture& tex)
+{
+    material->setProperty(textureSlotName + "UVSet", sh::makeProperty(new sh::IntValue(tex.uvSet)));
+    const std::string clampMode = textureSlotName + "ClampMode";
+    switch (tex.clamp)
+    {
+    case 0:
+        material->setProperty(clampMode, sh::makeProperty(new sh::StringValue("clamp clamp")));
+        break;
+    case 1:
+        material->setProperty(clampMode, sh::makeProperty(new sh::StringValue("clamp wrap")));
+        break;
+    case 2:
+        material->setProperty(clampMode, sh::makeProperty(new sh::StringValue("wrap clamp")));
+        break;
+    case 3:
+    default:
+        material->setProperty(clampMode, sh::makeProperty(new sh::StringValue("wrap wrap")));
+        break;
+    }
+}
+
 Ogre::String NIFMaterialLoader::getMaterial(const Nif::ShapeData *shapedata,
                                             const Ogre::String &name, const Ogre::String &group,
                                             const Nif::NiTexturingProperty *texprop,
@@ -63,6 +85,7 @@ Ogre::String NIFMaterialLoader::getMaterial(const Nif::ShapeData *shapedata,
                                             const Nif::NiZBufferProperty *zprop,
                                             const Nif::NiSpecularProperty *specprop,
                                             const Nif::NiWireframeProperty *wireprop,
+                                            const Nif::NiStencilProperty *stencilprop,
                                             bool &needTangents, bool particleMaterial)
 {
     Ogre::MaterialManager &matMgr = Ogre::MaterialManager::getSingleton();
@@ -84,6 +107,7 @@ Ogre::String NIFMaterialLoader::getMaterial(const Nif::ShapeData *shapedata,
     // Default should be 1, but Bloodmoon's models are broken
     int specFlags = 0;
     int wireFlags = 0;
+    int drawMode = 1;
     Ogre::String texName[7];
 
     bool vertexColour = (shapedata->colors.size() != 0);
@@ -183,6 +207,20 @@ Ogre::String NIFMaterialLoader::getMaterial(const Nif::ShapeData *shapedata,
         }
     }
 
+    if(stencilprop)
+    {
+        drawMode = stencilprop->data.drawMode;
+        if (stencilprop->data.enabled)
+            warn("Unhandled stencil test in "+name);
+
+        Nif::ControllerPtr ctrls = stencilprop->controller;
+        while(!ctrls.empty())
+        {
+            warn("Unhandled stencil controller "+ctrls->recName+" in "+name);
+            ctrls = ctrls->next;
+        }
+    }
+
     // Material
     if(matprop)
     {
@@ -227,8 +265,13 @@ Ogre::String NIFMaterialLoader::getMaterial(const Nif::ShapeData *shapedata,
         for(int i = 0;i < 7;i++)
         {
             if(!texName[i].empty())
+            {
                 boost::hash_combine(h, texName[i]);
+                boost::hash_combine(h, texprop->textures[i].clamp);
+                boost::hash_combine(h, texprop->textures[i].uvSet);
+            }
         }
+        boost::hash_combine(h, drawMode);
         boost::hash_combine(h, vertexColour);
         boost::hash_combine(h, alphaFlags);
         boost::hash_combine(h, alphaTest);
@@ -286,6 +329,13 @@ Ogre::String NIFMaterialLoader::getMaterial(const Nif::ShapeData *shapedata,
         instance->setProperty("polygon_mode", sh::makeProperty(new sh::StringValue("wireframe")));
     }
 
+    if (drawMode == 1)
+        instance->setProperty("cullmode", sh::makeProperty(new sh::StringValue("clockwise")));
+    else if (drawMode == 2)
+        instance->setProperty("cullmode", sh::makeProperty(new sh::StringValue("anticlockwise")));
+    else if (drawMode == 3)
+        instance->setProperty("cullmode", sh::makeProperty(new sh::StringValue("none")));
+
     instance->setProperty("diffuseMap", sh::makeProperty(texName[Nif::NiTexturingProperty::BaseTexture]));
     instance->setProperty("normalMap", sh::makeProperty(texName[Nif::NiTexturingProperty::BumpTexture]));
     instance->setProperty("detailMap", sh::makeProperty(texName[Nif::NiTexturingProperty::DetailTexture]));
@@ -294,22 +344,22 @@ Ogre::String NIFMaterialLoader::getMaterial(const Nif::ShapeData *shapedata,
     if (!texName[Nif::NiTexturingProperty::BaseTexture].empty())
     {
         instance->setProperty("use_diffuse_map", sh::makeProperty(new sh::BooleanValue(true)));
-        instance->setProperty("diffuseMapUVSet", sh::makeProperty(new sh::IntValue(texprop->textures[Nif::NiTexturingProperty::BaseTexture].uvSet)));
+        setTextureProperties(instance, "diffuseMap", texprop->textures[Nif::NiTexturingProperty::BaseTexture]);
     }
     if (!texName[Nif::NiTexturingProperty::GlowTexture].empty())
     {
         instance->setProperty("use_emissive_map", sh::makeProperty(new sh::BooleanValue(true)));
-        instance->setProperty("emissiveMapUVSet", sh::makeProperty(new sh::IntValue(texprop->textures[Nif::NiTexturingProperty::GlowTexture].uvSet)));
+        setTextureProperties(instance, "emissiveMap", texprop->textures[Nif::NiTexturingProperty::GlowTexture]);
     }
     if (!texName[Nif::NiTexturingProperty::DetailTexture].empty())
     {
         instance->setProperty("use_detail_map", sh::makeProperty(new sh::BooleanValue(true)));
-        instance->setProperty("detailMapUVSet", sh::makeProperty(new sh::IntValue(texprop->textures[Nif::NiTexturingProperty::DetailTexture].uvSet)));
+        setTextureProperties(instance, "detailMap", texprop->textures[Nif::NiTexturingProperty::DetailTexture]);
     }
     if (!texName[Nif::NiTexturingProperty::DarkTexture].empty())
     {
         instance->setProperty("use_dark_map", sh::makeProperty(new sh::BooleanValue(true)));
-        instance->setProperty("darkMapUVSet", sh::makeProperty(new sh::IntValue(texprop->textures[Nif::NiTexturingProperty::DarkTexture].uvSet)));
+        setTextureProperties(instance, "darkMap", texprop->textures[Nif::NiTexturingProperty::DarkTexture]);
     }
 
     bool useParallax = !texName[Nif::NiTexturingProperty::BumpTexture].empty()
@@ -332,7 +382,7 @@ Ogre::String NIFMaterialLoader::getMaterial(const Nif::ShapeData *shapedata,
         instance->setProperty("has_vertex_colour", sh::makeProperty(new sh::BooleanValue(true)));
 
     // Override alpha flags based on our override list (transparency-overrides.cfg)
-    if (!texName[0].empty())
+    if ((alphaFlags&1) && !texName[0].empty())
     {
         NifOverrides::TransparencyResult result = NifOverrides::Overrides::getTransparencyOverride(texName[0]);
         if (result.first)
diff --git a/components/nifogre/material.hpp b/components/nifogre/material.hpp
index d485439cf..6be52d1a5 100644
--- a/components/nifogre/material.hpp
+++ b/components/nifogre/material.hpp
@@ -18,6 +18,7 @@ namespace Nif
     class NiZBufferProperty;
     class NiSpecularProperty;
     class NiWireframeProperty;
+    class NiStencilProperty;
 }
 
 namespace NifOgre
@@ -41,6 +42,7 @@ public:
                                     const Nif::NiZBufferProperty *zprop,
                                     const Nif::NiSpecularProperty *specprop,
                                     const Nif::NiWireframeProperty *wireprop,
+                                    const Nif::NiStencilProperty *stencilprop,
                                     bool &needTangents, bool particleMaterial=false);
 };
 
diff --git a/components/nifogre/mesh.cpp b/components/nifogre/mesh.cpp
index c952e664d..4932dd009 100644
--- a/components/nifogre/mesh.cpp
+++ b/components/nifogre/mesh.cpp
@@ -138,10 +138,9 @@ void NIFMeshLoader::createSubMesh(Ogre::Mesh *mesh, const Nif::NiTriShape *shape
         const Nif::NodeList &bones = skin->bones;
         for(size_t b = 0;b < bones.length();b++)
         {
-            const Ogre::Matrix3& rotationScale = data->bones[b].trafo.rotationScale;
-            Ogre::Matrix4 mat (rotationScale);
-            mat.setTrans(data->bones[b].trafo.trans);
-            mat.setScale(Ogre::Vector3(rotationScale[0][0], rotationScale[1][1], rotationScale[2][2]) * data->bones[b].trafo.scale);
+            Ogre::Matrix4 mat;
+            mat.makeTransform(data->bones[b].trafo.trans, Ogre::Vector3(data->bones[b].trafo.scale),
+                              Ogre::Quaternion(data->bones[b].trafo.rotation));
             mat = bones[b]->getWorldTransform() * mat;
 
             const std::vector<Nif::NiSkinData::VertWeight> &weights = data->bones[b].weights;
@@ -321,13 +320,14 @@ void NIFMeshLoader::createSubMesh(Ogre::Mesh *mesh, const Nif::NiTriShape *shape
     const Nif::NiZBufferProperty *zprop = NULL;
     const Nif::NiSpecularProperty *specprop = NULL;
     const Nif::NiWireframeProperty *wireprop = NULL;
+    const Nif::NiStencilProperty *stencilprop = NULL;
     bool needTangents = false;
 
-    shape->getProperties(texprop, matprop, alphaprop, vertprop, zprop, specprop, wireprop);
+    shape->getProperties(texprop, matprop, alphaprop, vertprop, zprop, specprop, wireprop, stencilprop);
     std::string matname = NIFMaterialLoader::getMaterial(data, mesh->getName(), mGroup,
                                                          texprop, matprop, alphaprop,
                                                          vertprop, zprop, specprop,
-                                                         wireprop, needTangents);
+                                                         wireprop, stencilprop, needTangents);
     if(matname.length() > 0)
         sub->setMaterialName(matname);
 
diff --git a/components/nifogre/ogrenifloader.cpp b/components/nifogre/ogrenifloader.cpp
index dcc34f627..1d1e1a22d 100644
--- a/components/nifogre/ogrenifloader.cpp
+++ b/components/nifogre/ogrenifloader.cpp
@@ -161,6 +161,38 @@ void ObjectScene::rotateBillboardNodes(Ogre::Camera *camera)
     }
 }
 
+void ObjectScene::_notifyAttached()
+{
+    // convert initial particle positions to world space for world-space particle systems
+    // this can't be done on creation because the particle system is not in its correct world space position yet
+    for (std::vector<Ogre::ParticleSystem*>::iterator it = mParticles.begin(); it != mParticles.end(); ++it)
+    {
+        Ogre::ParticleSystem* psys = *it;
+        if (psys->getKeepParticlesInLocalSpace())
+            continue;
+        Ogre::ParticleIterator pi = psys->_getIterator();
+        while (!pi.end())
+        {
+            Ogre::Particle *p = pi.getNext();
+
+#if OGRE_VERSION >= (1 << 16 | 10 << 8 | 0)
+            Ogre::Vector3& position = p->mPosition;
+            Ogre::Vector3& direction = p->mDirection;
+#else
+            Ogre::Vector3& position = p->position;
+            Ogre::Vector3& direction = p->direction;
+#endif
+
+            position =
+                (psys->getParentNode()->_getDerivedOrientation() *
+                (psys->getParentNode()->_getDerivedScale() * position))
+                + psys->getParentNode()->_getDerivedPosition();
+            direction =
+                (psys->getParentNode()->_getDerivedOrientation() * direction);
+        }
+    }
+}
+
 // Animates a texture
 class FlipController
 {
@@ -410,6 +442,9 @@ public:
     {
     private:
         const Nif::QuaternionKeyMap* mRotations;
+        const Nif::FloatKeyMap* mXRotations;
+        const Nif::FloatKeyMap* mYRotations;
+        const Nif::FloatKeyMap* mZRotations;
         const Nif::Vector3KeyMap* mTranslations;
         const Nif::FloatKeyMap* mScales;
         Nif::NIFFilePtr mNif; // Hold a SharedPtr to make sure key lists stay valid
@@ -440,11 +475,25 @@ public:
                 return keys.rbegin()->second.mValue;
         }
 
+        Ogre::Quaternion getXYZRotation(float time) const
+        {
+            float xrot = interpKey(mXRotations->mKeys, time);
+            float yrot = interpKey(mYRotations->mKeys, time);
+            float zrot = interpKey(mZRotations->mKeys, time);
+            Ogre::Quaternion xr(Ogre::Radian(xrot), Ogre::Vector3::UNIT_X);
+            Ogre::Quaternion yr(Ogre::Radian(yrot), Ogre::Vector3::UNIT_Y);
+            Ogre::Quaternion zr(Ogre::Radian(zrot), Ogre::Vector3::UNIT_Z);
+            return (xr*yr*zr);
+        }
+
     public:
         /// @note The NiKeyFrameData must be valid as long as this KeyframeController exists.
         Value(Ogre::Node *target, const Nif::NIFFilePtr& nif, const Nif::NiKeyframeData *data)
           : NodeTargetValue<Ogre::Real>(target)
           , mRotations(&data->mRotations)
+          , mXRotations(&data->mXRotations)
+          , mYRotations(&data->mYRotations)
+          , mZRotations(&data->mZRotations)
           , mTranslations(&data->mTranslations)
           , mScales(&data->mScales)
           , mNif(nif)
@@ -454,6 +503,8 @@ public:
         {
             if(mRotations->mKeys.size() > 0)
                 return interpKey(mRotations->mKeys, time);
+            else if (!mXRotations->mKeys.empty() || !mYRotations->mKeys.empty() || !mZRotations->mKeys.empty())
+                return getXYZRotation(time);
             return mNode->getOrientation();
         }
 
@@ -481,6 +532,8 @@ public:
         {
             if(mRotations->mKeys.size() > 0)
                 mNode->setOrientation(interpKey(mRotations->mKeys, time));
+            else if (!mXRotations->mKeys.empty() || !mYRotations->mKeys.empty() || !mZRotations->mKeys.empty())
+                mNode->setOrientation(getXYZRotation(time));
             if(mTranslations->mKeys.size() > 0)
                 mNode->setPosition(interpKey(mTranslations->mKeys, time));
             if(mScales->mKeys.size() > 0)
@@ -732,7 +785,8 @@ class NIFObjectLoader
         const Nif::NiZBufferProperty *zprop = NULL;
         const Nif::NiSpecularProperty *specprop = NULL;
         const Nif::NiWireframeProperty *wireprop = NULL;
-        node->getProperties(texprop, matprop, alphaprop, vertprop, zprop, specprop, wireprop);
+        const Nif::NiStencilProperty *stencilprop = NULL;
+        node->getProperties(texprop, matprop, alphaprop, vertprop, zprop, specprop, wireprop, stencilprop);
 
         Ogre::ControllerValueRealPtr srcval((animflags&Nif::NiNode::AnimFlag_AutoPlay) ?
                                             Ogre::ControllerManager::getSingleton().getFrameTimeSource() :
@@ -889,13 +943,14 @@ class NIFObjectLoader
         const Nif::NiZBufferProperty *zprop = NULL;
         const Nif::NiSpecularProperty *specprop = NULL;
         const Nif::NiWireframeProperty *wireprop = NULL;
+        const Nif::NiStencilProperty *stencilprop = NULL;
         bool needTangents = false;
 
-        partnode->getProperties(texprop, matprop, alphaprop, vertprop, zprop, specprop, wireprop);
+        partnode->getProperties(texprop, matprop, alphaprop, vertprop, zprop, specprop, wireprop, stencilprop);
         partsys->setMaterialName(NIFMaterialLoader::getMaterial(particledata, fullname, group,
                                                                 texprop, matprop, alphaprop,
                                                                 vertprop, zprop, specprop,
-                                                                wireprop, needTangents,
+                                                                wireprop, stencilprop, needTangents,
                                                                 // MW doesn't light particles, but the MaterialProperty
                                                                 // used still has lighting, so that must be ignored.
                                                                 true));
@@ -947,6 +1002,8 @@ class NIFObjectLoader
                     createParticleEmitterAffectors(partsys, partctrl, trgtbone, scene->mSkelBase->getName());
                 }
 
+                createParticleInitialState(partsys, particledata, partctrl);
+
                 Ogre::ControllerValueRealPtr srcval((partflags&Nif::NiNode::ParticleFlag_AutoPlay) ?
                                                     Ogre::ControllerManager::getSingleton().getFrameTimeSource() :
                                                     Ogre::ControllerValueRealPtr());
@@ -973,6 +1030,50 @@ class NIFObjectLoader
         createMaterialControllers(partnode, partsys, animflags, scene);
     }
 
+    static void createParticleInitialState(Ogre::ParticleSystem* partsys, const Nif::NiAutoNormalParticlesData* particledata,
+                                           const Nif::NiParticleSystemController* partctrl)
+    {
+        partsys->_update(0.f); // seems to be required to allocate mFreeParticles
+        int i=0;
+        for (std::vector<Nif::NiParticleSystemController::Particle>::const_iterator it = partctrl->particles.begin();
+             i<particledata->activeCount && it != partctrl->particles.end(); ++it, ++i)
+        {
+            const Nif::NiParticleSystemController::Particle& particle = *it;
+
+            Ogre::Particle* created = partsys->createParticle();
+            if (!created)
+                break;
+
+#if OGRE_VERSION >= (1 << 16 | 10 << 8 | 0)
+            Ogre::Vector3& position = created->mPosition;
+            Ogre::Vector3& direction = created->mDirection;
+            Ogre::ColourValue& colour = created->mColour;
+            float& totalTimeToLive = created->mTotalTimeToLive;
+            float& timeToLive = created->mTimeToLive;
+#else
+            Ogre::Vector3& position = created->position;
+            Ogre::Vector3& direction = created->direction;
+            Ogre::ColourValue& colour = created->colour;
+            float& totalTimeToLive = created->totalTimeToLive;
+            float& timeToLive = created->timeToLive;
+#endif
+
+            direction = particle.velocity;
+            position = particledata->vertices.at(particle.vertex);
+
+            if (particle.vertex < int(particledata->colors.size()))
+            {
+                Ogre::Vector4 partcolour = particledata->colors.at(particle.vertex);
+                colour = Ogre::ColourValue(partcolour.x, partcolour.y, partcolour.z, partcolour.w);
+            }
+            else
+                colour = Ogre::ColourValue(1.f, 1.f, 1.f, 1.f);
+            float size = particledata->sizes.at(particle.vertex);
+            created->setDimensions(size, size);
+            totalTimeToLive = std::max(0.f, particle.lifespan);
+            timeToLive = std::max(0.f, particle.lifespan - particle.lifetime);
+        }
+    }
 
     static void createNodeControllers(const Nif::NIFFilePtr& nif, const std::string &name, Nif::ControllerPtr ctrl, ObjectScenePtr scene, int animflags)
     {
@@ -1273,6 +1374,8 @@ ObjectScenePtr Loader::createObjects(Ogre::SceneNode *parentNode, std::string na
             parentNode->attachObject(entity);
     }
 
+    scene->_notifyAttached();
+
     return scene;
 }
 
@@ -1340,6 +1443,8 @@ ObjectScenePtr Loader::createObjects(Ogre::Entity *parent, const std::string &bo
         }
     }
 
+    scene->_notifyAttached();
+
     return scene;
 }
 
diff --git a/components/nifogre/ogrenifloader.hpp b/components/nifogre/ogrenifloader.hpp
index abadd38de..485495a38 100644
--- a/components/nifogre/ogrenifloader.hpp
+++ b/components/nifogre/ogrenifloader.hpp
@@ -84,6 +84,10 @@ struct ObjectScene {
     void rotateBillboardNodes(Ogre::Camera* camera);
 
     void setVisibilityFlags (unsigned int flags);
+
+    // This is called internally by the OgreNifLoader once all elements of the
+    // scene have been attached to their respective nodes.
+    void _notifyAttached();
 };
 
 typedef Ogre::SharedPtr<ObjectScene> ObjectScenePtr;
diff --git a/components/nifogre/skeleton.cpp b/components/nifogre/skeleton.cpp
index 4f6921d89..db6a753c5 100644
--- a/components/nifogre/skeleton.cpp
+++ b/components/nifogre/skeleton.cpp
@@ -36,17 +36,9 @@ void NIFSkeletonLoader::buildBones(Ogre::Skeleton *skel, const Nif::Node *node,
     if(parent) parent->addChild(bone);
     mNifToOgreHandleMap[node->recIndex] = bone->getHandle();
 
-    // decompose the local transform into position, scale and orientation.
-    // this is required for cases where the rotationScale matrix includes scaling, which the NIF format allows :(
-    // the code would look a bit nicer if Ogre allowed setting the transform matrix of a Bone directly, but we can't do that.
-    Ogre::Matrix4 mat(node->getLocalTransform());
-    Ogre::Vector3 position, scale;
-    Ogre::Quaternion orientation;
-    mat.decomposition(position, scale, orientation);
-    bone->setOrientation(orientation);
-    bone->setPosition(position);
-    bone->setScale(scale);
-
+    bone->setOrientation(node->trafo.rotation);
+    bone->setPosition(node->trafo.pos);
+    bone->setScale(Ogre::Vector3(node->trafo.scale));
     bone->setBindingPose();
 
     if(!(node->recType == Nif::RC_NiNode || /* Nothing special; children traversed below */
@@ -111,7 +103,7 @@ bool NIFSkeletonLoader::needSkeleton(const Nif::Node *node)
     /* We need to be a little aggressive here, since some NIFs have a crap-ton
      * of nodes and Ogre only supports 256 bones. We will skip a skeleton if:
      * There are no bones used for skinning, there are no keyframe controllers, there
-     * are no nodes named "AttachLight", and the tree consists of NiNode,
+     * are no nodes named "AttachLight" or "ArrowBone", and the tree consists of NiNode,
      * NiTriShape, and RootCollisionNode types only.
      */
     if(node->boneTrafo)
@@ -126,7 +118,7 @@ bool NIFSkeletonLoader::needSkeleton(const Nif::Node *node)
         } while(!(ctrl=ctrl->next).empty());
     }
 
-    if (node->name == "AttachLight")
+    if (node->name == "AttachLight" || node->name == "ArrowBone")
         return true;
 
     if(node->recType == Nif::RC_NiNode || node->recType == Nif::RC_RootCollisionNode)
diff --git a/components/widgets/sharedstatebutton.cpp b/components/widgets/sharedstatebutton.cpp
new file mode 100644
index 000000000..6859a3065
--- /dev/null
+++ b/components/widgets/sharedstatebutton.cpp
@@ -0,0 +1,128 @@
+#include "sharedstatebutton.hpp"
+
+namespace Gui
+{
+
+    SharedStateButton::SharedStateButton()
+        : mIsMousePressed(false)
+        , mIsMouseFocus(false)
+    {
+
+    }
+
+    void SharedStateButton::shutdownOverride()
+    {
+        ButtonGroup group = mSharedWith; // make a copy so that we don't nuke the vector during iteration
+        for (ButtonGroup::iterator it = group.begin(); it != group.end(); ++it)
+        {
+            (*it)->shareStateWith(ButtonGroup());
+        }
+    }
+
+    void SharedStateButton::shareStateWith(ButtonGroup shared)
+    {
+        mSharedWith = shared;
+    }
+
+    void SharedStateButton::onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id)
+    {
+        mIsMousePressed = true;
+        Base::onMouseButtonPressed(_left, _top, _id);
+        updateButtonState();
+    }
+
+    void SharedStateButton::onMouseButtonReleased(int _left, int _top, MyGUI::MouseButton _id)
+    {
+        mIsMousePressed = false;
+        Base::onMouseButtonReleased(_left, _top, _id);
+        updateButtonState();
+    }
+
+    void SharedStateButton::onMouseSetFocus(MyGUI::Widget *_old)
+    {
+        mIsMouseFocus = true;
+        Base::onMouseSetFocus(_old);
+        updateButtonState();
+    }
+
+    void SharedStateButton::onMouseLostFocus(MyGUI::Widget *_new)
+    {
+        mIsMouseFocus = false;
+        Base::onMouseLostFocus(_new);
+        updateButtonState();
+    }
+
+    void SharedStateButton::baseUpdateEnable()
+    {
+        Base::baseUpdateEnable();
+        updateButtonState();
+    }
+
+    void SharedStateButton::setStateSelected(bool _value)
+    {
+        Base::setStateSelected(_value);
+        updateButtonState();
+
+        for (ButtonGroup::iterator it = mSharedWith.begin(); it != mSharedWith.end(); ++it)
+        {
+            (*it)->MyGUI::Button::setStateSelected(getStateSelected());
+        }
+    }
+
+    bool SharedStateButton::_setState(const std::string &_value)
+    {
+        bool ret = _setWidgetState(_value);
+        if (ret)
+        {
+            for (ButtonGroup::iterator it = mSharedWith.begin(); it != mSharedWith.end(); ++it)
+            {
+                (*it)->_setWidgetState(_value);
+            }
+        }
+        return ret;
+    }
+
+    void SharedStateButton::updateButtonState()
+    {
+        if (getStateSelected())
+        {
+            if (!getInheritedEnabled())
+            {
+                if (!_setState("disabled_checked"))
+                    _setState("disabled");
+            }
+            else if (mIsMousePressed)
+            {
+                if (!_setState("pushed_checked"))
+                    _setState("pushed");
+            }
+            else if (mIsMouseFocus)
+            {
+                if (!_setState("highlighted_checked"))
+                    _setState("pushed");
+            }
+            else
+                _setState("normal_checked");
+        }
+        else
+        {
+            if (!getInheritedEnabled())
+                _setState("disabled");
+            else if (mIsMousePressed)
+                _setState("pushed");
+            else if (mIsMouseFocus)
+                _setState("highlighted");
+            else
+                _setState("normal");
+        }
+    }
+
+    void SharedStateButton::createButtonGroup(ButtonGroup group)
+    {
+        for (ButtonGroup::iterator it = group.begin(); it != group.end(); ++it)
+        {
+            (*it)->shareStateWith(group);
+        }
+    }
+
+}
diff --git a/components/widgets/sharedstatebutton.hpp b/components/widgets/sharedstatebutton.hpp
new file mode 100644
index 000000000..3d7fbc84e
--- /dev/null
+++ b/components/widgets/sharedstatebutton.hpp
@@ -0,0 +1,51 @@
+#ifndef OPENMW_WIDGETS_SHAREDSTATEBUTTON_HPP
+#define OPENMW_WIDGETS_SHAREDSTATEBUTTON_HPP
+
+#include <MyGUI_Button.h>
+
+namespace Gui
+{
+
+    class SharedStateButton;
+
+    typedef std::vector<SharedStateButton*> ButtonGroup;
+
+    /// @brief A button that applies its own state changes to other widgets, to do this you define it as part of a ButtonGroup.
+    class SharedStateButton : public MyGUI::Button
+    {
+    MYGUI_RTTI_DERIVED(SharedStateButton)
+
+    public:
+        SharedStateButton();
+
+    protected:
+        void updateButtonState();
+
+        virtual void onMouseButtonPressed(int _left, int _top, MyGUI::MouseButton _id);
+        virtual void onMouseButtonReleased(int _left, int _top, MyGUI::MouseButton _id);
+        virtual void onMouseSetFocus(MyGUI::Widget* _old);
+        virtual void onMouseLostFocus(MyGUI::Widget* _new);
+        virtual void baseUpdateEnable();
+
+        virtual void shutdownOverride();
+
+        bool _setState(const std::string &_value);
+
+    public:
+        void shareStateWith(ButtonGroup shared);
+
+        /// @note The ButtonGroup connection will be destroyed when any widget in the group gets destroyed.
+        static void createButtonGroup(ButtonGroup group);
+
+        //! Set button selected state
+        void setStateSelected(bool _value);
+
+    private:
+        ButtonGroup mSharedWith;
+
+        bool mIsMousePressed;
+        bool mIsMouseFocus;
+    };
+}
+
+#endif
diff --git a/components/widgets/widgets.cpp b/components/widgets/widgets.cpp
index b35dc88a4..82839c6c9 100644
--- a/components/widgets/widgets.cpp
+++ b/components/widgets/widgets.cpp
@@ -6,6 +6,7 @@
 #include "numericeditbox.hpp"
 #include "box.hpp"
 #include "imagebutton.hpp"
+#include "sharedstatebutton.hpp"
 
 namespace Gui
 {
@@ -20,6 +21,7 @@ namespace Gui
         MyGUI::FactoryManager::getInstance().registerFactory<Gui::AutoSizedButton>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<Gui::ImageButton>("Widget");
         MyGUI::FactoryManager::getInstance().registerFactory<Gui::NumericEditBox>("Widget");
+        MyGUI::FactoryManager::getInstance().registerFactory<Gui::SharedStateButton>("Widget");
     }
 
 }
diff --git a/credits.txt b/credits.txt
index c6a5c7169..76efb2760 100644
--- a/credits.txt
+++ b/credits.txt
@@ -96,6 +96,7 @@ terrorfisch
 Thomas Luppi (Digmaster)
 Tom Mason (wheybags)
 Torben Leif Carrington (TorbenC)
+viadanna
 Vincent Heuken
 vocollapse
 
diff --git a/extern/shiny/Platforms/Ogre/OgrePlatform.cpp b/extern/shiny/Platforms/Ogre/OgrePlatform.cpp
index eab8f93e2..aa01c8ba1 100644
--- a/extern/shiny/Platforms/Ogre/OgrePlatform.cpp
+++ b/extern/shiny/Platforms/Ogre/OgrePlatform.cpp
@@ -54,6 +54,8 @@ namespace sh
 
 	OgrePlatform::~OgrePlatform ()
 	{
+		Ogre::MaterialManager::getSingleton().removeListener(this);
+
 		delete sSerializer;
 	}
 
diff --git a/files/materials/objects.mat b/files/materials/objects.mat
index 932c7e25f..7d3085b0f 100644
--- a/files/materials/objects.mat
+++ b/files/materials/objects.mat
@@ -67,12 +67,14 @@ material openmw_objects_base
         depth_check $depth_check
         transparent_sorting $transparent_sorting
         polygon_mode $polygon_mode
+        cull_hardware $cullmode
 
         texture_unit diffuseMap
         {
             direct_texture $diffuseMap
             create_in_ffp $use_diffuse_map
             tex_coord_set $diffuseMapUVSet
+            tex_address_mode $diffuseMapClampMode
         }
 
         texture_unit normalMap
@@ -89,6 +91,7 @@ material openmw_objects_base
             alpha_op_ex modulate src_current src_texture
             direct_texture $darkMap
             tex_coord_set $darkMapUVSet
+            tex_address_mode $darkMapClampMode
         }
 
         texture_unit detailMap
@@ -97,6 +100,7 @@ material openmw_objects_base
             colour_op_ex modulate_x2 src_current src_texture
             direct_texture $detailMap
             tex_coord_set $detailMapUVSet
+            tex_address_mode $detailMapClampMode
         }
 
         texture_unit emissiveMap
@@ -105,6 +109,7 @@ material openmw_objects_base
             colour_op add
             direct_texture $emissiveMap
             tex_coord_set $emissiveMapUVSet
+            tex_address_mode $emissiveMapClampMode
         }
 
         texture_unit envMap
diff --git a/files/opencs/raster/scene-play-rev9_masked.xcf b/files/opencs/raster/scene-play-rev9_masked.xcf
new file mode 100644
index 000000000..4f7a06d06
Binary files /dev/null and b/files/opencs/raster/scene-play-rev9_masked.xcf differ
diff --git a/files/opencs/raster/scene-view-parts/0_sky_backdrop.png b/files/opencs/raster/scene-view-parts/0_sky_backdrop.png
new file mode 100644
index 000000000..f215662fc
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/0_sky_backdrop.png differ
diff --git a/files/opencs/raster/scene-view-parts/10_bridge.png b/files/opencs/raster/scene-view-parts/10_bridge.png
new file mode 100644
index 000000000..1c9fd34f9
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/10_bridge.png differ
diff --git a/files/opencs/raster/scene-view-parts/11_terrain_front.png b/files/opencs/raster/scene-view-parts/11_terrain_front.png
new file mode 100644
index 000000000..adab37570
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/11_terrain_front.png differ
diff --git a/files/opencs/raster/scene-view-parts/12_water_front.png b/files/opencs/raster/scene-view-parts/12_water_front.png
new file mode 100644
index 000000000..cb5c7a3a0
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/12_water_front.png differ
diff --git a/files/opencs/raster/scene-view-parts/13_pathgrid.png b/files/opencs/raster/scene-view-parts/13_pathgrid.png
new file mode 100644
index 000000000..531fd018f
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/13_pathgrid.png differ
diff --git a/files/opencs/raster/scene-view-parts/14_divider.png b/files/opencs/raster/scene-view-parts/14_divider.png
new file mode 100644
index 000000000..b764acb4f
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/14_divider.png differ
diff --git a/files/opencs/raster/scene-view-parts/1_terrain_very_distant.png b/files/opencs/raster/scene-view-parts/1_terrain_very_distant.png
new file mode 100644
index 000000000..de6bf1fee
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/1_terrain_very_distant.png differ
diff --git a/files/opencs/raster/scene-view-parts/2_fog_very_distant.png b/files/opencs/raster/scene-view-parts/2_fog_very_distant.png
new file mode 100644
index 000000000..f75794e78
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/2_fog_very_distant.png differ
diff --git a/files/opencs/raster/scene-view-parts/3_water_backdrop.png b/files/opencs/raster/scene-view-parts/3_water_backdrop.png
new file mode 100644
index 000000000..422106a06
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/3_water_backdrop.png differ
diff --git a/files/opencs/raster/scene-view-parts/4_water_distant.png b/files/opencs/raster/scene-view-parts/4_water_distant.png
new file mode 100644
index 000000000..929aa8adf
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/4_water_distant.png differ
diff --git a/files/opencs/raster/scene-view-parts/5_terrain_distant.png b/files/opencs/raster/scene-view-parts/5_terrain_distant.png
new file mode 100644
index 000000000..7c3bdac24
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/5_terrain_distant.png differ
diff --git a/files/opencs/raster/scene-view-parts/6_fog_distant.png b/files/opencs/raster/scene-view-parts/6_fog_distant.png
new file mode 100644
index 000000000..c96072ce7
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/6_fog_distant.png differ
diff --git a/files/opencs/raster/scene-view-parts/7_terrain_back.png b/files/opencs/raster/scene-view-parts/7_terrain_back.png
new file mode 100644
index 000000000..e5d3e6174
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/7_terrain_back.png differ
diff --git a/files/opencs/raster/scene-view-parts/8_water_back.png b/files/opencs/raster/scene-view-parts/8_water_back.png
new file mode 100644
index 000000000..675e22cbb
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/8_water_back.png differ
diff --git a/files/opencs/raster/scene-view-parts/9_fog_back.png b/files/opencs/raster/scene-view-parts/9_fog_back.png
new file mode 100644
index 000000000..c98b7ef29
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/9_fog_back.png differ
diff --git a/files/opencs/raster/scene-view-parts/README b/files/opencs/raster/scene-view-parts/README
new file mode 100644
index 000000000..3fb58ffde
--- /dev/null
+++ b/files/opencs/raster/scene-view-parts/README
@@ -0,0 +1,10 @@
+This directory contains the 15 layers exported from the SVG in scalable/,
+as well as a BASH+imagemagick script to composite them into the final 32 icons.
+
+If you edit the SVG (Inkscape is strongly recommended for editing it), export
+the layers into raster overwriting these files and run the script to assemble
+the final icons.
+
+Enjoy my icons!
+--
+Sergey "Shnatsel" Davidoff <shnatsel@gmail.com>
\ No newline at end of file
diff --git a/files/opencs/raster/scene-view-parts/composite_the_32_icons.sh b/files/opencs/raster/scene-view-parts/composite_the_32_icons.sh
new file mode 100755
index 000000000..4febc3b96
--- /dev/null
+++ b/files/opencs/raster/scene-view-parts/composite_the_32_icons.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Run this from the "parts" directory to composite the final 32 icons
+# Also creates status (masked) variants of the icons while at it
+
+set -e
+
+mkdir -p composited
+mkdir -p status
+i=0
+
+for terrain in '' '*_terrain_*'; do
+for fog in '' '*_fog_*'; do
+for water in '' '*_water_*'; do
+for pathgrid in '' '*_pathgrid*'; do
+for references in '' '*_bridge*'; do
+    files=$(echo $water $terrain $references $fog $pathgrid | tr ' ' '\n' | sort -n | tr '\n' ' ')
+    convert *sky* $files -layers flatten composited/$i.png
+    convert *sky* $files *mask* -layers flatten status/$i.png
+    i=$((i+1))
+done;done;done;done;done
\ No newline at end of file
diff --git a/files/opencs/raster/scene-view-parts/mask.png b/files/opencs/raster/scene-view-parts/mask.png
new file mode 100644
index 000000000..e075fe8f5
Binary files /dev/null and b/files/opencs/raster/scene-view-parts/mask.png differ
diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc
index 751ae6484..0cc6996a8 100644
--- a/files/opencs/resources.qrc
+++ b/files/opencs/resources.qrc
@@ -79,5 +79,43 @@
         <file alias="1st-person">eyeballdude.png</file>
         <file alias="free-camera">flying eye.png</file>
         <file alias="orbiting-camera">orbit2.png</file>
+        <file alias="play">scene-play.png</file>
+        <file alias="scene-view-1">scene-view-references.png</file>
+        <file alias="scene-view-16">scene-view-terrain.png</file>
+        <file alias="scene-view-4">scene-view-water.png</file>
+        <file alias="scene-view-2">scene-view-pathgrid.png</file>
+        <file alias="scene-view-8">scene-view-fog.png</file>
+        <file alias="scene-view-c0">scene-view-status-0.png</file>
+        <file alias="scene-view-c1">scene-view-status-1.png</file>
+        <file alias="scene-view-c2">scene-view-status-2.png</file>
+        <file alias="scene-view-c3">scene-view-status-3.png</file>
+        <file alias="scene-view-c4">scene-view-status-4.png</file>
+        <file alias="scene-view-c5">scene-view-status-5.png</file>
+        <file alias="scene-view-c6">scene-view-status-6.png</file>
+        <file alias="scene-view-c7">scene-view-status-7.png</file>
+        <file alias="scene-view-c8">scene-view-status-8.png</file>
+        <file alias="scene-view-c9">scene-view-status-9.png</file>
+        <file alias="scene-view-c10">scene-view-status-10.png</file>
+        <file alias="scene-view-c11">scene-view-status-11.png</file>
+        <file alias="scene-view-c12">scene-view-status-12.png</file>
+        <file alias="scene-view-c13">scene-view-status-13.png</file>
+        <file alias="scene-view-c14">scene-view-status-14.png</file>
+        <file alias="scene-view-c15">scene-view-status-15.png</file>
+        <file alias="scene-view-c16">scene-view-status-16.png</file>
+        <file alias="scene-view-c17">scene-view-status-17.png</file>
+        <file alias="scene-view-c18">scene-view-status-18.png</file>
+        <file alias="scene-view-c19">scene-view-status-19.png</file>
+        <file alias="scene-view-c20">scene-view-status-20.png</file>
+        <file alias="scene-view-c21">scene-view-status-21.png</file>
+        <file alias="scene-view-c22">scene-view-status-22.png</file>
+        <file alias="scene-view-c23">scene-view-status-23.png</file>
+        <file alias="scene-view-c24">scene-view-status-24.png</file>
+        <file alias="scene-view-c25">scene-view-status-25.png</file>
+        <file alias="scene-view-c26">scene-view-status-26.png</file>
+        <file alias="scene-view-c27">scene-view-status-27.png</file>
+        <file alias="scene-view-c28">scene-view-status-28.png</file>
+        <file alias="scene-view-c29">scene-view-status-29.png</file>
+        <file alias="scene-view-c30">scene-view-status-30.png</file>
+        <file alias="scene-view-c31">scene-view-status-31.png</file>
     </qresource>
 </RCC>
diff --git a/files/opencs/scalable/scene-play-rev9.svg b/files/opencs/scalable/scene-play-rev9.svg
new file mode 100644
index 000000000..26e7de1e8
--- /dev/null
+++ b/files/opencs/scalable/scene-play-rev9.svg
@@ -0,0 +1,1006 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="scene-play-rev9.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3874">
+      <stop
+         style="stop-color:#e3e8f3;stop-opacity:1"
+         offset="0"
+         id="stop3876" />
+      <stop
+         id="stop3898"
+         offset="0.16666667"
+         style="stop-color:#d9e1ea;stop-opacity:0.8627451;" />
+      <stop
+         id="stop3896"
+         offset="0.33333334"
+         style="stop-color:#c1d1e0;stop-opacity:0.7254902;" />
+      <stop
+         id="stop4662"
+         offset="0.66666669"
+         style="stop-color:#92b0cd;stop-opacity:0.451" />
+      <stop
+         style="stop-color:#9cabba;stop-opacity:0.22"
+         offset="0.83333331"
+         id="stop4686" />
+      <stop
+         style="stop-color:#a7a7a7;stop-opacity:0;"
+         offset="1"
+         id="stop3878" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3855">
+      <stop
+         style="stop-color:#a5b9cd;stop-opacity:1;"
+         offset="0"
+         id="stop3857" />
+      <stop
+         style="stop-color:#b0b7c2;stop-opacity:0;"
+         offset="1"
+         id="stop3859" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14929">
+      <stop
+         id="stop14931"
+         offset="0"
+         style="stop-color:#4b453d;stop-opacity:1;" />
+      <stop
+         id="stop14933"
+         offset="1"
+         style="stop-color:#6d6353;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8305">
+      <stop
+         style="stop-color:#a49988;stop-opacity:1;"
+         offset="0"
+         id="stop8307" />
+      <stop
+         style="stop-color:#796a55;stop-opacity:1;"
+         offset="1"
+         id="stop8309" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4281">
+      <stop
+         style="stop-color:#676256;stop-opacity:1"
+         offset="0"
+         id="stop4283" />
+      <stop
+         style="stop-color:#4b453d;stop-opacity:1;"
+         offset="1"
+         id="stop4285" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8305"
+       id="radialGradient8311"
+       cx="24.521841"
+       cy="19.700182"
+       fx="24.521841"
+       fy="19.700182"
+       r="22.533063"
+       gradientTransform="matrix(1.3535149,0,0,0.42159866,-8.6688366,21.11721)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4281-7">
+      <stop
+         style="stop-color:#726756;stop-opacity:1;"
+         offset="0"
+         id="stop4283-4" />
+      <stop
+         style="stop-color:#4d473f;stop-opacity:1;"
+         offset="1"
+         id="stop4285-3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8305"
+       id="radialGradient11211"
+       cx="24.070148"
+       cy="33.496449"
+       fx="24.070148"
+       fy="33.496449"
+       r="21.555534"
+       gradientTransform="matrix(1.1596023,7.8864348e-8,-1.4941439e-8,0.21969531,-3.8982117,21.518665)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4281-7-6">
+      <stop
+         style="stop-color:#6d6353;stop-opacity:1;"
+         offset="0"
+         id="stop4283-4-6" />
+      <stop
+         style="stop-color:#4b453d;stop-opacity:1;"
+         offset="1"
+         id="stop4285-3-5" />
+    </linearGradient>
+    <linearGradient
+       y2="70.356209"
+       x2="0.82837451"
+       y1="25.87484"
+       x1="-18.520058"
+       gradientTransform="matrix(0.32364838,0,0,0.55357759,14.938661,11.311065)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient14841"
+       xlink:href="#linearGradient4281-7-6"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14929"
+       id="radialGradient14927"
+       cx="23.758333"
+       cy="38.263092"
+       fx="23.758333"
+       fy="38.263092"
+       r="20.035122"
+       gradientTransform="matrix(1.7979891,-0.02706509,0.0074576,0.49542525,-21.005446,16.945866)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3874"
+       id="linearGradient3880"
+       x1="24.088388"
+       y1="48"
+       x2="24.088388"
+       y2="0"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281-7-0"
+       id="linearGradient8428-9"
+       gradientUnits="userSpaceOnUse"
+       x1="10"
+       y1="21.5"
+       x2="8"
+       y2="36.5"
+       gradientTransform="translate(0,0.5)" />
+    <linearGradient
+       id="linearGradient4281-7-0">
+      <stop
+         style="stop-color:#6d6353;stop-opacity:1;"
+         offset="0"
+         id="stop4283-4-9" />
+      <stop
+         style="stop-color:#4b453d;stop-opacity:1;"
+         offset="1"
+         id="stop4285-3-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281-7-0"
+       id="linearGradient3932"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.0359612)"
+       x1="10"
+       y1="21.5"
+       x2="8"
+       y2="36.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281-7-0"
+       id="linearGradient3945"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.1367852,-5.2016907,-1.0198016)"
+       x1="10"
+       y1="21.5"
+       x2="8"
+       y2="36.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3855"
+       id="radialGradient4690"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.0626273,0,0,0.5525212,-97.503051,8.0066452)"
+       cx="23.997864"
+       cy="28.291449"
+       fx="23.997864"
+       fy="28.291449"
+       r="24" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3855"
+       id="radialGradient4692"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.9167735,-1.4004662e-8,0,0.37388829,-22.001032,20.422159)"
+       cx="23.997864"
+       cy="28.291449"
+       fx="23.997864"
+       fy="28.291449"
+       r="24" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281"
+       id="linearGradient6139"
+       gradientUnits="userSpaceOnUse"
+       x1="20.629976"
+       y1="42.051071"
+       x2="12.358087"
+       y2="34.396832" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281-51"
+       id="linearGradient6139-6"
+       gradientUnits="userSpaceOnUse"
+       x1="20.629976"
+       y1="42.051071"
+       x2="12.358087"
+       y2="34.396832" />
+    <linearGradient
+       id="linearGradient4281-51">
+      <stop
+         style="stop-color:#676256;stop-opacity:1"
+         offset="0"
+         id="stop4283-27" />
+      <stop
+         style="stop-color:#4b453d;stop-opacity:1;"
+         offset="1"
+         id="stop4285-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281-7"
+       id="linearGradient6335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.5)"
+       x1="0.21169095"
+       y1="34.229584"
+       x2="19.753233"
+       y2="46.420998" />
+    <radialGradient
+       gradientTransform="matrix(0,2.0155687,-2.1927484,0,130.64162,-129.06561)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3242-7-0-5"
+       id="radialGradient3324-3"
+       fy="48.744953"
+       fx="65.59787"
+       r="31.000002"
+       cy="48.744953"
+       cx="65.59787" />
+    <linearGradient
+       id="linearGradient3242-7-0-5">
+      <stop
+         offset="0"
+         style="stop-color:#eef87e;stop-opacity:1"
+         id="stop3244-5-5-7" />
+      <stop
+         offset="0.26238"
+         style="stop-color:#cde34f;stop-opacity:1"
+         id="stop3246-9-0-3" />
+      <stop
+         offset="0.66093999"
+         style="stop-color:#93b723;stop-opacity:1"
+         id="stop3248-7-3-2" />
+      <stop
+         offset="1"
+         style="stop-color:#5a7e0d;stop-opacity:1"
+         id="stop3250-8-4-0" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(1.2581102,0,0,1.2504864,-4.0494212,-4.9527886)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3289-1"
+       id="linearGradient3109-2-1"
+       y2="38.274109"
+       x2="22.368837"
+       y1="8.6829262"
+       x1="22.368837" />
+    <linearGradient
+       id="linearGradient3289-1">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3291-3" />
+      <stop
+         offset="0.54391336"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         id="stop3293-6" />
+      <stop
+         offset="0.71666551"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         id="stop3295-4" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         id="stop3297-7" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="37.185345"
+     inkscape:cy="-43.397102"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer15"
+     showgrid="false"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1156"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3763"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="23.997436,11.766699"
+       id="guide3765" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Sergey &quot;Shnatsel&quot; Davidoff &lt;shnatsel@gmail.com&gt;</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Sergey &quot;Shnatsel&quot; Davidoff &lt;shnatsel@gmail.com&gt;</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <cc:license
+           rdf:resource="https://www.gnu.org/licenses/gpl-3.0.en.html" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="sky_backdrop"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:#56aef9;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2985"
+       width="48"
+       height="48"
+       x="0"
+       y="1004.3622" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="terrain_very_distant"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:url(#linearGradient3945);fill-opacity:1;fill-rule:nonzero;stroke:#4b4841;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 5.3165183,22.21439 c 0.413008,-1.9425 2.1237052,-2.474154 3.1819802,-2.624533 1.125732,-0.159965 2.1534445,-1.4067 3.2703695,-1.4067 0.413775,0 0.81236,0.401914 1.237437,0.401914 0.660025,0 1.349271,-2.414511 1.944543,-2.583685 0.315193,-0.08958 0.747311,0.431151 1.06066,0.502393 0.555802,0.126365 1.546432,-0.208075 2.12132,-0.301435 1.016832,-0.165132 2.048613,-1.40373 3.093592,-1.205743 0.696209,0.131907 1.223075,0.764893 1.856155,1.004785 0.618186,0.234248 1.078397,-0.03616 1.679379,0.100481 0.429106,0.09756 0.59772,0.533036 0.972272,0.70335 0.61244,0.278485 1.255855,0.329907 1.856155,0.602871 0.314462,0.142991 1.316442,-0.744584 1.606528,-0.612677 0.826424,0.375786 1.738751,-0.613866 2.563262,-0.301435 0.638089,0.241789 0.983051,1.085308 1.502602,1.507178 1.040478,0.844856 2.333699,-0.04007 3.447144,0.502393 0.696973,0.33956 3.177409,4.493943 2.901277,5.435647 -0.414683,1.414218 -2.450787,1.662468 -3.535533,1.909094 -1.240062,0.281936 -2.467314,-0.101095 -3.71231,0 -3.324581,0.269952 -6.574757,0.121845 -9.899494,-0.100481 -1.02278,-0.06839 -2.074072,0.132782 -3.093592,0.200958 -1.686039,0.112746 -3.281901,-0.275516 -4.949747,-0.401914 -2.220343,-0.16827 -4.221304,0.108563 -6.3639615,-0.703351 -1.1802332,-0.447224 -2.3470422,-0.835051 -3.5355332,-1.105264 -0.36844,-0.08377 -0.778181,0.07026 -1.149049,0"
+       id="path3943"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssssssssssssssssssssssc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="fog_very_distant"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:url(#linearGradient3880);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3855"
+       width="48"
+       height="48"
+       x="0"
+       y="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer17"
+     inkscape:label="water_backdrop"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="use6209"
+       d="m 15,40 c -2.397606,5.06211 -8.0457608,7.784511 -15,9.875 8,0 23.999458,0 23.999458,0 L 24,40 z"
+       style="color:#000000;fill:#0b2155;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use6209"
+       id="use6229"
+       transform="matrix(-1,0,0,1,47.987526,0)"
+       width="48"
+       height="48" />
+    <path
+       sodipodi:nodetypes="ccscccccscccssscccsccccccc"
+       inkscape:connector-curvature="0"
+       id="use6242"
+       d="m 19,31.84375 c 0.168896,0.398685 0.216074,0.817237 0.25,1.1875 0.02151,0.234706 0.02653,0.443764 0.0625,0.59375 0.03597,0.14999 0.10225,0.22625 0.09375,0.21875 l 0.03125,0.03125 0.03125,0 c -0.0084,-3.34e-4 0.0036,0.03572 0,0.03125 0.01109,0.0069 0.04639,0.01988 0.09375,0.09375 0.0564,0.08794 0.07964,0.31339 0.0625,0.40625 -0.01714,0.09286 -0.02305,0.105 -0.03125,0.125 l -0.03125,0.0625 -0.0625,0.0625 c -0.545835,0.636276 -0.961503,0.995808 -1.375,1.375 -0.413497,0.379192 -0.846259,0.787315 -1.5,1.6875 -0.547365,0.753708 -0.965668,1.39973 -1.28125,1.875 C 15.23538,39.756956 15.150455,39.874203 15.0625,40 L 24,40 l 8.9375,0 c -0.212,-0.528743 -0.277482,-1.097177 -0.3125,-1.59375 -0.05488,-0.778225 -0.122845,-1.403694 -0.53125,-1.875 L 32.0625,36.5 l 0,-0.03125 C 31.217493,35.000883 29.959961,33.719853 28.34375,33.40625 26.339554,32.924419 24.288855,32.60507 22.25,32.5625 l -0.03125,0 C 21.097491,32.474915 20.024992,32.222166 19,31.84375 z"
+       style="opacity:0.9;color:#000000;fill:#0b2155;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ccccccccccscscccscccccscccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="use6280"
+       d="m -4.2578125,20.5 0.375,0.28125 c 0.8591466,0.727924 1.7334439,1.437125 2.625,2.125 0.66232903,0.554228 1.57587136,0.505378 2.375,0.375 1.0655421,-0.122937 2.0558255,-0.495163 3.125,-0.59375 1.0148741,-0.16179 2.1370207,0.683354 2.09375,1.75 -0.018709,0.938345 -0.6861738,1.649595 -1,2.5 -0.4379213,0.928085 -0.2792898,2.053712 0.3125,2.875 0.7612755,0.85191 1.8009094,1.360409 2.75,1.96875 1.0033585,0.590455 1.9142465,1.310615 2.9687505,1.8125 1.025248,0.522179 2.055209,1.044229 3.088323,1.559874 1.020069,0.509133 2.28628,2.09478 1.808393,3.115713 0.603072,-0.928706 1.687631,-2.057519 1.884534,-2.238087 0.413497,-0.379192 0.829165,-0.738724 1.375,-1.375 l 0.0625,-0.0625 0.03125,-0.0625 c 0.0082,-0.02 0.01411,-0.03214 0.03125,-0.125 0.01714,-0.09286 -0.0061,-0.31831 -0.0625,-0.40625 -0.04736,-0.07387 -0.08266,-0.08685 -0.09375,-0.09375 0.0036,0.0045 -0.0084,-0.03158 0,-0.03125 l -0.03125,0 -0.03125,-0.03125 c 0.0085,0.0075 -0.05778,-0.06876 -0.09375,-0.21875 -0.03597,-0.149986 -0.04099,-0.359044 -0.0625,-0.59375 -0.03311,-0.361403 -0.09077,-0.766215 -0.25,-1.15625 -0.0029,-9.46e-4 0.003,-0.03031 0,-0.03125 -0.889028,-0.282761 -1.99109,-0.265326 -2.875,-0.40625 -1.177439,-0.132313 -2.359919,-0.224543 -3.53125,-0.40625 -0.937321,-0.392389 -1.917627,-0.703182 -2.7812505,-1.25 -0.5476307,-0.627826 -1.0243983,-1.447688 -0.84375,-2.3125 0.2031238,-0.857167 0.6597769,-1.651721 0.90625,-2.5 0.2526795,-0.942726 -0.1752387,-1.998395 -0.96875,-2.5625 -0.7837962,-0.625396 -1.8417552,-0.560491 -2.78125,-0.75 -1.0359801,-0.0069 -2.0587826,0.241096 -3.0625,0.46875 -0.8738235,0.214378 -1.7578083,0.431036 -2.65625,0.46875 -1.12197339,-0.07324 -2.0946272,-0.683265 -3.03125,-1.25 C -3.148942,21.056739 -3.7280321,20.825799 -4.2578125,20.5 z"
+       style="opacity:0.9;color:#000000;fill:#0b2155;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="water_distant"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="opacity:0.9;color:#000000;fill:#5480e8;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m -4.2578125,20.5 0.375,0.28125 c 0.8591466,0.727924 1.7334439,1.437125 2.625,2.125 0.66232903,0.554228 1.57587136,0.505378 2.375,0.375 1.0655421,-0.122937 2.0558255,-0.495163 3.125,-0.59375 1.0148741,-0.16179 2.1370207,0.683354 2.09375,1.75 -0.018709,0.938345 -0.6861738,1.649595 -1,2.5 -0.4379213,0.928085 -0.2792898,2.053712 0.3125,2.875 0.7612755,0.85191 1.8009094,1.360409 2.75,1.96875 1.0033585,0.590455 1.9142465,1.310615 2.9687505,1.8125 1.025248,0.522179 2.055209,1.044229 3.088323,1.559874 1.020069,0.509133 2.28628,2.09478 1.808393,3.115713 0.603072,-0.928706 1.687631,-2.057519 1.884534,-2.238087 0.413497,-0.379192 0.829165,-0.738724 1.375,-1.375 l 0.0625,-0.0625 0.03125,-0.0625 c 0.0082,-0.02 0.01411,-0.03214 0.03125,-0.125 0.01714,-0.09286 -0.0061,-0.31831 -0.0625,-0.40625 -0.04736,-0.07387 -0.08266,-0.08685 -0.09375,-0.09375 0.0036,0.0045 -0.0084,-0.03158 0,-0.03125 l -0.03125,0 -0.03125,-0.03125 c 0.0085,0.0075 -0.05778,-0.06876 -0.09375,-0.21875 -0.03597,-0.149986 -0.04099,-0.359044 -0.0625,-0.59375 -0.03311,-0.361403 -0.09077,-0.766215 -0.25,-1.15625 -0.0029,-9.46e-4 0.003,-0.03031 0,-0.03125 -0.889028,-0.282761 -1.99109,-0.265326 -2.875,-0.40625 -1.177439,-0.132313 -2.359919,-0.224543 -3.53125,-0.40625 -0.937321,-0.392389 -1.917627,-0.703182 -2.7812505,-1.25 -0.5476307,-0.627826 -1.0243983,-1.447688 -0.84375,-2.3125 0.2031238,-0.857167 0.6597769,-1.651721 0.90625,-2.5 0.2526795,-0.942726 -0.1752387,-1.998395 -0.96875,-2.5625 -0.7837962,-0.625396 -1.8417552,-0.560491 -2.78125,-0.75 -1.0359801,-0.0069 -2.0587826,0.241096 -3.0625,0.46875 -0.8738235,0.214378 -1.7578083,0.431036 -2.65625,0.46875 -1.12197339,-0.07324 -2.0946272,-0.683265 -3.03125,-1.25 C -3.148942,21.056739 -3.7280321,20.825799 -4.2578125,20.5 z"
+       id="path3843"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccscscccscccccscccccccccccccc" />
+    <path
+       style="opacity:0.25;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16.115312,35.245694 c 0.328795,-0.78718 1.072208,-1.433056 1.937912,-1.074834 -0.683072,0.06512 -1.313787,0.543944 -1.937912,1.074834 z"
+       id="path7120-9-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9-9"
+       id="use4021"
+       transform="matrix(0.90324638,0,0,0.90324638,-0.44078524,2.3163985)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9-9"
+       id="use4023"
+       transform="matrix(0.98401377,0.17809241,-0.17809241,0.98401377,6.8203631,-4.5822845)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9-9"
+       id="use4025"
+       transform="matrix(0.9202975,0,0,0.9202975,-2.6843194,0.68416989)"
+       width="48"
+       height="48" />
+    <path
+       style="opacity:0.25;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 6.0135192,28.810427 C 6.606619,28.359922 7.4509675,28.197735 7.9478894,28.847452 7.4034795,28.597454 6.717413,28.682836 6.0135192,28.810427 z"
+       id="path7120-9-9-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9-9-3"
+       id="use4047"
+       transform="translate(0,-2.15625)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9-9-3"
+       id="use4049"
+       transform="translate(1.03125,-4.0625)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="terrain_distant"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:url(#linearGradient3932);fill-opacity:1;fill-rule:nonzero;stroke:#4b4841;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 17,22.535961 c 0.331661,-0.23333 0.767923,-0.19161 1.11961,-0.367454 1.864423,-0.932211 2.602445,-0.573968 4.596194,-0.795495 0.320086,-0.03556 0.639648,-0.154913 0.972272,-0.08839 0.821796,0.16436 1.359668,1.379111 2.209708,1.237437 1.105995,-0.184332 1.891197,-1.06942 2.916816,-1.325825 0.642415,-0.160604 1.228885,-0.348667 1.856155,-0.707107 1.703208,-0.973261 3.886761,-1.037982 5.745242,-1.502602 0.226514,-0.05663 1.727283,0.204035 2.032932,0.265165 0.597206,0.119441 1.249561,0.801558 1.767767,1.06066 0.415152,0.207576 3.965052,-2.095998 4.949747,-1.767767 0.35755,0.119184 1.894176,0.460953 2.032932,0.53033 0.632163,0.316082 1.422805,0.834288 2.209708,1.149049 0.457417,0.182967 0.646296,0.758195 1.149049,0.883883 1.166263,0.291566 3.61796,-0.4839 4.684582,-0.883883 0.156719,-0.05877 0.755114,-0.482323 0.972272,-0.265165 0.103115,0.103116 0.08699,0.35076 0.176776,0.53033 0.09003,0.180063 0.298213,0.22058 0.353554,0.441942 0.425656,1.702627 0.571597,2.142881 -0.176777,3.889087 -0.296874,0.692707 -0.48092,1.38819 -0.883883,2.032932 -0.396784,0.634854 -3.242018,3.673397 -3.889088,3.889087 -0.384602,0.128201 -1.012735,0.04824 -1.414213,0.08839 -1.559048,0.155905 -3.104579,0.363916 -4.684582,0.265165 -1.105313,-0.06908 -2.195373,-0.299973 -3.270369,-0.53033 -1.535253,-0.328982 -3.129888,-0.410738 -4.684582,-0.53033 -3.26602,-0.251232 -6.587662,-0.346643 -9.811106,-0.883883 -0.802662,-0.133777 -1.672212,0.133777 -2.474873,0 -0.395353,-0.06589 -0.754814,-0.199459 -1.149049,-0.265165 -0.953964,-0.158994 -1.806026,0.10844 -2.740039,-0.265165 -0.403718,-0.161487 -0.61142,-0.61142 -0.883883,-0.883884 C 20.161509,27.21561 19.413318,26.792041 18.826717,26.32276 18.27054,25.877819 17.128565,25.40133 16.793785,24.73177 16.531031,24.206263 17.443212,23.375236 17.677668,23.14078 17.829337,22.989111 17.128762,23.16682 17.05895,22.964003 17.012073,22.827817 17.01965,22.678641 17,22.535961 z"
+       id="path3928"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscsssssssssssssssssssssssssssssssc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient8428-9);fill-opacity:1;fill-rule:nonzero;stroke:#4b4841;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m -2,18 c -0.099366,0.07104 -0.227054,0.312494 -0.2980969,0.213129 C -2.3691398,18.113763 -2.1214029,17.986511 -2,18 c 1.95948443,0.21772 -0.8917355,0.461472 1.02772824,0.301517 0.9502267,-0.07919 1.96047168,-0.578562 2.91681526,-0.441942 1.4536824,0.207669 2.7590071,1.025413 4.2426404,1.149049 1.1204236,0.09337 2.3440158,-0.629336 3.4471454,-0.353554 0.5547857,0.138697 0.8913717,0.838725 1.3258247,1.149049 0.694659,0.496185 1.42467,0.370574 2.209709,0.441942 0.8914,0.08104 4.394906,1.190345 4.949747,1.856155 0.616621,0.739945 0.483875,1.674856 0.883884,2.474873 0.27761,0.555221 1.229486,0.42604 1.502601,0.972272 0.162696,0.325391 0.111038,0.737306 0.353554,1.06066 0.485175,0.6469 1.180374,0.119714 1.59099,0.53033 0.270109,0.270109 0.152135,0.615327 0.353553,0.883884 0.219033,0.292044 1.680724,0.881193 1.414214,1.414213 -0.202636,0.405271 -4.508756,0.393816 -5.038136,0.441942 -1.658012,0.150728 -3.295134,0.468299 -4.949747,0.618718 -1.29106,0.117369 -2.600614,-0.05477 -3.889087,0.08839 -1.0603874,0.11782 -2.1175513,0.53033 -3.1819803,0.53033 -0.6364927,0 -1.230239,-0.363703 -1.8561552,-0.441942 -0.7616204,-0.0952 -1.5371319,-0.0038 -2.2980969,-0.08839 C 1.9789499,30.473468 1.0040936,30.015133 0,29.792002 -0.68466724,29.639853 -1.4699996,29.655555 -2.1213202,29.438448 -3.6818463,28.918273 -5.0738758,28.138947 -6.5407373,27.405516 -6.9686228,27.191574 -7.4756278,27.079999 -7.8665624,26.786798 -9.6080665,25.48067 -7.927959,23.490364 -6.982679,22.190604 c 0.3372977,-0.463784 0.5943979,-1.241293 1.0606601,-1.59099 0.4835886,-0.362692 1.1020548,-0.517182 1.5909901,-0.883883 C -3.52778,19.113294 -3.1987842,17.838596 -2,18 z"
+       id="path3910"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="fog_distant"
+     style="opacity:0.35;display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       y="-2.9616046"
+       x="-98.346825"
+       height="56.285904"
+       width="243.84988"
+       id="use3998"
+       style="color:#000000;fill:url(#radialGradient4690);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer7"
+     inkscape:label="terrain_back"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4274-9"
+       id="use14917"
+       transform="matrix(-1,0,0,1,47.943403,0)"
+       width="48"
+       height="48" />
+    <path
+       style="color:#000000;fill:url(#linearGradient6139-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 24.04635,31.587626 c 0,0 -0.508995,0.249918 -2.937906,0.249918 -1.434994,-0.736174 -2.498488,-0.700574 -3.707374,-1.7527 -1.218174,-1.555625 -3.165419,-0.458303 -4.846969,-1.518856 -2.386706,-1.291523 -5.2508502,-1.402909 -7.8686182,-0.9485 -0.7000998,0.591013 -0.2729553,1.635822 -0.3862003,2.456856 -0.041958,5.622383 0.228584,7.682267 0.1866257,13.30465 8.4441188,0.02352 19.5604418,0.07056 19.5604418,0.07056 z"
+       id="path4274-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:url(#radialGradient14927);fill-opacity:1;stroke:#4b4841;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 50.469746,27.847458 c -0.76963,-1.072882 -2.246711,-1.023307 -3.726835,-2.301831 -1.189715,-2.075241 -3.203164,0.08886 -4.786904,0.378175 -1.857467,0.82801 -4.156229,1.844262 -6.082148,0.655161 -1.02037,-0.955431 -2.075912,-2.309124 -3.667151,-2.000263 -2.014222,0.377182 -4.148277,3.62921 -6.179631,2.975862 -1.369703,-0.907335 -2.800442,-1.619628 -4.558172,-1.458055 -1.581667,-0.05704 -2.731797,1.207981 -4.203269,1.506583 -1.696235,0.04121 -3.239634,0.383893 -4.912248,0.55251 -2.5063323,0.749107 0.607825,-0.143042 1.586111,0.545431 1.41486,0.575801 2.419509,2.188101 4.044876,2.158344 1.340284,0.652167 2.750587,1.08478 4.265625,1.203125 2.084596,0.04353 4.171364,0.373347 6.201498,0.861414 1.812548,0.351699 3.141177,1.737971 4.02915,3.280475 1.072267,1.237416 0.176845,3.130046 1.331852,4.295611 l 15.861751,-1.07367 z"
+       id="path14879"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient14841);fill-opacity:1;stroke:#4b4841;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 14.880045,26.998759 c -1.178636,-0.05752 -3.635958,-2.413336 -8.654813,-1.186366 -6.32866063,1.547181 -6.3203272,-1.656942 -7.3083548,-0.15406 -1.229804,1.870646 -0.9399368,9.595117 -0.950993,10.213824 -0.027336,1.529743 16.3216858,2.741738 16.3153658,4.190344 0.290796,0.0014 0.822477,-1.091027 1.939033,-2.628496 1.341582,-1.847325 1.85987,-1.884591 2.901463,-3.098769 0.02652,-0.06435 0.0136,-0.04228 -0.05057,-0.121095 -0.464437,-0.407529 -0.211474,-1.820973 -0.602728,-2.403406 -0.39426,-0.861159 -0.278889,-2.24161 -0.82312,-2.828708 -0.482783,-0.446849 -2.218975,-1.963779 -2.765283,-1.983268 z"
+       id="path4274-5-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssscsccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer8"
+     inkscape:label="water_back"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="opacity:0.9;color:#000000;fill:#5480e8;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 19,31.84375 c 0.168896,0.398685 0.216074,0.817237 0.25,1.1875 0.02151,0.234706 0.02653,0.443764 0.0625,0.59375 0.03597,0.14999 0.10225,0.22625 0.09375,0.21875 l 0.03125,0.03125 0.03125,0 c -0.0084,-3.34e-4 0.0036,0.03572 0,0.03125 0.01109,0.0069 0.04639,0.01988 0.09375,0.09375 0.0564,0.08794 0.07964,0.31339 0.0625,0.40625 -0.01714,0.09286 -0.02305,0.105 -0.03125,0.125 l -0.03125,0.0625 -0.0625,0.0625 c -0.545835,0.636276 -0.961503,0.995808 -1.375,1.375 -0.413497,0.379192 -0.846259,0.787315 -1.5,1.6875 -0.547365,0.753708 -0.965668,1.39973 -1.28125,1.875 C 15.23538,39.756956 15.150455,39.874203 15.0625,40 L 24,40 l 8.9375,0 c -0.212,-0.528743 -0.277482,-1.097177 -0.3125,-1.59375 -0.05488,-0.778225 -0.122845,-1.403694 -0.53125,-1.875 L 32.0625,36.5 l 0,-0.03125 C 31.217493,35.000883 29.959961,33.719853 28.34375,33.40625 26.339554,32.924419 24.288855,32.60507 22.25,32.5625 l -0.03125,0 C 21.097491,32.474915 20.024992,32.222166 19,31.84375 z"
+       id="use14917-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccscccccscccssscccsccccccc" />
+    <path
+       style="opacity:0.25;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 17.358145,39.745304 c 1.02063,-0.806508 2.489634,-1.117945 3.379088,0 -0.95902,-0.418356 -2.154193,-0.246329 -3.379088,0 z"
+       id="path7120-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15213"
+       transform="translate(10.16466,-0.35355339)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15215"
+       transform="matrix(0.88229145,0,0,0.88229145,3.6562895,2.5695367)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15217"
+       transform="matrix(0.86921272,0,0,0.86921272,9.9600109,3.1619448)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15219"
+       transform="matrix(0.73842543,0,0,0.73842543,15.677381,7.6055207)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15232"
+       transform="matrix(0.86921272,0,0,0.86921272,6.9106128,4.4435759)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247"
+       transform="matrix(0.68611052,0,0,0.68611052,10.530869,9.3734735)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-5"
+       transform="matrix(0.60763815,0,0,0.60763815,9.373936,11.635243)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-2"
+       transform="matrix(0.62725625,0,0,0.62725625,14.789693,10.829495)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-7"
+       transform="matrix(0.50300832,0,0,0.50300832,13.245145,14.695128)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-3"
+       transform="matrix(0.52916579,0,0,0.52916579,10.957042,12.560138)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-54"
+       transform="matrix(0.50300833,0,0,0.50300833,15.476951,13.811245)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-4"
+       transform="matrix(0.5814807,0,0,0.5814807,17.075825,11.516331)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="fog_back"
+     style="opacity:0.22000002;display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:url(#radialGradient4692);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3853"
+       width="57.799999"
+       height="38.088387"
+       x="-5"
+       y="13" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bridge"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:connector-curvature="0"
+       id="use4036"
+       d="m 45.480069,30.625 0,-3.106851 -2.501769,0 -3.04561,-2.963674 -15.508156,-0.02495 -15.5081551,0.02495 -3.0456103,2.963674 -2.5017686,0 0,3.106851 z"
+       style="fill:url(#radialGradient11211);fill-opacity:1;stroke:#3e3826;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       sodipodi:nodetypes="ccccssscczzsccsssccssscccccccccccc"
+       inkscape:connector-curvature="0"
+       id="use4269"
+       d="m 46.554904,34.463476 -2.999478,0 0.03528,11.078496 -3.085967,0.03114 c 0,0 0.01645,-9.986006 0.01645,-11.415014 0,-1.429009 -1.069403,-2.64274 -2.489015,-2.64274 -1.41961,0 -2.498616,1.246906 -2.498616,2.675915 0,1.429007 -0.0085,11.378498 -0.0085,11.378498 l -3.013117,-0.03726 c 0,0 -0.01489,-9.434504 -0.01489,-11.060981 0,-1.626477 -1.287517,-2.944999 -2.891683,-2.944999 -1.604166,0 -3.127608,1.318521 -3.127608,2.944999 0,1.626477 0.02387,10.97179 0.02387,10.97179 l -4.037196,-10e-7 c 0,0 0.02387,-9.345313 0.02387,-10.97179 0,-1.626478 -1.39086,-2.944999 -2.995025,-2.944999 -1.604167,0 -2.935877,1.318521 -2.935877,2.944999 0,1.626477 -0.01489,11.060981 -0.01489,11.060981 l -3.013117,0.03726 c 0,0 -0.0085,-9.949491 -0.0085,-11.378498 0,-1.429009 -1.079006,-2.675915 -2.498616,-2.675915 -1.4196122,0 -2.4890148,1.213731 -2.4890148,2.64274 0,1.429008 0.016453,11.415014 0.016453,11.415014 l -3.085967,-0.03114 0.035282,-11.078496 -2.999478,0 -0.010777,-3.916283 3.164588,-0.03528 3.0456103,-2.963674 15.7542665,-0.02495 15.754267,0.02495 3.04561,2.963674 3.282769,-0.0089 z"
+       style="fill:url(#radialGradient8311);fill-opacity:1;stroke:#443e2c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="opacity:0.6;color:#000000;fill:none;stroke:#3e3826;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 22.095971,41.383923 c 1.620295,0.213776 3.081455,0.25523 4.862745,-0.04555"
+       id="path14935-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="terrain_front"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:url(#linearGradient6139);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 25,42 C 24.141295,42.01259 21.635747,41.869127 20.640687,41.723037 18.367507,41.38929 16.85855,40.906447 14.858444,39.775044 13.42345,39.03887 12.109956,38.07447 10.90107,37.022344 9.6828958,35.466719 8.2981511,34.001541 6.6166015,32.940988 c -2.386706,-1.291523 -5.2508507,-1.402909 -7.8686187,-0.9485 -0.7000998,0.591013 -0.2729553,1.635822 -0.3862003,2.456856 -0.041958,5.622383 -0.083916,11.244767 -0.1258743,16.86715 C 6.6800275,51.340014 16.555881,51.363534 25,51.387054 25.235212,48.117605 24.764788,45.26945 25,42 z"
+       id="path4274"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscccccccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4274"
+       id="use4279"
+       transform="matrix(-1,0,0,1,48.205636,0)"
+       width="48"
+       height="48" />
+    <path
+       style="color:#000000;fill:url(#linearGradient6335);fill-opacity:1;stroke:#4b4841;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1.75,32 c -1.01278649,-0.02112 -2.018337,0.0796 -3,0.25 -0.7000998,0.591013 -0.261755,1.866466 -0.375,2.6875 -0.041958,5.622383 -0.3642917,11.877617 -0.40625,17.5 0.8984923,0.0025 2.24905305,-2.753688 6.9567257,-4.804648 4.3565694,-1.854755 7.2914623,-3.827768 9.5441943,-7.37592 0.08193,-0.116241 0.04204,-0.07638 -0.15625,-0.21875 C 12.878426,39.302008 12.115136,38.583376 10.90625,37.53125 9.6880762,35.975625 8.3065497,34.498053 6.625,33.4375 5.1333088,32.630298 3.4379775,32.035206 1.75,32 z"
+       id="path4274-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sccccccccs" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4274-5"
+       id="use8447"
+       transform="matrix(-1,0,0,1,48.103451,0)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="water_front"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#5480e8;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 15,40 c -2.397606,5.06211 -8.0457608,7.784511 -15,9.875 8,0 23.999458,0 23.999458,0 L 24,40 z"
+       id="path7097"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7097"
+       id="use7118"
+       transform="matrix(-1,0,0,1,48,0)"
+       width="48"
+       height="48" />
+    <path
+       style="opacity:0.3;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 12,47 c 1.812258,-1.432058 4.420663,-1.985053 6,0 -1.702862,-0.742844 -3.825044,-0.437388 -6,0 z"
+       id="path7120"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120"
+       id="use7135"
+       transform="matrix(0.78114698,0,0,0.78114698,8.6262362,8.0038372)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120"
+       id="use7137"
+       transform="matrix(0.61700722,0,0,0.61700722,6.89387,14.000661)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120"
+       id="use7141"
+       transform="translate(7,1)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120"
+       id="use7143"
+       transform="matrix(0.56229396,0,0,0.56229396,12.878709,15.572184)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120"
+       id="use7615"
+       transform="translate(11,-0.70710678)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use7135"
+       id="use7617"
+       transform="translate(11,0)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use7137"
+       id="use7619"
+       transform="translate(10.702043,0)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use7141"
+       id="use7621"
+       transform="translate(11,0)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use7143"
+       id="use7623"
+       transform="translate(9.9999997,-1.2e-7)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="pathgrid"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use4196"
+       id="use7755"
+       transform="matrix(-1,0,0,1,48.932184,0)"
+       width="48"
+       height="48" />
+    <path
+       style="opacity:0.4;color:#000000;fill:none;stroke:#f5ff00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 24.433807,25.478299 -15.1491828,0.02495 -3.0456103,2.963674 -3.7491699,0"
+       id="path4012-4-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="use4196"
+       d="m 24.502762,23.532353 -15.9166825,0.02495 -3.0456103,2.963674 -3.7491699,0"
+       style="opacity:0.4;color:#000000;fill:none;stroke:#f5ff00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4012-4-4"
+       id="use4198"
+       transform="matrix(-1,0,0,1,48.818147,2.0000001e-7)"
+       width="48"
+       height="48" />
+    <path
+       style="fill:#362fe2;fill-opacity:1;stroke:none"
+       inkscape:transform-center-y="-0.72386158"
+       d="m 18.991778,26.000341 -6.983884,0 3.491942,-3.941545 z"
+       id="path4069"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4069"
+       inkscape:transform-center-y="-0.82917947"
+       id="use4091"
+       transform="translate(17.99411,0)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4069"
+       inkscape:transform-center-y="-0.72386158"
+       id="use4108"
+       transform="translate(-13.970894,3.043659)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4069"
+       inkscape:transform-center-y="-0.72386158"
+       id="use4110"
+       transform="translate(31.981453,2.993763)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="divider"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <path
+       style="fill:none;stroke:#ac0c0c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 24.5,-30.497582 0,88.12502"
+       id="path3771"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="play">
+    <g
+       id="layer1-5-9"
+       transform="matrix(0.94999108,0,0,0.94999108,3.2143519,1.1399272)">
+      <path
+         style="color:#000000;fill:url(#radialGradient3324-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.98542732;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path3375-8"
+         inkscape:connector-curvature="0"
+         d="m 4.5035809,44.49642 0,-39.9928391 L 43.49642,24.500001 4.5035809,44.49642 z" />
+      <path
+         style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient3109-2-1);stroke-width:1.05264139;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path2294-1"
+         inkscape:connector-curvature="0"
+         d="M 5.5298027,42.691518 5.5930412,6.1685557 41.417031,24.500001 5.5298027,42.691518 z" />
+      <path
+         style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:1.03730154;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path3375-9-5"
+         inkscape:connector-curvature="0"
+         d="m 4.5035809,44.49642 0,-39.9928394 L 43.49642,24.500001 4.5035809,44.49642 z" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+       x="24.925514"
+       y="78"
+       id="text3124"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3126"
+         x="24.925514"
+         y="78">the &quot;play&quot; sign is taken from</tspan><tspan
+         sodipodi:role="line"
+         x="24.925514"
+         y="93"
+         id="tspan3128">elementary icon theme</tspan><tspan
+         sodipodi:role="line"
+         x="24.925514"
+         y="108"
+         id="tspan3130">by Daniel Fore</tspan><tspan
+         sodipodi:role="line"
+         x="24.925514"
+         y="123"
+         id="tspan3132">licensed under GNU GPLv3</tspan></text>
+  </g>
+</svg>
diff --git a/files/opencs/scalable/scene-view-status-rev14.svg b/files/opencs/scalable/scene-view-status-rev14.svg
new file mode 100644
index 000000000..0724babe7
--- /dev/null
+++ b/files/opencs/scalable/scene-view-status-rev14.svg
@@ -0,0 +1,924 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="scene-view-status-rev14.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3874">
+      <stop
+         style="stop-color:#e3e8f3;stop-opacity:1"
+         offset="0"
+         id="stop3876" />
+      <stop
+         id="stop3898"
+         offset="0.16666667"
+         style="stop-color:#d9e1ea;stop-opacity:0.8627451;" />
+      <stop
+         id="stop3896"
+         offset="0.33333334"
+         style="stop-color:#c1d1e0;stop-opacity:0.7254902;" />
+      <stop
+         id="stop4662"
+         offset="0.66666669"
+         style="stop-color:#92b0cd;stop-opacity:0.451" />
+      <stop
+         style="stop-color:#9cabba;stop-opacity:0.22"
+         offset="0.83333331"
+         id="stop4686" />
+      <stop
+         style="stop-color:#a7a7a7;stop-opacity:0;"
+         offset="1"
+         id="stop3878" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3855">
+      <stop
+         style="stop-color:#a5b9cd;stop-opacity:1;"
+         offset="0"
+         id="stop3857" />
+      <stop
+         style="stop-color:#b0b7c2;stop-opacity:0;"
+         offset="1"
+         id="stop3859" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14929">
+      <stop
+         id="stop14931"
+         offset="0"
+         style="stop-color:#4b453d;stop-opacity:1;" />
+      <stop
+         id="stop14933"
+         offset="1"
+         style="stop-color:#6d6353;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8305">
+      <stop
+         style="stop-color:#a49988;stop-opacity:1;"
+         offset="0"
+         id="stop8307" />
+      <stop
+         style="stop-color:#796a55;stop-opacity:1;"
+         offset="1"
+         id="stop8309" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4281">
+      <stop
+         style="stop-color:#676256;stop-opacity:1"
+         offset="0"
+         id="stop4283" />
+      <stop
+         style="stop-color:#4b453d;stop-opacity:1;"
+         offset="1"
+         id="stop4285" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8305"
+       id="radialGradient8311"
+       cx="24.521841"
+       cy="19.700182"
+       fx="24.521841"
+       fy="19.700182"
+       r="22.533063"
+       gradientTransform="matrix(1.3535149,0,0,0.42159866,-8.6688366,21.11721)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4281-7">
+      <stop
+         style="stop-color:#726756;stop-opacity:1;"
+         offset="0"
+         id="stop4283-4" />
+      <stop
+         style="stop-color:#4d473f;stop-opacity:1;"
+         offset="1"
+         id="stop4285-3" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8305"
+       id="radialGradient11211"
+       cx="24.070148"
+       cy="33.496449"
+       fx="24.070148"
+       fy="33.496449"
+       r="21.555534"
+       gradientTransform="matrix(1.1596023,7.8864348e-8,-1.4941439e-8,0.21969531,-3.8982117,21.518665)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4281-7-6">
+      <stop
+         style="stop-color:#6d6353;stop-opacity:1;"
+         offset="0"
+         id="stop4283-4-6" />
+      <stop
+         style="stop-color:#4b453d;stop-opacity:1;"
+         offset="1"
+         id="stop4285-3-5" />
+    </linearGradient>
+    <linearGradient
+       y2="70.356209"
+       x2="0.82837451"
+       y1="25.87484"
+       x1="-18.520058"
+       gradientTransform="matrix(0.32364838,0,0,0.55357759,14.938661,11.311065)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient14841"
+       xlink:href="#linearGradient4281-7-6"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14929"
+       id="radialGradient14927"
+       cx="23.758333"
+       cy="38.263092"
+       fx="23.758333"
+       fy="38.263092"
+       r="20.035122"
+       gradientTransform="matrix(1.7979891,-0.02706509,0.0074576,0.49542525,-21.005446,16.945866)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3874"
+       id="linearGradient3880"
+       x1="24.088388"
+       y1="48"
+       x2="24.088388"
+       y2="0"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281-7-0"
+       id="linearGradient8428-9"
+       gradientUnits="userSpaceOnUse"
+       x1="10"
+       y1="21.5"
+       x2="8"
+       y2="36.5"
+       gradientTransform="translate(0,0.5)" />
+    <linearGradient
+       id="linearGradient4281-7-0">
+      <stop
+         style="stop-color:#6d6353;stop-opacity:1;"
+         offset="0"
+         id="stop4283-4-9" />
+      <stop
+         style="stop-color:#4b453d;stop-opacity:1;"
+         offset="1"
+         id="stop4285-3-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281-7-0"
+       id="linearGradient3932"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.0359612)"
+       x1="10"
+       y1="21.5"
+       x2="8"
+       y2="36.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281-7-0"
+       id="linearGradient3945"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.1367852,-5.2016907,-1.0198016)"
+       x1="10"
+       y1="21.5"
+       x2="8"
+       y2="36.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3855"
+       id="radialGradient4690"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.0626273,0,0,0.5525212,-97.503051,8.0066452)"
+       cx="23.997864"
+       cy="28.291449"
+       fx="23.997864"
+       fy="28.291449"
+       r="24" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3855"
+       id="radialGradient4692"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.9167735,-1.4004662e-8,0,0.37388829,-22.001032,20.422159)"
+       cx="23.997864"
+       cy="28.291449"
+       fx="23.997864"
+       fy="28.291449"
+       r="24" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281"
+       id="linearGradient6139"
+       gradientUnits="userSpaceOnUse"
+       x1="20.629976"
+       y1="42.051071"
+       x2="12.358087"
+       y2="34.396832" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281-51"
+       id="linearGradient6139-6"
+       gradientUnits="userSpaceOnUse"
+       x1="20.629976"
+       y1="42.051071"
+       x2="12.358087"
+       y2="34.396832" />
+    <linearGradient
+       id="linearGradient4281-51">
+      <stop
+         style="stop-color:#676256;stop-opacity:1"
+         offset="0"
+         id="stop4283-27" />
+      <stop
+         style="stop-color:#4b453d;stop-opacity:1;"
+         offset="1"
+         id="stop4285-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4281-7"
+       id="linearGradient6335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.5)"
+       x1="0.21169095"
+       y1="34.229584"
+       x2="19.753233"
+       y2="46.420998" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="19.041611"
+     inkscape:cy="-5.7168931"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer3"
+     showgrid="false"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1156"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     borderlayer="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3763"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="23.997436,11.766699"
+       id="guide3765" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Sergey &quot;Shnatsel&quot; Davidoff &lt;shnatsel@gmail.com&gt;</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Sergey &quot;Shnatsel&quot; Davidoff &lt;shnatsel@gmail.com&gt;</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <cc:license
+           rdf:resource="http://www.gnu.org/copyleft/gpl.html" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="sky_backdrop"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:#56aef9;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2985"
+       width="48"
+       height="48"
+       x="0"
+       y="1004.3622" />
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Open Sans;-inkscape-font-specification:Open Sans"
+       x="24"
+       y="1070.3622"
+       id="text3111"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3113"
+         x="24"
+         y="1070.3622">This icon was designed by</tspan><tspan
+         sodipodi:role="line"
+         x="24"
+         y="1085.3622"
+         id="tspan3115">Sergey &quot;Shnatsel&quot; Davidoff</tspan><tspan
+         sodipodi:role="line"
+         x="24"
+         y="1100.3622"
+         id="tspan3117">for OpenMW content editor</tspan><tspan
+         sodipodi:role="line"
+         x="24"
+         y="1115.3622"
+         id="tspan3119">Licensed under GNU GPLv3</tspan></text>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="terrain_very_distant"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:url(#linearGradient3945);fill-opacity:1;fill-rule:nonzero;stroke:#4b4841;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 5.3165183,22.21439 c 0.413008,-1.9425 2.1237052,-2.474154 3.1819802,-2.624533 1.125732,-0.159965 2.1534445,-1.4067 3.2703695,-1.4067 0.413775,0 0.81236,0.401914 1.237437,0.401914 0.660025,0 1.349271,-2.414511 1.944543,-2.583685 0.315193,-0.08958 0.747311,0.431151 1.06066,0.502393 0.555802,0.126365 1.546432,-0.208075 2.12132,-0.301435 1.016832,-0.165132 2.048613,-1.40373 3.093592,-1.205743 0.696209,0.131907 1.223075,0.764893 1.856155,1.004785 0.618186,0.234248 1.078397,-0.03616 1.679379,0.100481 0.429106,0.09756 0.59772,0.533036 0.972272,0.70335 0.61244,0.278485 1.255855,0.329907 1.856155,0.602871 0.314462,0.142991 1.316442,-0.744584 1.606528,-0.612677 0.826424,0.375786 1.738751,-0.613866 2.563262,-0.301435 0.638089,0.241789 0.983051,1.085308 1.502602,1.507178 1.040478,0.844856 2.333699,-0.04007 3.447144,0.502393 0.696973,0.33956 3.177409,4.493943 2.901277,5.435647 -0.414683,1.414218 -2.450787,1.662468 -3.535533,1.909094 -1.240062,0.281936 -2.467314,-0.101095 -3.71231,0 -3.324581,0.269952 -6.574757,0.121845 -9.899494,-0.100481 -1.02278,-0.06839 -2.074072,0.132782 -3.093592,0.200958 -1.686039,0.112746 -3.281901,-0.275516 -4.949747,-0.401914 -2.220343,-0.16827 -4.221304,0.108563 -6.3639615,-0.703351 -1.1802332,-0.447224 -2.3470422,-0.835051 -3.5355332,-1.105264 -0.36844,-0.08377 -0.778181,0.07026 -1.149049,0"
+       id="path3943"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssssssssssssssssssssssc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="fog_very_distant"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:url(#linearGradient3880);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3855"
+       width="48"
+       height="48"
+       x="0"
+       y="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer17"
+     inkscape:label="water_backdrop"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="use6209"
+       d="m 15,40 c -2.397606,5.06211 -8.0457608,7.784511 -15,9.875 8,0 23.999458,0 23.999458,0 L 24,40 z"
+       style="color:#000000;fill:#0b2155;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use6209"
+       id="use6229"
+       transform="matrix(-1,0,0,1,47.987526,0)"
+       width="48"
+       height="48" />
+    <path
+       sodipodi:nodetypes="ccscccccscccssscccsccccccc"
+       inkscape:connector-curvature="0"
+       id="use6242"
+       d="m 19,31.84375 c 0.168896,0.398685 0.216074,0.817237 0.25,1.1875 0.02151,0.234706 0.02653,0.443764 0.0625,0.59375 0.03597,0.14999 0.10225,0.22625 0.09375,0.21875 l 0.03125,0.03125 0.03125,0 c -0.0084,-3.34e-4 0.0036,0.03572 0,0.03125 0.01109,0.0069 0.04639,0.01988 0.09375,0.09375 0.0564,0.08794 0.07964,0.31339 0.0625,0.40625 -0.01714,0.09286 -0.02305,0.105 -0.03125,0.125 l -0.03125,0.0625 -0.0625,0.0625 c -0.545835,0.636276 -0.961503,0.995808 -1.375,1.375 -0.413497,0.379192 -0.846259,0.787315 -1.5,1.6875 -0.547365,0.753708 -0.965668,1.39973 -1.28125,1.875 C 15.23538,39.756956 15.150455,39.874203 15.0625,40 L 24,40 l 8.9375,0 c -0.212,-0.528743 -0.277482,-1.097177 -0.3125,-1.59375 -0.05488,-0.778225 -0.122845,-1.403694 -0.53125,-1.875 L 32.0625,36.5 l 0,-0.03125 C 31.217493,35.000883 29.959961,33.719853 28.34375,33.40625 26.339554,32.924419 24.288855,32.60507 22.25,32.5625 l -0.03125,0 C 21.097491,32.474915 20.024992,32.222166 19,31.84375 z"
+       style="opacity:0.9;color:#000000;fill:#0b2155;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ccccccccccscscccscccccscccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="use6280"
+       d="m -4.2578125,20.5 0.375,0.28125 c 0.8591466,0.727924 1.7334439,1.437125 2.625,2.125 0.66232903,0.554228 1.57587136,0.505378 2.375,0.375 1.0655421,-0.122937 2.0558255,-0.495163 3.125,-0.59375 1.0148741,-0.16179 2.1370207,0.683354 2.09375,1.75 -0.018709,0.938345 -0.6861738,1.649595 -1,2.5 -0.4379213,0.928085 -0.2792898,2.053712 0.3125,2.875 0.7612755,0.85191 1.8009094,1.360409 2.75,1.96875 1.0033585,0.590455 1.9142465,1.310615 2.9687505,1.8125 1.025248,0.522179 2.055209,1.044229 3.088323,1.559874 1.020069,0.509133 2.28628,2.09478 1.808393,3.115713 0.603072,-0.928706 1.687631,-2.057519 1.884534,-2.238087 0.413497,-0.379192 0.829165,-0.738724 1.375,-1.375 l 0.0625,-0.0625 0.03125,-0.0625 c 0.0082,-0.02 0.01411,-0.03214 0.03125,-0.125 0.01714,-0.09286 -0.0061,-0.31831 -0.0625,-0.40625 -0.04736,-0.07387 -0.08266,-0.08685 -0.09375,-0.09375 0.0036,0.0045 -0.0084,-0.03158 0,-0.03125 l -0.03125,0 -0.03125,-0.03125 c 0.0085,0.0075 -0.05778,-0.06876 -0.09375,-0.21875 -0.03597,-0.149986 -0.04099,-0.359044 -0.0625,-0.59375 -0.03311,-0.361403 -0.09077,-0.766215 -0.25,-1.15625 -0.0029,-9.46e-4 0.003,-0.03031 0,-0.03125 -0.889028,-0.282761 -1.99109,-0.265326 -2.875,-0.40625 -1.177439,-0.132313 -2.359919,-0.224543 -3.53125,-0.40625 -0.937321,-0.392389 -1.917627,-0.703182 -2.7812505,-1.25 -0.5476307,-0.627826 -1.0243983,-1.447688 -0.84375,-2.3125 0.2031238,-0.857167 0.6597769,-1.651721 0.90625,-2.5 0.2526795,-0.942726 -0.1752387,-1.998395 -0.96875,-2.5625 -0.7837962,-0.625396 -1.8417552,-0.560491 -2.78125,-0.75 -1.0359801,-0.0069 -2.0587826,0.241096 -3.0625,0.46875 -0.8738235,0.214378 -1.7578083,0.431036 -2.65625,0.46875 -1.12197339,-0.07324 -2.0946272,-0.683265 -3.03125,-1.25 C -3.148942,21.056739 -3.7280321,20.825799 -4.2578125,20.5 z"
+       style="opacity:0.9;color:#000000;fill:#0b2155;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="water_distant"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="opacity:0.9;color:#000000;fill:#5480e8;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m -4.2578125,20.5 0.375,0.28125 c 0.8591466,0.727924 1.7334439,1.437125 2.625,2.125 0.66232903,0.554228 1.57587136,0.505378 2.375,0.375 1.0655421,-0.122937 2.0558255,-0.495163 3.125,-0.59375 1.0148741,-0.16179 2.1370207,0.683354 2.09375,1.75 -0.018709,0.938345 -0.6861738,1.649595 -1,2.5 -0.4379213,0.928085 -0.2792898,2.053712 0.3125,2.875 0.7612755,0.85191 1.8009094,1.360409 2.75,1.96875 1.0033585,0.590455 1.9142465,1.310615 2.9687505,1.8125 1.025248,0.522179 2.055209,1.044229 3.088323,1.559874 1.020069,0.509133 2.28628,2.09478 1.808393,3.115713 0.603072,-0.928706 1.687631,-2.057519 1.884534,-2.238087 0.413497,-0.379192 0.829165,-0.738724 1.375,-1.375 l 0.0625,-0.0625 0.03125,-0.0625 c 0.0082,-0.02 0.01411,-0.03214 0.03125,-0.125 0.01714,-0.09286 -0.0061,-0.31831 -0.0625,-0.40625 -0.04736,-0.07387 -0.08266,-0.08685 -0.09375,-0.09375 0.0036,0.0045 -0.0084,-0.03158 0,-0.03125 l -0.03125,0 -0.03125,-0.03125 c 0.0085,0.0075 -0.05778,-0.06876 -0.09375,-0.21875 -0.03597,-0.149986 -0.04099,-0.359044 -0.0625,-0.59375 -0.03311,-0.361403 -0.09077,-0.766215 -0.25,-1.15625 -0.0029,-9.46e-4 0.003,-0.03031 0,-0.03125 -0.889028,-0.282761 -1.99109,-0.265326 -2.875,-0.40625 -1.177439,-0.132313 -2.359919,-0.224543 -3.53125,-0.40625 -0.937321,-0.392389 -1.917627,-0.703182 -2.7812505,-1.25 -0.5476307,-0.627826 -1.0243983,-1.447688 -0.84375,-2.3125 0.2031238,-0.857167 0.6597769,-1.651721 0.90625,-2.5 0.2526795,-0.942726 -0.1752387,-1.998395 -0.96875,-2.5625 -0.7837962,-0.625396 -1.8417552,-0.560491 -2.78125,-0.75 -1.0359801,-0.0069 -2.0587826,0.241096 -3.0625,0.46875 -0.8738235,0.214378 -1.7578083,0.431036 -2.65625,0.46875 -1.12197339,-0.07324 -2.0946272,-0.683265 -3.03125,-1.25 C -3.148942,21.056739 -3.7280321,20.825799 -4.2578125,20.5 z"
+       id="path3843"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccscscccscccccscccccccccccccc" />
+    <path
+       style="opacity:0.25;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16.115312,35.245694 c 0.328795,-0.78718 1.072208,-1.433056 1.937912,-1.074834 -0.683072,0.06512 -1.313787,0.543944 -1.937912,1.074834 z"
+       id="path7120-9-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9-9"
+       id="use4021"
+       transform="matrix(0.90324638,0,0,0.90324638,-0.44078524,2.3163985)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9-9"
+       id="use4023"
+       transform="matrix(0.98401377,0.17809241,-0.17809241,0.98401377,6.8203631,-4.5822845)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9-9"
+       id="use4025"
+       transform="matrix(0.9202975,0,0,0.9202975,-2.6843194,0.68416989)"
+       width="48"
+       height="48" />
+    <path
+       style="opacity:0.25;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 6.0135192,28.810427 C 6.606619,28.359922 7.4509675,28.197735 7.9478894,28.847452 7.4034795,28.597454 6.717413,28.682836 6.0135192,28.810427 z"
+       id="path7120-9-9-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9-9-3"
+       id="use4047"
+       transform="translate(0,-2.15625)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9-9-3"
+       id="use4049"
+       transform="translate(1.03125,-4.0625)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="terrain_distant"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:url(#linearGradient3932);fill-opacity:1;fill-rule:nonzero;stroke:#4b4841;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 17,22.535961 c 0.331661,-0.23333 0.767923,-0.19161 1.11961,-0.367454 1.864423,-0.932211 2.602445,-0.573968 4.596194,-0.795495 0.320086,-0.03556 0.639648,-0.154913 0.972272,-0.08839 0.821796,0.16436 1.359668,1.379111 2.209708,1.237437 1.105995,-0.184332 1.891197,-1.06942 2.916816,-1.325825 0.642415,-0.160604 1.228885,-0.348667 1.856155,-0.707107 1.703208,-0.973261 3.886761,-1.037982 5.745242,-1.502602 0.226514,-0.05663 1.727283,0.204035 2.032932,0.265165 0.597206,0.119441 1.249561,0.801558 1.767767,1.06066 0.415152,0.207576 3.965052,-2.095998 4.949747,-1.767767 0.35755,0.119184 1.894176,0.460953 2.032932,0.53033 0.632163,0.316082 1.422805,0.834288 2.209708,1.149049 0.457417,0.182967 0.646296,0.758195 1.149049,0.883883 1.166263,0.291566 3.61796,-0.4839 4.684582,-0.883883 0.156719,-0.05877 0.755114,-0.482323 0.972272,-0.265165 0.103115,0.103116 0.08699,0.35076 0.176776,0.53033 0.09003,0.180063 0.298213,0.22058 0.353554,0.441942 0.425656,1.702627 0.571597,2.142881 -0.176777,3.889087 -0.296874,0.692707 -0.48092,1.38819 -0.883883,2.032932 -0.396784,0.634854 -3.242018,3.673397 -3.889088,3.889087 -0.384602,0.128201 -1.012735,0.04824 -1.414213,0.08839 -1.559048,0.155905 -3.104579,0.363916 -4.684582,0.265165 -1.105313,-0.06908 -2.195373,-0.299973 -3.270369,-0.53033 -1.535253,-0.328982 -3.129888,-0.410738 -4.684582,-0.53033 -3.26602,-0.251232 -6.587662,-0.346643 -9.811106,-0.883883 -0.802662,-0.133777 -1.672212,0.133777 -2.474873,0 -0.395353,-0.06589 -0.754814,-0.199459 -1.149049,-0.265165 -0.953964,-0.158994 -1.806026,0.10844 -2.740039,-0.265165 -0.403718,-0.161487 -0.61142,-0.61142 -0.883883,-0.883884 C 20.161509,27.21561 19.413318,26.792041 18.826717,26.32276 18.27054,25.877819 17.128565,25.40133 16.793785,24.73177 16.531031,24.206263 17.443212,23.375236 17.677668,23.14078 17.829337,22.989111 17.128762,23.16682 17.05895,22.964003 17.012073,22.827817 17.01965,22.678641 17,22.535961 z"
+       id="path3928"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscsssssssssssssssssssssssssssssssc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient8428-9);fill-opacity:1;fill-rule:nonzero;stroke:#4b4841;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m -2,18 c -0.099366,0.07104 -0.227054,0.312494 -0.2980969,0.213129 C -2.3691398,18.113763 -2.1214029,17.986511 -2,18 c 1.95948443,0.21772 -0.8917355,0.461472 1.02772824,0.301517 0.9502267,-0.07919 1.96047168,-0.578562 2.91681526,-0.441942 1.4536824,0.207669 2.7590071,1.025413 4.2426404,1.149049 1.1204236,0.09337 2.3440158,-0.629336 3.4471454,-0.353554 0.5547857,0.138697 0.8913717,0.838725 1.3258247,1.149049 0.694659,0.496185 1.42467,0.370574 2.209709,0.441942 0.8914,0.08104 4.394906,1.190345 4.949747,1.856155 0.616621,0.739945 0.483875,1.674856 0.883884,2.474873 0.27761,0.555221 1.229486,0.42604 1.502601,0.972272 0.162696,0.325391 0.111038,0.737306 0.353554,1.06066 0.485175,0.6469 1.180374,0.119714 1.59099,0.53033 0.270109,0.270109 0.152135,0.615327 0.353553,0.883884 0.219033,0.292044 1.680724,0.881193 1.414214,1.414213 -0.202636,0.405271 -4.508756,0.393816 -5.038136,0.441942 -1.658012,0.150728 -3.295134,0.468299 -4.949747,0.618718 -1.29106,0.117369 -2.600614,-0.05477 -3.889087,0.08839 -1.0603874,0.11782 -2.1175513,0.53033 -3.1819803,0.53033 -0.6364927,0 -1.230239,-0.363703 -1.8561552,-0.441942 -0.7616204,-0.0952 -1.5371319,-0.0038 -2.2980969,-0.08839 C 1.9789499,30.473468 1.0040936,30.015133 0,29.792002 -0.68466724,29.639853 -1.4699996,29.655555 -2.1213202,29.438448 -3.6818463,28.918273 -5.0738758,28.138947 -6.5407373,27.405516 -6.9686228,27.191574 -7.4756278,27.079999 -7.8665624,26.786798 -9.6080665,25.48067 -7.927959,23.490364 -6.982679,22.190604 c 0.3372977,-0.463784 0.5943979,-1.241293 1.0606601,-1.59099 0.4835886,-0.362692 1.1020548,-0.517182 1.5909901,-0.883883 C -3.52778,19.113294 -3.1987842,17.838596 -2,18 z"
+       id="path3910"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="fog_distant"
+     style="opacity:0.35;display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       y="-2.9616046"
+       x="-98.346825"
+       height="56.285904"
+       width="243.84988"
+       id="use3998"
+       style="color:#000000;fill:url(#radialGradient4690);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer7"
+     inkscape:label="terrain_back"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4274-9"
+       id="use14917"
+       transform="matrix(-1,0,0,1,47.943403,0)"
+       width="48"
+       height="48" />
+    <path
+       style="color:#000000;fill:url(#linearGradient6139-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 24.04635,31.587626 c 0,0 -0.508995,0.249918 -2.937906,0.249918 -1.434994,-0.736174 -2.498488,-0.700574 -3.707374,-1.7527 -1.218174,-1.555625 -3.165419,-0.458303 -4.846969,-1.518856 -2.386706,-1.291523 -5.2508502,-1.402909 -7.8686182,-0.9485 -0.7000998,0.591013 -0.2729553,1.635822 -0.3862003,2.456856 -0.041958,5.622383 0.228584,7.682267 0.1866257,13.30465 8.4441188,0.02352 19.5604418,0.07056 19.5604418,0.07056 z"
+       id="path4274-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;fill:url(#radialGradient14927);fill-opacity:1;stroke:#4b4841;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 50.469746,27.847458 c -0.76963,-1.072882 -2.246711,-1.023307 -3.726835,-2.301831 -1.189715,-2.075241 -3.203164,0.08886 -4.786904,0.378175 -1.857467,0.82801 -4.156229,1.844262 -6.082148,0.655161 -1.02037,-0.955431 -2.075912,-2.309124 -3.667151,-2.000263 -2.014222,0.377182 -4.148277,3.62921 -6.179631,2.975862 -1.369703,-0.907335 -2.800442,-1.619628 -4.558172,-1.458055 -1.581667,-0.05704 -2.731797,1.207981 -4.203269,1.506583 -1.696235,0.04121 -3.239634,0.383893 -4.912248,0.55251 -2.5063323,0.749107 0.607825,-0.143042 1.586111,0.545431 1.41486,0.575801 2.419509,2.188101 4.044876,2.158344 1.340284,0.652167 2.750587,1.08478 4.265625,1.203125 2.084596,0.04353 4.171364,0.373347 6.201498,0.861414 1.812548,0.351699 3.141177,1.737971 4.02915,3.280475 1.072267,1.237416 0.176845,3.130046 1.331852,4.295611 l 15.861751,-1.07367 z"
+       id="path14879"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient14841);fill-opacity:1;stroke:#4b4841;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 14.880045,26.998759 c -1.178636,-0.05752 -3.635958,-2.413336 -8.654813,-1.186366 -6.32866063,1.547181 -6.3203272,-1.656942 -7.3083548,-0.15406 -1.229804,1.870646 -0.9399368,9.595117 -0.950993,10.213824 -0.027336,1.529743 16.3216858,2.741738 16.3153658,4.190344 0.290796,0.0014 0.822477,-1.091027 1.939033,-2.628496 1.341582,-1.847325 1.85987,-1.884591 2.901463,-3.098769 0.02652,-0.06435 0.0136,-0.04228 -0.05057,-0.121095 -0.464437,-0.407529 -0.211474,-1.820973 -0.602728,-2.403406 -0.39426,-0.861159 -0.278889,-2.24161 -0.82312,-2.828708 -0.482783,-0.446849 -2.218975,-1.963779 -2.765283,-1.983268 z"
+       id="path4274-5-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssscsccccc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer8"
+     inkscape:label="water_back"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="opacity:0.9;color:#000000;fill:#5480e8;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 19,31.84375 c 0.168896,0.398685 0.216074,0.817237 0.25,1.1875 0.02151,0.234706 0.02653,0.443764 0.0625,0.59375 0.03597,0.14999 0.10225,0.22625 0.09375,0.21875 l 0.03125,0.03125 0.03125,0 c -0.0084,-3.34e-4 0.0036,0.03572 0,0.03125 0.01109,0.0069 0.04639,0.01988 0.09375,0.09375 0.0564,0.08794 0.07964,0.31339 0.0625,0.40625 -0.01714,0.09286 -0.02305,0.105 -0.03125,0.125 l -0.03125,0.0625 -0.0625,0.0625 c -0.545835,0.636276 -0.961503,0.995808 -1.375,1.375 -0.413497,0.379192 -0.846259,0.787315 -1.5,1.6875 -0.547365,0.753708 -0.965668,1.39973 -1.28125,1.875 C 15.23538,39.756956 15.150455,39.874203 15.0625,40 L 24,40 l 8.9375,0 c -0.212,-0.528743 -0.277482,-1.097177 -0.3125,-1.59375 -0.05488,-0.778225 -0.122845,-1.403694 -0.53125,-1.875 L 32.0625,36.5 l 0,-0.03125 C 31.217493,35.000883 29.959961,33.719853 28.34375,33.40625 26.339554,32.924419 24.288855,32.60507 22.25,32.5625 l -0.03125,0 C 21.097491,32.474915 20.024992,32.222166 19,31.84375 z"
+       id="use14917-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccscccccscccssscccsccccccc" />
+    <path
+       style="opacity:0.25;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 17.358145,39.745304 c 1.02063,-0.806508 2.489634,-1.117945 3.379088,0 -0.95902,-0.418356 -2.154193,-0.246329 -3.379088,0 z"
+       id="path7120-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15213"
+       transform="translate(10.16466,-0.35355339)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15215"
+       transform="matrix(0.88229145,0,0,0.88229145,3.6562895,2.5695367)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15217"
+       transform="matrix(0.86921272,0,0,0.86921272,9.9600109,3.1619448)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15219"
+       transform="matrix(0.73842543,0,0,0.73842543,15.677381,7.6055207)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15232"
+       transform="matrix(0.86921272,0,0,0.86921272,6.9106128,4.4435759)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247"
+       transform="matrix(0.68611052,0,0,0.68611052,10.530869,9.3734735)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-5"
+       transform="matrix(0.60763815,0,0,0.60763815,9.373936,11.635243)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-2"
+       transform="matrix(0.62725625,0,0,0.62725625,14.789693,10.829495)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-7"
+       transform="matrix(0.50300832,0,0,0.50300832,13.245145,14.695128)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-3"
+       transform="matrix(0.52916579,0,0,0.52916579,10.957042,12.560138)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-54"
+       transform="matrix(0.50300833,0,0,0.50300833,15.476951,13.811245)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120-9"
+       id="use15247-4"
+       transform="matrix(0.5814807,0,0,0.5814807,17.075825,11.516331)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="fog_back"
+     style="opacity:0.22000002;display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;fill:url(#radialGradient4692);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3853"
+       width="57.799999"
+       height="38.088387"
+       x="-5"
+       y="13" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bridge"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:connector-curvature="0"
+       id="use4036"
+       d="m 45.480069,30.625 0,-3.106851 -2.501769,0 -3.04561,-2.963674 -15.508156,-0.02495 -15.5081551,0.02495 -3.0456103,2.963674 -2.5017686,0 0,3.106851 z"
+       style="fill:url(#radialGradient11211);fill-opacity:1;stroke:#3e3826;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       sodipodi:nodetypes="ccccssscczzsccsssccssscccccccccccc"
+       inkscape:connector-curvature="0"
+       id="use4269"
+       d="m 46.554904,34.463476 -2.999478,0 0.03528,11.078496 -3.085967,0.03114 c 0,0 0.01645,-9.986006 0.01645,-11.415014 0,-1.429009 -1.069403,-2.64274 -2.489015,-2.64274 -1.41961,0 -2.498616,1.246906 -2.498616,2.675915 0,1.429007 -0.0085,11.378498 -0.0085,11.378498 l -3.013117,-0.03726 c 0,0 -0.01489,-9.434504 -0.01489,-11.060981 0,-1.626477 -1.287517,-2.944999 -2.891683,-2.944999 -1.604166,0 -3.127608,1.318521 -3.127608,2.944999 0,1.626477 0.02387,10.97179 0.02387,10.97179 l -4.037196,-10e-7 c 0,0 0.02387,-9.345313 0.02387,-10.97179 0,-1.626478 -1.39086,-2.944999 -2.995025,-2.944999 -1.604167,0 -2.935877,1.318521 -2.935877,2.944999 0,1.626477 -0.01489,11.060981 -0.01489,11.060981 l -3.013117,0.03726 c 0,0 -0.0085,-9.949491 -0.0085,-11.378498 0,-1.429009 -1.079006,-2.675915 -2.498616,-2.675915 -1.4196122,0 -2.4890148,1.213731 -2.4890148,2.64274 0,1.429008 0.016453,11.415014 0.016453,11.415014 l -3.085967,-0.03114 0.035282,-11.078496 -2.999478,0 -0.010777,-3.916283 3.164588,-0.03528 3.0456103,-2.963674 15.7542665,-0.02495 15.754267,0.02495 3.04561,2.963674 3.282769,-0.0089 z"
+       style="fill:url(#radialGradient8311);fill-opacity:1;stroke:#443e2c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="opacity:0.6;color:#000000;fill:none;stroke:#3e3826;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 22.095971,41.383923 c 1.620295,0.213776 3.081455,0.25523 4.862745,-0.04555"
+       id="path14935-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="terrain_front"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:url(#linearGradient6139);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 25,42 C 24.141295,42.01259 21.635747,41.869127 20.640687,41.723037 18.367507,41.38929 16.85855,40.906447 14.858444,39.775044 13.42345,39.03887 12.109956,38.07447 10.90107,37.022344 9.6828958,35.466719 8.2981511,34.001541 6.6166015,32.940988 c -2.386706,-1.291523 -5.2508507,-1.402909 -7.8686187,-0.9485 -0.7000998,0.591013 -0.2729553,1.635822 -0.3862003,2.456856 -0.041958,5.622383 -0.083916,11.244767 -0.1258743,16.86715 C 6.6800275,51.340014 16.555881,51.363534 25,51.387054 25.235212,48.117605 24.764788,45.26945 25,42 z"
+       id="path4274"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscccccccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4274"
+       id="use4279"
+       transform="matrix(-1,0,0,1,48.205636,0)"
+       width="48"
+       height="48" />
+    <path
+       style="color:#000000;fill:url(#linearGradient6335);fill-opacity:1;stroke:#4b4841;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1.75,32 c -1.01278649,-0.02112 -2.018337,0.0796 -3,0.25 -0.7000998,0.591013 -0.261755,1.866466 -0.375,2.6875 -0.041958,5.622383 -0.3642917,11.877617 -0.40625,17.5 0.8984923,0.0025 2.24905305,-2.753688 6.9567257,-4.804648 4.3565694,-1.854755 7.2914623,-3.827768 9.5441943,-7.37592 0.08193,-0.116241 0.04204,-0.07638 -0.15625,-0.21875 C 12.878426,39.302008 12.115136,38.583376 10.90625,37.53125 9.6880762,35.975625 8.3065497,34.498053 6.625,33.4375 5.1333088,32.630298 3.4379775,32.035206 1.75,32 z"
+       id="path4274-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sccccccccs" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4274-5"
+       id="use8447"
+       transform="matrix(-1,0,0,1,48.103451,0)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="water_front"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <path
+       style="color:#000000;fill:#5480e8;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 15,40 c -2.397606,5.06211 -8.0457608,7.784511 -15,9.875 8,0 23.999458,0 23.999458,0 L 24,40 z"
+       id="path7097"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7097"
+       id="use7118"
+       transform="matrix(-1,0,0,1,48,0)"
+       width="48"
+       height="48" />
+    <path
+       style="opacity:0.3;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 12,47 c 1.812258,-1.432058 4.420663,-1.985053 6,0 -1.702862,-0.742844 -3.825044,-0.437388 -6,0 z"
+       id="path7120"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120"
+       id="use7135"
+       transform="matrix(0.78114698,0,0,0.78114698,8.6262362,8.0038372)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120"
+       id="use7137"
+       transform="matrix(0.61700722,0,0,0.61700722,6.89387,14.000661)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120"
+       id="use7141"
+       transform="translate(7,1)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120"
+       id="use7143"
+       transform="matrix(0.56229396,0,0,0.56229396,12.878709,15.572184)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path7120"
+       id="use7615"
+       transform="translate(11,-0.70710678)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use7135"
+       id="use7617"
+       transform="translate(11,0)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use7137"
+       id="use7619"
+       transform="translate(10.702043,0)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use7141"
+       id="use7621"
+       transform="translate(11,0)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use7143"
+       id="use7623"
+       transform="translate(9.9999997,-1.2e-7)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="pathgrid"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <use
+       x="0"
+       y="0"
+       xlink:href="#use4196"
+       id="use7755"
+       transform="matrix(-1,0,0,1,48.932184,0)"
+       width="48"
+       height="48" />
+    <path
+       style="opacity:0.4;color:#000000;fill:none;stroke:#f5ff00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 24.433807,25.478299 -15.1491828,0.02495 -3.0456103,2.963674 -3.7491699,0"
+       id="path4012-4-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="use4196"
+       d="m 24.502762,23.532353 -15.9166825,0.02495 -3.0456103,2.963674 -3.7491699,0"
+       style="opacity:0.4;color:#000000;fill:none;stroke:#f5ff00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4012-4-4"
+       id="use4198"
+       transform="matrix(-1,0,0,1,48.818147,2.0000001e-7)"
+       width="48"
+       height="48" />
+    <path
+       style="fill:#362fe2;fill-opacity:1;stroke:none"
+       inkscape:transform-center-y="-0.72386158"
+       d="m 18.991778,26.000341 -6.983884,0 3.491942,-3.941545 z"
+       id="path4069"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4069"
+       inkscape:transform-center-y="-0.82917947"
+       id="use4091"
+       transform="translate(17.99411,0)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4069"
+       inkscape:transform-center-y="-0.72386158"
+       id="use4108"
+       transform="translate(-13.970894,3.043659)"
+       width="48"
+       height="48" />
+    <use
+       x="0"
+       y="0"
+       xlink:href="#path4069"
+       inkscape:transform-center-y="-0.72386158"
+       id="use4110"
+       transform="translate(31.981453,2.993763)"
+       width="48"
+       height="48" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="divider"
+     style="display:inline">
+    <path
+       style="fill:none;stroke:#ac0c0c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 24.5,-30.497582 0,88.12502"
+       id="path3771"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/files/opencs/scene-play.png b/files/opencs/scene-play.png
new file mode 100644
index 000000000..e2fabea7d
Binary files /dev/null and b/files/opencs/scene-play.png differ
diff --git a/files/opencs/scene-view-fog.png b/files/opencs/scene-view-fog.png
new file mode 100644
index 000000000..0ba2e69cf
Binary files /dev/null and b/files/opencs/scene-view-fog.png differ
diff --git a/files/opencs/scene-view-pathgrid.png b/files/opencs/scene-view-pathgrid.png
new file mode 100644
index 000000000..6586b882e
Binary files /dev/null and b/files/opencs/scene-view-pathgrid.png differ
diff --git a/files/opencs/scene-view-references.png b/files/opencs/scene-view-references.png
new file mode 100644
index 000000000..aa3bc73b2
Binary files /dev/null and b/files/opencs/scene-view-references.png differ
diff --git a/files/opencs/scene-view-status-0.png b/files/opencs/scene-view-status-0.png
new file mode 100644
index 000000000..b98230f01
Binary files /dev/null and b/files/opencs/scene-view-status-0.png differ
diff --git a/files/opencs/scene-view-status-1.png b/files/opencs/scene-view-status-1.png
new file mode 100644
index 000000000..43b597c01
Binary files /dev/null and b/files/opencs/scene-view-status-1.png differ
diff --git a/files/opencs/scene-view-status-10.png b/files/opencs/scene-view-status-10.png
new file mode 100644
index 000000000..ca511b9c8
Binary files /dev/null and b/files/opencs/scene-view-status-10.png differ
diff --git a/files/opencs/scene-view-status-11.png b/files/opencs/scene-view-status-11.png
new file mode 100644
index 000000000..3028217ba
Binary files /dev/null and b/files/opencs/scene-view-status-11.png differ
diff --git a/files/opencs/scene-view-status-12.png b/files/opencs/scene-view-status-12.png
new file mode 100644
index 000000000..974519c54
Binary files /dev/null and b/files/opencs/scene-view-status-12.png differ
diff --git a/files/opencs/scene-view-status-13.png b/files/opencs/scene-view-status-13.png
new file mode 100644
index 000000000..4c075704a
Binary files /dev/null and b/files/opencs/scene-view-status-13.png differ
diff --git a/files/opencs/scene-view-status-14.png b/files/opencs/scene-view-status-14.png
new file mode 100644
index 000000000..1e6d726da
Binary files /dev/null and b/files/opencs/scene-view-status-14.png differ
diff --git a/files/opencs/scene-view-status-15.png b/files/opencs/scene-view-status-15.png
new file mode 100644
index 000000000..3a2073628
Binary files /dev/null and b/files/opencs/scene-view-status-15.png differ
diff --git a/files/opencs/scene-view-status-16.png b/files/opencs/scene-view-status-16.png
new file mode 100644
index 000000000..d0fb54047
Binary files /dev/null and b/files/opencs/scene-view-status-16.png differ
diff --git a/files/opencs/scene-view-status-17.png b/files/opencs/scene-view-status-17.png
new file mode 100644
index 000000000..9d95cc855
Binary files /dev/null and b/files/opencs/scene-view-status-17.png differ
diff --git a/files/opencs/scene-view-status-18.png b/files/opencs/scene-view-status-18.png
new file mode 100644
index 000000000..0a9013aed
Binary files /dev/null and b/files/opencs/scene-view-status-18.png differ
diff --git a/files/opencs/scene-view-status-19.png b/files/opencs/scene-view-status-19.png
new file mode 100644
index 000000000..d57fab446
Binary files /dev/null and b/files/opencs/scene-view-status-19.png differ
diff --git a/files/opencs/scene-view-status-2.png b/files/opencs/scene-view-status-2.png
new file mode 100644
index 000000000..2c892213b
Binary files /dev/null and b/files/opencs/scene-view-status-2.png differ
diff --git a/files/opencs/scene-view-status-20.png b/files/opencs/scene-view-status-20.png
new file mode 100644
index 000000000..2be69333c
Binary files /dev/null and b/files/opencs/scene-view-status-20.png differ
diff --git a/files/opencs/scene-view-status-21.png b/files/opencs/scene-view-status-21.png
new file mode 100644
index 000000000..f5ad22340
Binary files /dev/null and b/files/opencs/scene-view-status-21.png differ
diff --git a/files/opencs/scene-view-status-22.png b/files/opencs/scene-view-status-22.png
new file mode 100644
index 000000000..afb0c7dd5
Binary files /dev/null and b/files/opencs/scene-view-status-22.png differ
diff --git a/files/opencs/scene-view-status-23.png b/files/opencs/scene-view-status-23.png
new file mode 100644
index 000000000..bee128d24
Binary files /dev/null and b/files/opencs/scene-view-status-23.png differ
diff --git a/files/opencs/scene-view-status-24.png b/files/opencs/scene-view-status-24.png
new file mode 100644
index 000000000..677a56448
Binary files /dev/null and b/files/opencs/scene-view-status-24.png differ
diff --git a/files/opencs/scene-view-status-25.png b/files/opencs/scene-view-status-25.png
new file mode 100644
index 000000000..151278eff
Binary files /dev/null and b/files/opencs/scene-view-status-25.png differ
diff --git a/files/opencs/scene-view-status-26.png b/files/opencs/scene-view-status-26.png
new file mode 100644
index 000000000..3ddeed8f1
Binary files /dev/null and b/files/opencs/scene-view-status-26.png differ
diff --git a/files/opencs/scene-view-status-27.png b/files/opencs/scene-view-status-27.png
new file mode 100644
index 000000000..93058121e
Binary files /dev/null and b/files/opencs/scene-view-status-27.png differ
diff --git a/files/opencs/scene-view-status-28.png b/files/opencs/scene-view-status-28.png
new file mode 100644
index 000000000..5008026a1
Binary files /dev/null and b/files/opencs/scene-view-status-28.png differ
diff --git a/files/opencs/scene-view-status-29.png b/files/opencs/scene-view-status-29.png
new file mode 100644
index 000000000..7b355fe13
Binary files /dev/null and b/files/opencs/scene-view-status-29.png differ
diff --git a/files/opencs/scene-view-status-3.png b/files/opencs/scene-view-status-3.png
new file mode 100644
index 000000000..5157e170f
Binary files /dev/null and b/files/opencs/scene-view-status-3.png differ
diff --git a/files/opencs/scene-view-status-30.png b/files/opencs/scene-view-status-30.png
new file mode 100644
index 000000000..0712a5482
Binary files /dev/null and b/files/opencs/scene-view-status-30.png differ
diff --git a/files/opencs/scene-view-status-31.png b/files/opencs/scene-view-status-31.png
new file mode 100644
index 000000000..16d80af04
Binary files /dev/null and b/files/opencs/scene-view-status-31.png differ
diff --git a/files/opencs/scene-view-status-4.png b/files/opencs/scene-view-status-4.png
new file mode 100644
index 000000000..f29445f5a
Binary files /dev/null and b/files/opencs/scene-view-status-4.png differ
diff --git a/files/opencs/scene-view-status-5.png b/files/opencs/scene-view-status-5.png
new file mode 100644
index 000000000..e77290f68
Binary files /dev/null and b/files/opencs/scene-view-status-5.png differ
diff --git a/files/opencs/scene-view-status-6.png b/files/opencs/scene-view-status-6.png
new file mode 100644
index 000000000..a2f9a8a99
Binary files /dev/null and b/files/opencs/scene-view-status-6.png differ
diff --git a/files/opencs/scene-view-status-7.png b/files/opencs/scene-view-status-7.png
new file mode 100644
index 000000000..ce4e20e00
Binary files /dev/null and b/files/opencs/scene-view-status-7.png differ
diff --git a/files/opencs/scene-view-status-8.png b/files/opencs/scene-view-status-8.png
new file mode 100644
index 000000000..f0c499832
Binary files /dev/null and b/files/opencs/scene-view-status-8.png differ
diff --git a/files/opencs/scene-view-status-9.png b/files/opencs/scene-view-status-9.png
new file mode 100644
index 000000000..b30c3eec5
Binary files /dev/null and b/files/opencs/scene-view-status-9.png differ
diff --git a/files/opencs/scene-view-terrain.png b/files/opencs/scene-view-terrain.png
new file mode 100644
index 000000000..7ebbd7a9a
Binary files /dev/null and b/files/opencs/scene-view-terrain.png differ
diff --git a/files/opencs/scene-view-water.png b/files/opencs/scene-view-water.png
new file mode 100644
index 000000000..0289b3c2c
Binary files /dev/null and b/files/opencs/scene-view-water.png differ
diff --git a/files/openmw.cfg b/files/openmw.cfg
index b60c1ba72..3a9bd8762 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -1,3 +1,7 @@
+# This is the global openmw.cfg file. Do not modify!
+# Modifications should be done on the user openmw.cfg file instead
+# (see: https://wiki.openmw.org/index.php?title=Paths)
+
 data="?mw?Data Files"
 data=${MORROWIND_DATA_FILES}
 data-local="?userdata?data"
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index 9d86174d9..71cd3bfbf 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -1,3 +1,7 @@
+# This is the local openmw.cfg file. Do not modify!
+# Modifications should be done on the user openmw.cfg file instead
+# (see: https://wiki.openmw.org/index.php?title=Paths)
+
 data="?global?data"
 data="?mw?Data Files"
 data=./data
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index 12b52d3db..7566994e2 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -179,6 +179,8 @@ camera y multiplier = 1.0
 
 always run = false
 
+allow third person zoom = false
+
 [Game]
 # Always use the most powerful attack when striking with a weapon (chop, slash or thrust)
 best attack = false
diff --git a/files/windows/openmw-wizard.ico b/files/windows/openmw-wizard.ico
new file mode 100644
index 000000000..e5dd50ba6
Binary files /dev/null and b/files/windows/openmw-wizard.ico differ
diff --git a/files/windows/openmw-wizard.rc b/files/windows/openmw-wizard.rc
new file mode 100644
index 000000000..4861f4f4c
--- /dev/null
+++ b/files/windows/openmw-wizard.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "openmw-wizard.ico"
diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index d7db81595..0b08e28d9 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -514,6 +514,7 @@ namespace Physic
             assert (mRaycastingObjectMap.find(name) == mRaycastingObjectMap.end());
             mRaycastingObjectMap[name] = body;
             mDynamicsWorld->addRigidBody(body,CollisionType_Raycasting,CollisionType_Raycasting|CollisionType_Projectile);
+            body->setCollisionFlags(body->getCollisionFlags() | btCollisionObject::CF_DISABLE_VISUALIZE_OBJECT);
         }
 
         return body;