diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 66844b2806..538f63dc96 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -29,7 +29,8 @@ add_openmw_dir (mwgui
     map_window window_pinnable_base cursorreplace tooltips scrollwindow bookwindow list
     formatting inventorywindow container hud countdialog tradewindow settingswindow
     confirmationdialog alchemywindow referenceinterface spellwindow mainmenu quickkeysmenu
-    itemselection spellbuyingwindow loadingscreen levelupdialog waitdialog
+    itemselection spellbuyingwindow loadingscreen levelupdialog waitdialog spellcreationdialog
+    enchantingdialog trainingwindow travelwindow
     )
 
 add_openmw_dir (mwdialogue
@@ -61,7 +62,7 @@ add_openmw_dir (mwclass
 
 add_openmw_dir (mwmechanics
     mechanicsmanagerimp stat creaturestats magiceffects movement actors drawstate spells
-    activespells npcstats aipackage aisequence
+    activespells npcstats aipackage aisequence alchemy
     )
 
 add_openmw_dir (mwbase
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index adbfca129d..617689bc63 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -163,9 +163,8 @@ void OMW::Engine::loadBSA()
         std::cout << "Data dir " << dataDirectory << std::endl;
         Bsa::addDir(dataDirectory, mFSStrict);
 
-        // Workaround: Mygui does not find textures in non-BSA subfolders, _unless_ they are explicitely added like this
-        // For splash screens, this is OK to do, but eventually we will need an investigation why this is necessary
-        Bsa::addDir(dataDirectory + "/Splash", mFSStrict);
+        // Workaround until resource listing capabilities are added to DirArchive, we need those to list available splash screens
+        addResourcesDirectory (dataDirectory);
     }
 }
 
@@ -424,21 +423,10 @@ void OMW::Engine::activate()
     if (handle.empty())
         return;
 
-    // the faced handle is not updated immediately, so on a cell change it might
-    // point to an object that doesn't exist anymore
-    // therefore, we are catching the "Unknown Ogre handle" exception that occurs in this case
-    MWWorld::Ptr ptr;
-    try
-    {
-        ptr = MWBase::Environment::get().getWorld()->getPtrViaHandle (handle);
+    MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->searchPtrViaHandle (handle);
 
-        if (ptr.isEmpty())
-            return;
-    }
-    catch (std::runtime_error&)
-    {
+    if (ptr.isEmpty())
         return;
-    }
 
     MWScript::InterpreterContext interpreterContext (&ptr.getRefData().getLocals(), ptr);
 
diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index d1daa101db..c177912d4f 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -42,6 +42,7 @@ namespace MWGui
     class Console;
     class SpellWindow;
     class TradeWindow;
+    class TravelWindow;
     class SpellBuyingWindow;
     class ConfirmationDialog;
     class CountDialog;
@@ -108,6 +109,7 @@ namespace MWBase
             virtual MWGui::ConfirmationDialog* getConfirmationDialog() = 0;
             virtual MWGui::TradeWindow* getTradeWindow() = 0;
             virtual MWGui::SpellBuyingWindow* getSpellBuyingWindow() = 0;
+            virtual MWGui::TravelWindow* getTravelWindow() = 0;
             virtual MWGui::SpellWindow* getSpellWindow() = 0;
             virtual MWGui::Console* getConsole() = 0;
 
@@ -227,6 +229,10 @@ namespace MWBase
 
             virtual bool getPlayerSleeping() = 0;
             virtual void wakeUpPlayer() = 0;
+
+            virtual void startSpellMaking(MWWorld::Ptr actor) = 0;
+            virtual void startEnchanting(MWWorld::Ptr actor) = 0;
+            virtual void startTraining(MWWorld::Ptr actor) = 0;
     };
 }
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 521bbb988e..9dcdc312f1 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -142,6 +142,9 @@ namespace MWBase
             virtual MWWorld::Ptr getPtrViaHandle (const std::string& handle) = 0;
             ///< Return a pointer to a liveCellRef with the given Ogre handle.
 
+            virtual MWWorld::Ptr searchPtrViaHandle (const std::string& handle) = 0;
+            ///< Return a pointer to a liveCellRef with the given Ogre handle or Ptr() if not found
+
             /// \todo enable reference in the OGRE scene
             virtual void enable (const MWWorld::Ptr& ptr) = 0;
 
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index f37955c7eb..62f7df679b 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -145,16 +145,17 @@ namespace
 
         return false;
     }
-}
-
-namespace MWDialogue
-{
 
     //helper function
     std::string::size_type find_str_ci(const std::string& str, const std::string& substr,size_t pos)
     {
         return toLower(str).find(toLower(substr),pos);
     }
+}
+
+namespace MWDialogue
+{
+
 
     bool DialogueManager::functionFilter(const MWWorld::Ptr& actor, const ESM::DialInfo& info,bool choice)
     {
@@ -779,6 +780,8 @@ namespace MWDialogue
                 services = ref->base->mAiData.mServices;
         }
 
+        int windowServices = 0;
+
         if (services & ESM::NPC::Weapon
             || services & ESM::NPC::Armor
             || services & ESM::NPC::Clothing
@@ -790,14 +793,24 @@ namespace MWDialogue
             || services & ESM::NPC::Apparatus
             || services & ESM::NPC::RepairItem
             || services & ESM::NPC::Misc)
-            win->setShowTrade(true);
-        else
-            win->setShowTrade(false);
+            windowServices |= MWGui::DialogueWindow::Service_Trade;
+
+        if( !mActor.get<ESM::NPC>()->base->mTransport.empty())
+            windowServices |= MWGui::DialogueWindow::Service_Travel;
 
         if (services & ESM::NPC::Spells)
-            win->setShowSpells(true);
-        else
-            win->setShowSpells(false);
+            windowServices |= MWGui::DialogueWindow::Service_BuySpells;
+
+        if (services & ESM::NPC::Spellmaking)
+            windowServices |= MWGui::DialogueWindow::Service_CreateSpells;
+
+        if (services & ESM::NPC::Training)
+            windowServices |= MWGui::DialogueWindow::Service_Training;
+
+        if (services & ESM::NPC::Enchanting)
+            windowServices |= MWGui::DialogueWindow::Service_Enchant;
+
+        win->setServices (windowServices);
 
         // sort again, because the previous sort was case-sensitive
         keywordList.sort(stringCompareNoCase);
diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp
index 4a419c0c03..56db47a0f5 100644
--- a/apps/openmw/mwgui/alchemywindow.cpp
+++ b/apps/openmw/mwgui/alchemywindow.cpp
@@ -28,25 +28,25 @@ namespace MWGui
 {
     AlchemyWindow::AlchemyWindow(MWBase::WindowManager& parWindowManager)
         : WindowBase("openmw_alchemy_window.layout", parWindowManager)
-        , ContainerBase(0)
+        , ContainerBase(0), mApparatus (4), mIngredients (4)
     {
         getWidget(mCreateButton, "CreateButton");
         getWidget(mCancelButton, "CancelButton");
-        getWidget(mIngredient1, "Ingredient1");
-        getWidget(mIngredient2, "Ingredient2");
-        getWidget(mIngredient3, "Ingredient3");
-        getWidget(mIngredient4, "Ingredient4");
-        getWidget(mApparatus1, "Apparatus1");
-        getWidget(mApparatus2, "Apparatus2");
-        getWidget(mApparatus3, "Apparatus3");
-        getWidget(mApparatus4, "Apparatus4");
+        getWidget(mIngredients[0], "Ingredient1");
+        getWidget(mIngredients[1], "Ingredient2");
+        getWidget(mIngredients[2], "Ingredient3");
+        getWidget(mIngredients[3], "Ingredient4");
+        getWidget(mApparatus[0], "Apparatus1");
+        getWidget(mApparatus[1], "Apparatus2");
+        getWidget(mApparatus[2], "Apparatus3");
+        getWidget(mApparatus[3], "Apparatus4");
         getWidget(mEffectsBox, "CreatedEffects");
         getWidget(mNameEdit, "NameEdit");
 
-        mIngredient1->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
-        mIngredient2->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
-        mIngredient3->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
-        mIngredient4->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
+        mIngredients[0]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
+        mIngredients[1]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
+        mIngredients[2]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
+        mIngredients[3]->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onIngredientSelected);
 
         mCreateButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCreateButtonClicked);
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &AlchemyWindow::onCancelButtonClicked);
@@ -62,157 +62,52 @@ namespace MWGui
 
     void AlchemyWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
     {
+        mAlchemy.clear();
+        
         mWindowManager.removeGuiMode(GM_Alchemy);
         mWindowManager.removeGuiMode(GM_Inventory);
     }
 
     void AlchemyWindow::onCreateButtonClicked(MyGUI::Widget* _sender)
     {
+        std::string name = mNameEdit->getCaption();
+        boost::algorithm::trim(name);
+
+        MWMechanics::Alchemy::Result result = mAlchemy.create (mNameEdit->getCaption ());
+
+        if (result == MWMechanics::Alchemy::Result_NoName)
+        {
+            mWindowManager.messageBox("#{sNotifyMessage37}", std::vector<std::string>());
+            return;
+        }
+
         // check if mortar & pestle is available (always needed)
-        /// \todo check albemic, calcinator, retort (sometimes needed)
-        if (!mApparatus1->isUserString("ToolTipType"))
+        if (result == MWMechanics::Alchemy::Result_NoMortarAndPestle)
         {
             mWindowManager.messageBox("#{sNotifyMessage45}", std::vector<std::string>());
             return;
         }
 
         // make sure 2 or more ingredients were selected
-        int numIngreds = 0;
-        if (mIngredient1->isUserString("ToolTipType"))
-            ++numIngreds;
-        if (mIngredient2->isUserString("ToolTipType"))
-            ++numIngreds;
-        if (mIngredient3->isUserString("ToolTipType"))
-            ++numIngreds;
-        if (mIngredient4->isUserString("ToolTipType"))
-            ++numIngreds;
-        if (numIngreds < 2)
+        if (result == MWMechanics::Alchemy::Result_LessThanTwoIngredients)
         {
             mWindowManager.messageBox("#{sNotifyMessage6a}", std::vector<std::string>());
             return;
         }
 
-        // make sure a name was entered
-        std::string name = mNameEdit->getCaption();
-        boost::algorithm::trim(name);
-        if (name == "")
-        {
-            mWindowManager.messageBox("#{sNotifyMessage37}", std::vector<std::string>());
-            return;
-        }
-
-        // if there are no created effects, the potion will always fail (but the ingredients won't be destroyed)
-        if (mEffects.empty())
+        if (result == MWMechanics::Alchemy::Result_NoEffects)
         {
             mWindowManager.messageBox("#{sNotifyMessage8}", std::vector<std::string>());
             MWBase::Environment::get().getSoundManager()->playSound("potion fail", 1.f, 1.f);
             return;
         }
 
-        if (rand() % 2 == 0) /// \todo
+        if (result == MWMechanics::Alchemy::Result_Success)
         {
-            ESM::Potion newPotion;
-            newPotion.mName = mNameEdit->getCaption();
-            ESM::EffectList effects;
-            for (unsigned int i=0; i<4; ++i)
-            {
-                if (mEffects.size() >= i+1)
-                {
-                    ESM::ENAMstruct effect;
-                    effect.mEffectID = mEffects[i].mEffectID;
-                    effect.mArea = 0;
-                    effect.mRange = ESM::RT_Self;
-                    effect.mSkill = mEffects[i].mSkill;
-                    effect.mAttribute = mEffects[i].mAttribute;
-                    effect.mMagnMin = 1; /// \todo
-                    effect.mMagnMax = 10; /// \todo
-                    effect.mDuration = 60; /// \todo
-                    effects.mList.push_back(effect);
-                }
-            }
-
-            // UESP Wiki / Morrowind:Alchemy
-            // "The weight of a potion is an average of the weight of the ingredients, rounded down."
-            // note by scrawl: not rounding down here, I can't imagine a created potion to
-            // have 0 weight when using ingredients with 0.1 weight respectively
-            float weight = 0;
-            if (mIngredient1->isUserString("ToolTipType"))
-                weight += mIngredient1->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>()->base->mData.mWeight;
-            if (mIngredient2->isUserString("ToolTipType"))
-                weight += mIngredient2->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>()->base->mData.mWeight;
-            if (mIngredient3->isUserString("ToolTipType"))
-                weight += mIngredient3->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>()->base->mData.mWeight;
-            if (mIngredient4->isUserString("ToolTipType"))
-                weight += mIngredient4->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>()->base->mData.mWeight;
-            newPotion.mData.mWeight = weight / float(numIngreds);
-
-            newPotion.mData.mValue = 100; /// \todo
-            newPotion.mEffects = effects;
-            // pick a random mesh and icon
-            std::vector<std::string> names;
-            /// \todo is the mesh/icon dependent on alchemy skill?
-            names.push_back("standard");
-            names.push_back("bargain");
-            names.push_back("cheap");
-            names.push_back("fresh");
-            names.push_back("exclusive");
-            names.push_back("quality");
-            int random = rand() % names.size();
-            newPotion.mModel = "m\\misc_potion_" + names[random ] + "_01.nif";
-            newPotion.mIcon = "m\\tx_potion_" + names[random ] + "_01.dds";
-
-            // check if a similiar potion record exists already
-            bool found = false;
-            std::string objectId;
-            typedef std::map<std::string, ESM::Potion> PotionMap;
-            PotionMap potions = MWBase::Environment::get().getWorld()->getStore().potions.list;
-            for (PotionMap::const_iterator it = potions.begin(); it != potions.end(); ++it)
-            {
-                if (found) break;
-
-                if (it->second.mData.mValue == newPotion.mData.mValue
-                    && it->second.mData.mWeight == newPotion.mData.mWeight
-                    && it->second.mName == newPotion.mName
-                    && it->second.mEffects.mList.size() == newPotion.mEffects.mList.size())
-                {
-                    // check effects
-                    for (unsigned int i=0; i < it->second.mEffects.mList.size(); ++i)
-                    {
-                        const ESM::ENAMstruct& a = it->second.mEffects.mList[i];
-                        const ESM::ENAMstruct& b = newPotion.mEffects.mList[i];
-                        if (a.mEffectID == b.mEffectID
-                            && a.mArea == b.mArea
-                            && a.mRange == b.mRange
-                            && a.mSkill == b.mSkill
-                            && a.mAttribute == b.mAttribute
-                            && a.mMagnMin == b.mMagnMin
-                            && a.mMagnMax == b.mMagnMax
-                            && a.mDuration == b.mDuration)
-                        {
-                            found = true;
-                            objectId = it->first;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (!found)
-            {
-                std::pair<std::string, const ESM::Potion*> result = MWBase::Environment::get().getWorld()->createRecord(newPotion);
-                objectId = result.first;
-            }
-
-            // create a reference and add it to player inventory
-            MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), objectId);
-            MWWorld::ContainerStore& store = MWWorld::Class::get(mPtr).getContainerStore(mPtr);
-            ref.getPtr().getRefData().setCount(1);
-            store.add(ref.getPtr());
-
             mWindowManager.messageBox("#{sPotionSuccess}", std::vector<std::string>());
             MWBase::Environment::get().getSoundManager()->playSound("potion success", 1.f, 1.f);
         }
-        else
+        else if (result == MWMechanics::Alchemy::Result_RandomFailure)
         {
             // potion failed
             mWindowManager.messageBox("#{sNotifyMessage8}", std::vector<std::string>());
@@ -220,155 +115,53 @@ namespace MWGui
         }
 
         // reduce count of the ingredients
-        if (mIngredient1->isUserString("ToolTipType"))
-        {
-            MWWorld::Ptr ingred = *mIngredient1->getUserData<MWWorld::Ptr>();
-            ingred.getRefData().setCount(ingred.getRefData().getCount()-1);
-            if (ingred.getRefData().getCount() == 0)
-                removeIngredient(mIngredient1);
-        }
-        if (mIngredient2->isUserString("ToolTipType"))
-        {
-            MWWorld::Ptr ingred = *mIngredient2->getUserData<MWWorld::Ptr>();
-            ingred.getRefData().setCount(ingred.getRefData().getCount()-1);
-            if (ingred.getRefData().getCount() == 0)
-                removeIngredient(mIngredient2);
-        }
-        if (mIngredient3->isUserString("ToolTipType"))
-        {
-            MWWorld::Ptr ingred = *mIngredient3->getUserData<MWWorld::Ptr>();
-            ingred.getRefData().setCount(ingred.getRefData().getCount()-1);
-            if (ingred.getRefData().getCount() == 0)
-                removeIngredient(mIngredient3);
-        }
-        if (mIngredient4->isUserString("ToolTipType"))
-        {
-            MWWorld::Ptr ingred = *mIngredient4->getUserData<MWWorld::Ptr>();
-            ingred.getRefData().setCount(ingred.getRefData().getCount()-1);
-            if (ingred.getRefData().getCount() == 0)
-                removeIngredient(mIngredient4);
+        for (int i=0; i<4; ++i)
+            if (mIngredients[i]->isUserString("ToolTipType"))
+            {
+                MWWorld::Ptr ingred = *mIngredients[i]->getUserData<MWWorld::Ptr>();
+                ingred.getRefData().setCount(ingred.getRefData().getCount()-1);
+                if (ingred.getRefData().getCount() == 0)
+                    removeIngredient(mIngredients[i]);
         }
+
         update();
     }
 
     void AlchemyWindow::open()
     {
-        openContainer(MWBase::Environment::get().getWorld()->getPlayer().getPlayer());
-        setFilter(ContainerBase::Filter_Ingredients);
+        openContainer (MWBase::Environment::get().getWorld()->getPlayer().getPlayer()); // this sets mPtr
+        setFilter (ContainerBase::Filter_Ingredients);
 
-        // pick the best available apparatus
-        MWWorld::ContainerStore& store = MWWorld::Class::get(mPtr).getContainerStore(mPtr);
+        mAlchemy.setAlchemist (mPtr);
 
-        MWWorld::Ptr bestAlbemic;
-        MWWorld::Ptr bestMortarPestle;
-        MWWorld::Ptr bestCalcinator;
-        MWWorld::Ptr bestRetort;
+        int index = 0;
 
-        for (MWWorld::ContainerStoreIterator it(store.begin(MWWorld::ContainerStore::Type_Apparatus));
-            it != store.end(); ++it)
+        for (MWMechanics::Alchemy::TToolsIterator iter (mAlchemy.beginTools());
+            iter!=mAlchemy.endTools() && index<static_cast<int> (mApparatus.size()); ++iter, ++index)
         {
-            MWWorld::LiveCellRef<ESM::Apparatus>* ref = it->get<ESM::Apparatus>();
-            if (ref->base->mData.mType == ESM::Apparatus::Albemic
-            && (bestAlbemic.isEmpty() || ref->base->mData.mQuality > bestAlbemic.get<ESM::Apparatus>()->base->mData.mQuality))
-                bestAlbemic = *it;
-            else if (ref->base->mData.mType == ESM::Apparatus::MortarPestle
-            && (bestMortarPestle.isEmpty() || ref->base->mData.mQuality > bestMortarPestle.get<ESM::Apparatus>()->base->mData.mQuality))
-                bestMortarPestle = *it;
-            else if (ref->base->mData.mType == ESM::Apparatus::Calcinator
-            && (bestCalcinator.isEmpty() || ref->base->mData.mQuality > bestCalcinator.get<ESM::Apparatus>()->base->mData.mQuality))
-                bestCalcinator = *it;
-            else if (ref->base->mData.mType == ESM::Apparatus::Retort
-            && (bestRetort.isEmpty() || ref->base->mData.mQuality > bestRetort.get<ESM::Apparatus>()->base->mData.mQuality))
-                bestRetort = *it;
+            if (!iter->isEmpty())
+            {
+                mApparatus.at (index)->setUserString ("ToolTipType", "ItemPtr");
+                mApparatus.at (index)->setUserData (*iter);
+                mApparatus.at (index)->setImageTexture (getIconPath (*iter));
+            }
         }
 
-        if (!bestMortarPestle.isEmpty())
-        {
-            mApparatus1->setUserString("ToolTipType", "ItemPtr");
-            mApparatus1->setUserData(bestMortarPestle);
-            mApparatus1->setImageTexture(getIconPath(bestMortarPestle));
-        }
-        if (!bestAlbemic.isEmpty())
-        {
-            mApparatus2->setUserString("ToolTipType", "ItemPtr");
-            mApparatus2->setUserData(bestAlbemic);
-            mApparatus2->setImageTexture(getIconPath(bestAlbemic));
-        }
-        if (!bestCalcinator.isEmpty())
-        {
-            mApparatus3->setUserString("ToolTipType", "ItemPtr");
-            mApparatus3->setUserData(bestCalcinator);
-            mApparatus3->setImageTexture(getIconPath(bestCalcinator));
-        }
-        if (!bestRetort.isEmpty())
-        {
-            mApparatus4->setUserString("ToolTipType", "ItemPtr");
-            mApparatus4->setUserData(bestRetort);
-            mApparatus4->setImageTexture(getIconPath(bestRetort));
-        }
+        update();
     }
 
     void AlchemyWindow::onIngredientSelected(MyGUI::Widget* _sender)
     {
         removeIngredient(_sender);
-        drawItems();
         update();
     }
 
     void AlchemyWindow::onSelectedItemImpl(MWWorld::Ptr item)
     {
-        MyGUI::ImageBox* add = NULL;
+        int res = mAlchemy.addIngredient(item);
 
-        // don't allow to add an ingredient that is already added
-        // (which could happen if two similiar ingredients don't stack because of script / owner)
-        bool alreadyAdded = false;
-        std::string name = MWWorld::Class::get(item).getName(item);
-        if (mIngredient1->isUserString("ToolTipType"))
+        if (res != -1)
         {
-            MWWorld::Ptr item2 = *mIngredient1->getUserData<MWWorld::Ptr>();
-            std::string name2 = MWWorld::Class::get(item2).getName(item2);
-            if (name == name2)
-                alreadyAdded = true;
-        }
-        if (mIngredient2->isUserString("ToolTipType"))
-        {
-            MWWorld::Ptr item2 = *mIngredient2->getUserData<MWWorld::Ptr>();
-            std::string name2 = MWWorld::Class::get(item2).getName(item2);
-            if (name == name2)
-                alreadyAdded = true;
-        }
-        if (mIngredient3->isUserString("ToolTipType"))
-        {
-            MWWorld::Ptr item2 = *mIngredient3->getUserData<MWWorld::Ptr>();
-            std::string name2 = MWWorld::Class::get(item2).getName(item2);
-            if (name == name2)
-                alreadyAdded = true;
-        }
-        if (mIngredient4->isUserString("ToolTipType"))
-        {
-            MWWorld::Ptr item2 = *mIngredient4->getUserData<MWWorld::Ptr>();
-            std::string name2 = MWWorld::Class::get(item2).getName(item2);
-            if (name == name2)
-                alreadyAdded = true;
-        }
-        if (alreadyAdded)
-            return;
-
-        if (!mIngredient1->isUserString("ToolTipType"))
-            add = mIngredient1;
-        if (add == NULL  && !mIngredient2->isUserString("ToolTipType"))
-            add = mIngredient2;
-        if (add == NULL  && !mIngredient3->isUserString("ToolTipType"))
-            add = mIngredient3;
-        if (add == NULL  && !mIngredient4->isUserString("ToolTipType"))
-            add = mIngredient4;
-
-        if (add != NULL)
-        {
-            add->setUserString("ToolTipType", "ItemPtr");
-            add->setUserData(item);
-            add->setImageTexture(getIconPath(item));
-            drawItems();
             update();
 
             std::string sound = MWWorld::Class::get(item).getUpSoundId(item);
@@ -380,54 +173,40 @@ namespace MWGui
     {
         std::vector<MWWorld::Ptr> ignore;
         // don't show ingredients that are currently selected in the "available ingredients" box.
-        if (mIngredient1->isUserString("ToolTipType"))
-            ignore.push_back(*mIngredient1->getUserData<MWWorld::Ptr>());
-        if (mIngredient2->isUserString("ToolTipType"))
-            ignore.push_back(*mIngredient2->getUserData<MWWorld::Ptr>());
-        if (mIngredient3->isUserString("ToolTipType"))
-            ignore.push_back(*mIngredient3->getUserData<MWWorld::Ptr>());
-        if (mIngredient4->isUserString("ToolTipType"))
-            ignore.push_back(*mIngredient4->getUserData<MWWorld::Ptr>());
+        for (int i=0; i<4; ++i)
+            if (mIngredients[i]->isUserString("ToolTipType"))
+                ignore.push_back(*mIngredients[i]->getUserData<MWWorld::Ptr>());
 
         return ignore;
     }
 
     void AlchemyWindow::update()
     {
-        Widgets::SpellEffectList effects;
-
+        MWMechanics::Alchemy::TIngredientsIterator it = mAlchemy.beginIngredients ();
         for (int i=0; i<4; ++i)
         {
-            MyGUI::ImageBox* ingredient;
-            if (i==0)
-                ingredient = mIngredient1;
-            else if (i==1)
-                ingredient = mIngredient2;
-            else if (i==2)
-                ingredient = mIngredient3;
-            else if (i==3)
-                ingredient = mIngredient4;
+            MyGUI::ImageBox* ingredient = mIngredients[i];
 
-            if (!ingredient->isUserString("ToolTipType"))
-                continue;
-
-            // add the effects of this ingredient to list of effects
-            MWWorld::LiveCellRef<ESM::Ingredient>* ref = ingredient->getUserData<MWWorld::Ptr>()->get<ESM::Ingredient>();
-            for (int i=0; i<4; ++i)
+            MWWorld::Ptr item;
+            if (it != mAlchemy.endIngredients ())
             {
-                if (ref->base->mData.mEffectID[i] < 0)
-                    continue;
-                MWGui::Widgets::SpellEffectParams params;
-                params.mEffectID = ref->base->mData.mEffectID[i];
-                params.mAttribute = ref->base->mData.mAttributes[i];
-                params.mSkill = ref->base->mData.mSkills[i];
-                effects.push_back(params);
+                item = *it;
+                ++it;
             }
 
-            // update ingredient count labels
             if (ingredient->getChildCount())
                 MyGUI::Gui::getInstance().destroyWidget(ingredient->getChildAt(0));
 
+            ingredient->setImageTexture("");
+            ingredient->clearUserStrings ();
+
+            if (item.isEmpty ())
+                continue;
+
+            ingredient->setUserString("ToolTipType", "ItemPtr");
+            ingredient->setUserData(item);
+            ingredient->setImageTexture(getIconPath(item));
+
             MyGUI::TextBox* text = ingredient->createWidget<MyGUI::TextBox>("SandBrightText", MyGUI::IntCoord(0, 14, 32, 18), MyGUI::Align::Default, std::string("Label"));
             text->setTextAlign(MyGUI::Align::Right);
             text->setNeedMouseFocus(false);
@@ -436,49 +215,15 @@ namespace MWGui
             text->setCaption(getCountString(ingredient->getUserData<MWWorld::Ptr>()->getRefData().getCount()));
         }
 
-        // now remove effects that are only present once
-        Widgets::SpellEffectList::iterator it = effects.begin();
-        while (it != effects.end())
-        {
-            Widgets::SpellEffectList::iterator next = it;
-            ++next;
-            bool found = false;
-            for (; next != effects.end(); ++next)
-            {
-                if (*next == *it)
-                    found = true;
-            }
+        drawItems();
 
-            if (!found)
-                it = effects.erase(it);
-            else
-                ++it;
-        }
-
-        // now remove duplicates, and don't allow more than 4 effects
-        Widgets::SpellEffectList old = effects;
-        effects.clear();
-        int i=0;
-        for (Widgets::SpellEffectList::iterator it = old.begin();
-            it != old.end(); ++it)
+        std::vector<ESM::ENAMstruct> effects;
+        ESM::EffectList list;
+        list.mList = effects;
+        for (MWMechanics::Alchemy::TEffectsIterator it = mAlchemy.beginEffects (); it != mAlchemy.endEffects (); ++it)
         {
-            bool found = false;
-            for (Widgets::SpellEffectList::iterator it2 = effects.begin();
-                it2 != effects.end(); ++it2)
-            {
-                // MW considers all "foritfy attribute" effects as the same effect. See the
-                // "Can't create multi-state boost potions" discussion on http://www.uesp.net/wiki/Morrowind_talk:Alchemy
-                // thus, we are only checking effectID here and not attribute or skill
-                if (it2->mEffectID == it->mEffectID)
-                    found = true;
-            }
-            if (!found && i<4)
-            {
-                ++i;
-                effects.push_back(*it);
-            }
+            list.mList.push_back(*it);
         }
-        mEffects = effects;
 
         while (mEffectsBox->getChildCount())
             MyGUI::Gui::getInstance().destroyWidget(mEffectsBox->getChildAt(0));
@@ -487,7 +232,9 @@ namespace MWGui
         Widgets::MWEffectListPtr effectsWidget = mEffectsBox->createWidget<Widgets::MWEffectList>
             ("MW_StatName", coord, MyGUI::Align::Left | MyGUI::Align::Top);
         effectsWidget->setWindowManager(&mWindowManager);
-        effectsWidget->setEffectList(effects);
+
+        Widgets::SpellEffectList _list = Widgets::MWEffectList::effectListFromESM(&list);
+        effectsWidget->setEffectList(_list);
 
         std::vector<MyGUI::WidgetPtr> effectItems;
         effectsWidget->createEffectWidgets(effectItems, mEffectsBox, coord, false, 0);
@@ -496,9 +243,10 @@ namespace MWGui
 
     void AlchemyWindow::removeIngredient(MyGUI::Widget* ingredient)
     {
-        ingredient->clearUserStrings();
-        static_cast<MyGUI::ImageBox*>(ingredient)->setImageTexture("");
-        if (ingredient->getChildCount())
-            MyGUI::Gui::getInstance().destroyWidget(ingredient->getChildAt(0));
+        for (int i=0; i<4; ++i)
+            if (mIngredients[i] == ingredient)
+                mAlchemy.removeIngredient (i);
+
+        update();
     }
 }
diff --git a/apps/openmw/mwgui/alchemywindow.hpp b/apps/openmw/mwgui/alchemywindow.hpp
index 53e7178d50..5f84e73e9b 100644
--- a/apps/openmw/mwgui/alchemywindow.hpp
+++ b/apps/openmw/mwgui/alchemywindow.hpp
@@ -1,6 +1,10 @@
 #ifndef MWGUI_ALCHEMY_H
 #define MWGUI_ALCHEMY_H
 
+#include <vector>
+
+#include "../mwmechanics/alchemy.hpp"
+
 #include "window_base.hpp"
 #include "container.hpp"
 #include "widgets.hpp"
@@ -18,22 +22,10 @@ namespace MWGui
         MyGUI::Button* mCreateButton;
         MyGUI::Button* mCancelButton;
 
-        MyGUI::ImageBox* mIngredient1;
-        MyGUI::ImageBox* mIngredient2;
-        MyGUI::ImageBox* mIngredient3;
-        MyGUI::ImageBox* mIngredient4;
-
-        MyGUI::ImageBox* mApparatus1;
-        MyGUI::ImageBox* mApparatus2;
-        MyGUI::ImageBox* mApparatus3;
-        MyGUI::ImageBox* mApparatus4;
-
         MyGUI::Widget* mEffectsBox;
 
         MyGUI::EditBox* mNameEdit;
 
-        Widgets::SpellEffectList mEffects; // effects of created potion
-
         void onCancelButtonClicked(MyGUI::Widget* _sender);
         void onCreateButtonClicked(MyGUI::Widget* _sender);
         void onIngredientSelected(MyGUI::Widget* _sender);
@@ -46,6 +38,13 @@ namespace MWGui
         virtual void onReferenceUnavailable() { ; }
 
         void update();
+        
+    private:
+
+        MWMechanics::Alchemy mAlchemy;
+
+        std::vector<MyGUI::ImageBox *> mApparatus;
+        std::vector<MyGUI::ImageBox *> mIngredients;
     };
 }
 
diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp
index c8ef35be39..284653aee3 100644
--- a/apps/openmw/mwgui/birth.cpp
+++ b/apps/openmw/mwgui/birth.cpp
@@ -14,6 +14,16 @@
 using namespace MWGui;
 using namespace Widgets;
 
+namespace
+{
+
+bool sortBirthSigns(const std::pair<std::string, const ESM::BirthSign*>& left, const std::pair<std::string, const ESM::BirthSign*>& right)
+{
+    return left.second->mName.compare (right.second->mName) < 0;
+}
+
+}
+
 BirthDialog::BirthDialog(MWBase::WindowManager& parWindowManager)
   : WindowBase("openmw_chargen_birth.layout", parWindowManager)
 {
@@ -115,11 +125,21 @@ void BirthDialog::updateBirths()
     ESMS::RecListT<ESM::BirthSign>::MapType::const_iterator it = store.birthSigns.list.begin();
     ESMS::RecListT<ESM::BirthSign>::MapType::const_iterator end = store.birthSigns.list.end();
     int index = 0;
-    for (; it != end; ++it)
+
+    // sort by name
+    std::vector < std::pair<std::string, const ESM::BirthSign*> > birthSigns;
+    for (; it!=end; ++it)
     {
-        const ESM::BirthSign &birth = it->second;
-        mBirthList->addItem(birth.mName, it->first);
-        if (boost::iequals(it->first, mCurrentBirthId))
+        std::string id = it->first;
+        const ESM::BirthSign* sign = &it->second;
+        birthSigns.push_back(std::make_pair(id, sign));
+    }
+    std::sort(birthSigns.begin(), birthSigns.end(), sortBirthSigns);
+
+    for (std::vector < std::pair<std::string, const ESM::BirthSign*> >::const_iterator it2 = birthSigns.begin(); it2 != birthSigns.end(); ++it2)
+    {
+        mBirthList->addItem(it2->second->mName, it2->first);
+        if (boost::iequals(it2->first, mCurrentBirthId))
             mBirthList->setIndexSelected(index);
         ++index;
     }
diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp
index dfd9bde53f..8757b62a35 100644
--- a/apps/openmw/mwgui/class.cpp
+++ b/apps/openmw/mwgui/class.cpp
@@ -565,7 +565,7 @@ void CreateClassDialog::onAttributeClicked(Widgets::MWAttributePtr _sender)
 {
     delete mAttribDialog;
     mAttribDialog = new SelectAttributeDialog(mWindowManager);
-    mAttribDialog->setAffectedWidget(_sender);
+    mAffectedAttribute = _sender;
     mAttribDialog->eventCancel += MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
     mAttribDialog->eventItemSelected += MyGUI::newDelegate(this, &CreateClassDialog::onAttributeSelected);
     mAttribDialog->setVisible(true);
@@ -574,18 +574,17 @@ void CreateClassDialog::onAttributeClicked(Widgets::MWAttributePtr _sender)
 void CreateClassDialog::onAttributeSelected()
 {
     ESM::Attribute::AttributeID id = mAttribDialog->getAttributeId();
-    Widgets::MWAttributePtr attribute = mAttribDialog->getAffectedWidget();
-    if (attribute == mFavoriteAttribute0)
+    if (mAffectedAttribute == mFavoriteAttribute0)
     {
         if (mFavoriteAttribute1->getAttributeId() == id)
             mFavoriteAttribute1->setAttributeId(mFavoriteAttribute0->getAttributeId());
     }
-    else if (attribute == mFavoriteAttribute1)
+    else if (mAffectedAttribute == mFavoriteAttribute1)
     {
         if (mFavoriteAttribute0->getAttributeId() == id)
             mFavoriteAttribute0->setAttributeId(mFavoriteAttribute1->getAttributeId());
     }
-    attribute->setAttributeId(id);
+    mAffectedAttribute->setAttributeId(id);
     mWindowManager.removeDialog(mAttribDialog);
     mAttribDialog = 0;
 
@@ -596,7 +595,7 @@ void CreateClassDialog::onSkillClicked(Widgets::MWSkillPtr _sender)
 {
     delete mSkillDialog;
     mSkillDialog = new SelectSkillDialog(mWindowManager);
-    mSkillDialog->setAffectedWidget(_sender);
+    mAffectedSkill = _sender;
     mSkillDialog->eventCancel += MyGUI::newDelegate(this, &CreateClassDialog::onDialogCancel);
     mSkillDialog->eventItemSelected += MyGUI::newDelegate(this, &CreateClassDialog::onSkillSelected);
     mSkillDialog->setVisible(true);
@@ -605,22 +604,21 @@ void CreateClassDialog::onSkillClicked(Widgets::MWSkillPtr _sender)
 void CreateClassDialog::onSkillSelected()
 {
     ESM::Skill::SkillEnum id = mSkillDialog->getSkillId();
-    Widgets::MWSkillPtr skill = mSkillDialog->getAffectedWidget();
 
     // Avoid duplicate skills by swapping any skill field that matches the selected one
     std::vector<Widgets::MWSkillPtr>::const_iterator end = mSkills.end();
     for (std::vector<Widgets::MWSkillPtr>::const_iterator it = mSkills.begin(); it != end; ++it)
     {
-        if (*it == skill)
+        if (*it == mAffectedSkill)
             continue;
         if ((*it)->getSkillId() == id)
         {
-            (*it)->setSkillId(skill->getSkillId());
+            (*it)->setSkillId(mAffectedSkill->getSkillId());
             break;
         }
     }
 
-    skill->setSkillId(mSkillDialog->getSkillId());
+    mAffectedSkill->setSkillId(mSkillDialog->getSkillId());
     mWindowManager.removeDialog(mSkillDialog);
     mSkillDialog = 0;
     update();
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index 94e8558d03..c7699b3083 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -167,8 +167,6 @@ namespace MWGui
         ~SelectAttributeDialog();
 
         ESM::Attribute::AttributeID getAttributeId() const { return mAttributeId; }
-        Widgets::MWAttributePtr getAffectedWidget() const { return mAffectedWidget; }
-        void setAffectedWidget(Widgets::MWAttributePtr widget) { mAffectedWidget = widget; }
 
         // Events
         typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
@@ -188,8 +186,6 @@ namespace MWGui
         void onCancelClicked(MyGUI::Widget* _sender);
 
     private:
-        Widgets::MWAttributePtr mAffectedWidget;
-
         ESM::Attribute::AttributeID mAttributeId;
     };
 
@@ -200,8 +196,6 @@ namespace MWGui
         ~SelectSkillDialog();
 
         ESM::Skill::SkillEnum getSkillId() const { return mSkillId; }
-        Widgets::MWSkillPtr getAffectedWidget() const { return mAffectedWidget; }
-        void setAffectedWidget(Widgets::MWSkillPtr widget) { mAffectedWidget = widget; }
 
         // Events
         typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
@@ -224,7 +218,6 @@ namespace MWGui
         Widgets::MWSkillPtr mCombatSkill[9];
         Widgets::MWSkillPtr mMagicSkill[9];
         Widgets::MWSkillPtr mStealthSkill[9];
-        Widgets::MWSkillPtr mAffectedWidget;
 
         ESM::Skill::SkillEnum mSkillId;
     };
@@ -301,6 +294,9 @@ namespace MWGui
         DescriptionDialog                *mDescDialog;
 
         ESM::Class::Specialization       mSpecializationId;
+
+        Widgets::MWAttributePtr              mAffectedAttribute;
+        Widgets::MWSkillPtr              mAffectedSkill;
     };
 }
 #endif
diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp
index 245487a049..23d2197b70 100644
--- a/apps/openmw/mwgui/dialogue.cpp
+++ b/apps/openmw/mwgui/dialogue.cpp
@@ -19,6 +19,7 @@
 #include "tradewindow.hpp"
 #include "spellbuyingwindow.hpp"
 #include "inventorywindow.hpp"
+#include "travelwindow.hpp"
 
 using namespace MWGui;
 using namespace Widgets;
@@ -27,6 +28,8 @@ using namespace Widgets;
 *Copied from the internet.
 */
 
+namespace {
+
 std::string lower_string(const std::string& str)
 {
         std::string lowerCase;
@@ -42,12 +45,13 @@ std::string::size_type find_str_ci(const std::string& str, const std::string& su
     return lower_string(str).find(lower_string(substr),pos);
 }
 
+}
+
 
 DialogueWindow::DialogueWindow(MWBase::WindowManager& parWindowManager)
     : WindowBase("openmw_dialogue_window.layout", parWindowManager)
     , mEnabled(true)
-    , mShowTrade(false)
-    , mShowSpells(false)
+    , mServices(0)
 {
     // Centre dialog
     center();
@@ -134,7 +138,26 @@ void DialogueWindow::onSelectTopic(std::string topic)
         mWindowManager.pushGuiMode(GM_SpellBuying);
         mWindowManager.getSpellBuyingWindow()->startSpellBuying(mPtr);
     }
-
+    else if (topic == MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sTravel")->getString())
+    {
+        mWindowManager.pushGuiMode(GM_Travel);
+        mWindowManager.getTravelWindow()->startTravel(mPtr);
+    }
+    else if (topic == MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sSpellMakingMenuTitle")->getString())
+    {
+        mWindowManager.pushGuiMode(GM_SpellCreation);
+        mWindowManager.startSpellMaking (mPtr);
+    }
+    else if (topic == MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sEnchanting")->getString())
+    {
+        mWindowManager.pushGuiMode(GM_Enchanting);
+        mWindowManager.startEnchanting (mPtr);
+    }
+    else if (topic == MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sServiceTrainingTitle")->getString())
+    {
+        mWindowManager.pushGuiMode(GM_Training);
+        mWindowManager.startTraining (mPtr);
+    }
     else
         MWBase::Environment::get().getDialogueManager()->keywordSelected(lower_string(topic));
 }
@@ -155,14 +178,26 @@ void DialogueWindow::setKeywords(std::list<std::string> keyWords)
 {
     mTopicsList->clear();
 
-    bool anyService = mShowTrade||mShowSpells;
+    bool anyService = mServices > 0;
 
-    if (mShowTrade)
+    if (mServices & Service_Trade)
         mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sBarter")->getString());
 
-    if (mShowSpells)
+    if (mServices & Service_BuySpells)
         mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sSpells")->getString());
 
+    if (mServices & Service_Travel)
+        mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sTravel")->getString());
+
+    if (mServices & Service_CreateSpells)
+        mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sSpellmakingMenuTitle")->getString());
+
+    if (mServices & Service_Enchant)
+        mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sEnchanting")->getString());
+
+    if (mServices & Service_Training)
+        mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sServiceTrainingTitle")->getString());
+
     if (anyService)
         mTopicsList->addSeparator();
 
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index a43b0d5a70..3a89409cac 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -48,10 +48,18 @@ namespace MWGui
         void askQuestion(std::string question);
         void goodbye();
 
-        // various service button visibilities, depending if the npc/creature talked to has these services
         // make sure to call these before setKeywords()
-        void setShowTrade(bool show) { mShowTrade = show; }
-        void setShowSpells(bool show) { mShowSpells = show; }
+        void setServices(int services) { mServices = services; }
+
+        enum Services
+        {
+            Service_Trade = 0x01,
+            Service_BuySpells = 0x02,
+            Service_CreateSpells = 0x04,
+            Service_Enchant = 0x08,
+            Service_Training = 0x10,
+            Service_Travel = 0x20
+        };
 
     protected:
         void onSelectTopic(std::string topic);
@@ -69,9 +77,7 @@ namespace MWGui
         */
         std::string parseText(std::string text);
 
-        // various service button visibilities, depending if the npc/creature talked to has these services
-        bool mShowTrade;
-        bool mShowSpells;
+        int mServices;
 
         bool mEnabled;
 
diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
new file mode 100644
index 0000000000..3bd67ade63
--- /dev/null
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -0,0 +1,43 @@
+#include "enchantingdialog.hpp"
+
+
+namespace MWGui
+{
+
+
+    EnchantingDialog::EnchantingDialog(MWBase::WindowManager &parWindowManager)
+        : WindowBase("openmw_enchanting_dialog.layout", parWindowManager)
+        , EffectEditorBase(parWindowManager)
+    {
+        getWidget(mCancelButton, "CancelButton");
+        getWidget(mAvailableEffectsList, "AvailableEffects");
+        getWidget(mUsedEffectsView, "UsedEffects");
+
+        setWidgets(mAvailableEffectsList, mUsedEffectsView);
+
+        mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EnchantingDialog::onCancelButtonClicked);
+    }
+
+    void EnchantingDialog::open()
+    {
+        center();
+    }
+
+    void EnchantingDialog::startEnchanting (MWWorld::Ptr actor)
+    {
+        mPtr = actor;
+
+        startEditing ();
+    }
+
+    void EnchantingDialog::onReferenceUnavailable ()
+    {
+        mWindowManager.removeGuiMode (GM_Dialogue);
+        mWindowManager.removeGuiMode (GM_Enchanting);
+    }
+
+    void EnchantingDialog::onCancelButtonClicked(MyGUI::Widget* sender)
+    {
+        mWindowManager.removeGuiMode (GM_Enchanting);
+    }
+}
diff --git a/apps/openmw/mwgui/enchantingdialog.hpp b/apps/openmw/mwgui/enchantingdialog.hpp
new file mode 100644
index 0000000000..0415c9d8df
--- /dev/null
+++ b/apps/openmw/mwgui/enchantingdialog.hpp
@@ -0,0 +1,31 @@
+#ifndef MWGUI_ENCHANTINGDIALOG_H
+#define MWGUI_ENCHANTINGDIALOG_H
+
+#include "window_base.hpp"
+#include "referenceinterface.hpp"
+#include "spellcreationdialog.hpp"
+
+#include "../mwbase/windowmanager.hpp"
+
+namespace MWGui
+{
+
+    class EnchantingDialog : public WindowBase, public ReferenceInterface, public EffectEditorBase
+    {
+    public:
+        EnchantingDialog(MWBase::WindowManager& parWindowManager);
+
+        virtual void open();
+        void startEnchanting(MWWorld::Ptr actor);
+
+    protected:
+        virtual void onReferenceUnavailable();
+
+        void onCancelButtonClicked(MyGUI::Widget* sender);
+
+        MyGUI::Button* mCancelButton;
+    };
+
+}
+
+#endif
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index ed0e592269..66cc6b21ad 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -245,15 +245,7 @@ void HUD::onWorldClicked(MyGUI::Widget* _sender)
             return;
 
         std::string handle = MWBase::Environment::get().getWorld()->getFacedHandle();
-        MWWorld::Ptr object;
-        try
-        {
-            object = MWBase::Environment::get().getWorld()->getPtrViaHandle(handle);
-        }
-        catch (std::exception& /* e */)
-        {
-            return;
-        }
+        MWWorld::Ptr object = MWBase::Environment::get().getWorld()->searchPtrViaHandle(handle);
 
         if (mode == GM_Console)
             MWBase::Environment::get().getWindowManager()->getConsole()->setSelectedObject(object);
diff --git a/apps/openmw/mwgui/list.cpp b/apps/openmw/mwgui/list.cpp
index 661fb2e683..0bafced97b 100644
--- a/apps/openmw/mwgui/list.cpp
+++ b/apps/openmw/mwgui/list.cpp
@@ -128,4 +128,10 @@ void MWList::onItemSelected(MyGUI::Widget* _sender)
     std::string name = static_cast<MyGUI::Button*>(_sender)->getCaption();
 
     eventItemSelected(name);
+    eventWidgetSelected(_sender);
+}
+
+MyGUI::Widget* MWList::getItemWidget(const std::string& name)
+{
+    return mScrollView->findWidget (getName() + "_item_" + name);
 }
diff --git a/apps/openmw/mwgui/list.hpp b/apps/openmw/mwgui/list.hpp
index 2b765c2e11..d07d49de63 100644
--- a/apps/openmw/mwgui/list.hpp
+++ b/apps/openmw/mwgui/list.hpp
@@ -18,6 +18,7 @@ namespace MWGui
             MWList();
 
             typedef MyGUI::delegates::CMultiDelegate1<std::string> EventHandle_String;
+            typedef MyGUI::delegates::CMultiDelegate1<MyGUI::Widget*> EventHandle_Widget;
 
             /**
              * Event: Item selected with the mouse.
@@ -25,6 +26,13 @@ namespace MWGui
              */
             EventHandle_String eventItemSelected;
 
+            /**
+             * Event: Item selected with the mouse.
+             * signature: void method(MyGUI::Widget* sender)
+             */
+            EventHandle_Widget eventWidgetSelected;
+
+
             /**
              * Call after the size of the list changed, or items were inserted/removed
              */
@@ -38,6 +46,9 @@ namespace MWGui
             std::string getItemNameAt(unsigned int at); ///< \attention if there are separators, this method will return "" at the place where the separator is
             void clear();
 
+            MyGUI::Widget* getItemWidget(const std::string& name);
+            ///< get widget for an item name, useful to set up tooltip
+
         protected:
             void initialiseOverride();
 
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 170fc3bc5f..8bcaa6ce06 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -6,10 +6,13 @@
 #include <OgreCompositorChain.h>
 #include <OgreMaterial.h>
 
+#include <boost/algorithm/string.hpp>
 
+#include <openengine/ogre/fader.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/inputmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwbase/windowmanager.hpp"
 
@@ -106,6 +109,7 @@ namespace MWGui
 
         if (mTimer.getMilliseconds () > mLastRenderTime + (1.f/loadingScreenFps) * 1000.f)
         {
+            float dt = mTimer.getMilliseconds () - mLastRenderTime;
             mLastRenderTime = mTimer.getMilliseconds ();
 
             if (mFirstLoad && mTimer.getMilliseconds () > mLastWallpaperChangeTime + 3000*1)
@@ -151,6 +155,8 @@ namespace MWGui
                 }
             }
 
+            MWBase::Environment::get().getWorld ()->getFader ()->update (dt);
+
             mWindow->update();
 
             if (!hasCompositor)
@@ -207,20 +213,22 @@ namespace MWGui
 
     void LoadingScreen::changeWallpaper ()
     {
-        /// \todo use a directory listing here
         std::vector<std::string> splash;
-        splash.push_back ("Splash_Bonelord.tga");
-        splash.push_back ("Splash_ClannDaddy.tga");
-        splash.push_back ("Splash_Clannfear.tga");
-        splash.push_back ("Splash_Daedroth.tga");
-        splash.push_back ("Splash_Hunger.tga");
-        splash.push_back ("Splash_KwamaWarrior.tga");
-        splash.push_back ("Splash_Netch.tga");
-        splash.push_back ("Splash_NixHound.tga");
-        splash.push_back ("Splash_Siltstriker.tga");
-        splash.push_back ("Splash_Skeleton.tga");
-        splash.push_back ("Splash_SphereCenturion.tga");
 
-        mBackgroundImage->setImageTexture (splash[rand() % splash.size()]);
+        Ogre::StringVectorPtr resources = Ogre::ResourceGroupManager::getSingleton ().listResourceNames ("General", false);
+        for (Ogre::StringVector::const_iterator it = resources->begin(); it != resources->end(); ++it)
+        {
+            if (it->size() < 6)
+                continue;
+            std::string start = it->substr(0, 6);
+            boost::to_lower(start);
+
+            if (start == "splash")
+                splash.push_back (*it);
+        }
+        std::string randomSplash = splash[rand() % splash.size()];
+
+        Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton ().load (randomSplash, "General");
+        mBackgroundImage->setImageTexture (randomSplash);
     }
 }
diff --git a/apps/openmw/mwgui/mode.hpp b/apps/openmw/mwgui/mode.hpp
index 64aa1dc216..d791a1c99d 100644
--- a/apps/openmw/mwgui/mode.hpp
+++ b/apps/openmw/mwgui/mode.hpp
@@ -22,6 +22,10 @@ namespace MWGui
       GM_Rest,
       GM_RestBed,
       GM_SpellBuying,
+      GM_Travel,
+      GM_SpellCreation,
+      GM_Enchanting,
+      GM_Training,
 
       GM_Levelup,
 
diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index f8d5649b97..ece19cdc38 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -24,7 +24,6 @@ namespace MWGui
 
     SpellBuyingWindow::SpellBuyingWindow(MWBase::WindowManager& parWindowManager) :
         WindowBase("openmw_spell_buying_window.layout", parWindowManager)
-        , ContainerBase(NULL) // no drag&drop
         , mCurrentY(0)
         , mLastPos(0)
     {
@@ -55,7 +54,7 @@ namespace MWGui
 
         MyGUI::Button* toAdd =
             mSpellsView->createWidget<MyGUI::Button>(
-                (price>mWindowManager.getInventoryWindow()->getPlayerGold()) ? "SandTextGreyedOut" : "SpellText",
+                (price>mWindowManager.getInventoryWindow()->getPlayerGold()) ? "SandTextGreyedOut" : "SandTextButton",
                 0,
                 mCurrentY,
                 200,
@@ -88,7 +87,7 @@ namespace MWGui
     void SpellBuyingWindow::startSpellBuying(const MWWorld::Ptr& actor)
     {
         center();
-        mActor = actor;
+        mPtr = actor;
         clearSpells();
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
@@ -125,7 +124,7 @@ namespace MWGui
             MWMechanics::Spells& spells = stats.getSpells();
             spells.add (mSpellsWidgetMap.find(_sender)->second);
             mWindowManager.getTradeWindow()->addOrRemoveGold(-price);
-            startSpellBuying(mActor);
+            startSpellBuying(mPtr);
 
             MWBase::Environment::get().getSoundManager()->playSound ("Item Gold Up", 1.0, 1.0);
         }
diff --git a/apps/openmw/mwgui/spellbuyingwindow.hpp b/apps/openmw/mwgui/spellbuyingwindow.hpp
index 970498cd91..1d0ac28e01 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.hpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.hpp
@@ -1,10 +1,8 @@
 #ifndef MWGUI_SpellBuyingWINDOW_H
 #define MWGUI_SpellBuyingWINDOW_H
 
-#include "container.hpp"
 #include "window_base.hpp"
-
-#include "../mwworld/ptr.hpp"
+#include "referenceinterface.hpp"
 
 namespace MyGUI
 {
@@ -20,7 +18,7 @@ namespace MWGui
 
 namespace MWGui
 {
-    class SpellBuyingWindow : public ContainerBase, public WindowBase
+    class SpellBuyingWindow : public ReferenceInterface, public WindowBase
     {
         public:
             SpellBuyingWindow(MWBase::WindowManager& parWindowManager);
@@ -35,8 +33,6 @@ namespace MWGui
 
             MyGUI::ScrollView* mSpellsView;
 
-            MWWorld::Ptr mActor;
-
             std::map<MyGUI::Widget*, std::string> mSpellsWidgetMap;
 
             void onCancelButtonClicked(MyGUI::Widget* _sender);
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
new file mode 100644
index 0000000000..02ce763ea0
--- /dev/null
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -0,0 +1,513 @@
+#include "spellcreationdialog.hpp"
+
+#include <boost/lexical_cast.hpp>
+
+#include <components/esm_store/store.hpp>
+
+#include "../mwbase/windowmanager.hpp"
+
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+
+#include "../mwworld/player.hpp"
+#include "../mwworld/class.hpp"
+
+#include "../mwmechanics/spells.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+
+#include "tooltips.hpp"
+#include "widgets.hpp"
+#include "class.hpp"
+
+namespace
+{
+
+    bool sortMagicEffects (short id1, short id2)
+    {
+        return MWBase::Environment::get().getWorld ()->getStore ().gameSettings.find(ESM::MagicEffect::effectIdToString (id1))->getString()
+                < MWBase::Environment::get().getWorld ()->getStore ().gameSettings.find(ESM::MagicEffect::effectIdToString  (id2))->getString();
+    }
+}
+
+namespace MWGui
+{
+
+    EditEffectDialog::EditEffectDialog(MWBase::WindowManager &parWindowManager)
+        : WindowModal("openmw_edit_effect.layout", parWindowManager)
+        , mEditing(false)
+    {
+        getWidget(mCancelButton, "CancelButton");
+        getWidget(mOkButton, "OkButton");
+        getWidget(mDeleteButton, "DeleteButton");
+        getWidget(mRangeButton, "RangeButton");
+        getWidget(mMagnitudeMinValue, "MagnitudeMinValue");
+        getWidget(mMagnitudeMaxValue, "MagnitudeMaxValue");
+        getWidget(mDurationValue, "DurationValue");
+        getWidget(mAreaValue, "AreaValue");
+        getWidget(mMagnitudeMinSlider, "MagnitudeMinSlider");
+        getWidget(mMagnitudeMaxSlider, "MagnitudeMaxSlider");
+        getWidget(mDurationSlider, "DurationSlider");
+        getWidget(mAreaSlider, "AreaSlider");
+        getWidget(mEffectImage, "EffectImage");
+        getWidget(mEffectName, "EffectName");
+        getWidget(mAreaText, "AreaText");
+        getWidget(mDurationBox, "DurationBox");
+        getWidget(mAreaBox, "AreaBox");
+        getWidget(mMagnitudeBox, "MagnitudeBox");
+
+        mRangeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EditEffectDialog::onRangeButtonClicked);
+        mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EditEffectDialog::onOkButtonClicked);
+        mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EditEffectDialog::onCancelButtonClicked);
+        mDeleteButton->eventMouseButtonClick += MyGUI::newDelegate(this, &EditEffectDialog::onDeleteButtonClicked);
+
+        mMagnitudeMinSlider->eventScrollChangePosition += MyGUI::newDelegate(this, &EditEffectDialog::onMagnitudeMinChanged);
+        mMagnitudeMaxSlider->eventScrollChangePosition += MyGUI::newDelegate(this, &EditEffectDialog::onMagnitudeMaxChanged);
+        mDurationSlider->eventScrollChangePosition += MyGUI::newDelegate(this, &EditEffectDialog::onDurationChanged);
+        mAreaSlider->eventScrollChangePosition += MyGUI::newDelegate(this, &EditEffectDialog::onAreaChanged);
+    }
+
+    void EditEffectDialog::open()
+    {
+        WindowModal::open();
+        center();
+    }
+
+    void EditEffectDialog::newEffect (const ESM::MagicEffect *effect)
+    {
+        setMagicEffect(effect);
+        mEditing = false;
+
+        mDeleteButton->setVisible (false);
+
+        mEffect.mRange = ESM::RT_Self;
+
+        onRangeButtonClicked(mRangeButton);
+
+        mMagnitudeMinSlider->setScrollPosition (0);
+        mMagnitudeMaxSlider->setScrollPosition (0);
+        mAreaSlider->setScrollPosition (0);
+        mDurationSlider->setScrollPosition (0);
+
+        mDurationValue->setCaption("1");
+        mMagnitudeMinValue->setCaption("1");
+        mMagnitudeMaxValue->setCaption("- 1");
+        mAreaValue->setCaption("0");
+
+        mEffect.mMagnMin = 1;
+        mEffect.mMagnMax = 1;
+        mEffect.mDuration = 1;
+        mEffect.mArea = 0;
+    }
+
+    void EditEffectDialog::editEffect (ESM::ENAMstruct effect)
+    {
+        const ESM::MagicEffect* magicEffect =  MWBase::Environment::get().getWorld()->getStore().magicEffects.find(effect.mEffectID);
+
+        setMagicEffect(magicEffect);
+
+        mEffect = effect;
+        mEditing = true;
+
+        mDeleteButton->setVisible (true);
+
+        mMagnitudeMinSlider->setScrollPosition (effect.mMagnMin-1);
+        mMagnitudeMaxSlider->setScrollPosition (effect.mMagnMax-1);
+        mAreaSlider->setScrollPosition (effect.mArea);
+        mDurationSlider->setScrollPosition (effect.mDuration-1);
+
+        onMagnitudeMinChanged (mMagnitudeMinSlider, effect.mMagnMin-1);
+        onMagnitudeMaxChanged (mMagnitudeMinSlider, effect.mMagnMax-1);
+        onAreaChanged (mAreaSlider, effect.mArea);
+        onDurationChanged (mDurationSlider, effect.mDuration-1);
+    }
+
+    void EditEffectDialog::setMagicEffect (const ESM::MagicEffect *effect)
+    {
+        std::string icon = effect->mIcon;
+        icon[icon.size()-3] = 'd';
+        icon[icon.size()-2] = 'd';
+        icon[icon.size()-1] = 's';
+        icon = "icons\\" + icon;
+
+        mEffectImage->setImageTexture (icon);
+
+        mEffectName->setCaptionWithReplacing("#{"+ESM::MagicEffect::effectIdToString  (effect->mIndex)+"}");
+
+        mEffect.mEffectID = effect->mIndex;
+
+        mMagicEffect = effect;
+
+        updateBoxes();
+    }
+
+    void EditEffectDialog::updateBoxes()
+    {
+        static int startY = mMagnitudeBox->getPosition().top;
+        int curY = startY;
+
+        mMagnitudeBox->setVisible (false);
+        mDurationBox->setVisible (false);
+        mAreaBox->setVisible (false);
+
+        if (!(mMagicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
+        {
+            mMagnitudeBox->setPosition(mMagnitudeBox->getPosition().left, curY);
+            mMagnitudeBox->setVisible (true);
+            curY += mMagnitudeBox->getSize().height;
+        }
+        if (!(mMagicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
+        {
+            mDurationBox->setPosition(mDurationBox->getPosition().left, curY);
+            mDurationBox->setVisible (true);
+            curY += mDurationBox->getSize().height;
+        }
+        if (mEffect.mRange == ESM::RT_Target)
+        {
+            mAreaBox->setPosition(mAreaBox->getPosition().left, curY);
+            mAreaBox->setVisible (true);
+            curY += mAreaBox->getSize().height;
+        }
+    }
+
+    void EditEffectDialog::onRangeButtonClicked (MyGUI::Widget* sender)
+    {
+        mEffect.mRange = (mEffect.mRange+1)%3;
+
+        if (mEffect.mRange == ESM::RT_Self)
+            mRangeButton->setCaptionWithReplacing ("#{sRangeSelf}");
+        else if (mEffect.mRange == ESM::RT_Target)
+            mRangeButton->setCaptionWithReplacing ("#{sRangeTarget}");
+        else if (mEffect.mRange == ESM::RT_Touch)
+            mRangeButton->setCaptionWithReplacing ("#{sRangeTouch}");
+
+        mAreaSlider->setVisible (mEffect.mRange != ESM::RT_Self);
+        mAreaText->setVisible (mEffect.mRange != ESM::RT_Self);
+
+        // cycle through range types until we find something that's allowed
+        if (mEffect.mRange == ESM::RT_Target && !(mMagicEffect->mData.mFlags & ESM::MagicEffect::CastTarget))
+            onRangeButtonClicked(sender);
+        if (mEffect.mRange == ESM::RT_Self && !(mMagicEffect->mData.mFlags & ESM::MagicEffect::CastSelf))
+            onRangeButtonClicked(sender);
+        if (mEffect.mRange == ESM::RT_Touch && !(mMagicEffect->mData.mFlags & ESM::MagicEffect::CastTouch))
+            onRangeButtonClicked(sender);
+
+        updateBoxes();
+    }
+
+    void EditEffectDialog::onDeleteButtonClicked (MyGUI::Widget* sender)
+    {
+        setVisible(false);
+
+        eventEffectRemoved(mEffect);
+    }
+
+    void EditEffectDialog::onOkButtonClicked (MyGUI::Widget* sender)
+    {
+        setVisible(false);
+
+        if (mEditing)
+            eventEffectModified(mEffect);
+        else
+            eventEffectAdded(mEffect);
+    }
+
+    void EditEffectDialog::onCancelButtonClicked (MyGUI::Widget* sender)
+    {
+        setVisible(false);
+    }
+
+    void EditEffectDialog::setSkill (int skill)
+    {
+        mEffect.mSkill = skill;
+    }
+
+    void EditEffectDialog::setAttribute (int attribute)
+    {
+        mEffect.mAttribute = attribute;
+    }
+
+    void EditEffectDialog::onMagnitudeMinChanged (MyGUI::ScrollBar* sender, size_t pos)
+    {
+        mMagnitudeMinValue->setCaption(boost::lexical_cast<std::string>(pos+1));
+        mEffect.mMagnMin = pos+1;
+
+        // trigger the check again (see below)
+        onMagnitudeMaxChanged(mMagnitudeMaxSlider, mMagnitudeMaxSlider->getScrollPosition ());
+    }
+
+    void EditEffectDialog::onMagnitudeMaxChanged (MyGUI::ScrollBar* sender, size_t pos)
+    {
+        // make sure the max value is actually larger or equal than the min value
+        size_t magnMin = std::abs(mEffect.mMagnMin); // should never be < 0, this is just here to avoid the compiler warning
+        if (pos+1 < magnMin)
+        {
+            pos = mEffect.mMagnMin-1;
+            sender->setScrollPosition (pos);
+        }
+
+        mEffect.mMagnMax = pos+1;
+
+        mMagnitudeMaxValue->setCaption("- " + boost::lexical_cast<std::string>(pos+1));
+    }
+
+    void EditEffectDialog::onDurationChanged (MyGUI::ScrollBar* sender, size_t pos)
+    {
+        mDurationValue->setCaption(boost::lexical_cast<std::string>(pos+1));
+        mEffect.mDuration = pos+1;
+    }
+
+    void EditEffectDialog::onAreaChanged (MyGUI::ScrollBar* sender, size_t pos)
+    {
+        mAreaValue->setCaption(boost::lexical_cast<std::string>(pos));
+        mEffect.mArea = pos;
+    }
+
+    // ------------------------------------------------------------------------------------------------
+
+    SpellCreationDialog::SpellCreationDialog(MWBase::WindowManager &parWindowManager)
+        : WindowBase("openmw_spellcreation_dialog.layout", parWindowManager)
+        , EffectEditorBase(parWindowManager)
+    {
+        getWidget(mNameEdit, "NameEdit");
+        getWidget(mMagickaCost, "MagickaCost");
+        getWidget(mSuccessChance, "SuccessChance");
+        getWidget(mAvailableEffectsList, "AvailableEffects");
+        getWidget(mUsedEffectsView, "UsedEffects");
+        getWidget(mPriceLabel, "PriceLabel");
+        getWidget(mBuyButton, "BuyButton");
+        getWidget(mCancelButton, "CancelButton");
+
+        mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellCreationDialog::onCancelButtonClicked);
+        mBuyButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellCreationDialog::onBuyButtonClicked);
+
+        setWidgets(mAvailableEffectsList, mUsedEffectsView);
+    }
+
+    void SpellCreationDialog::startSpellMaking (MWWorld::Ptr actor)
+    {
+        mPtr = actor;
+
+        startEditing();
+    }
+
+    void SpellCreationDialog::onCancelButtonClicked (MyGUI::Widget* sender)
+    {
+        mWindowManager.removeGuiMode (MWGui::GM_SpellCreation);
+    }
+
+    void SpellCreationDialog::onBuyButtonClicked (MyGUI::Widget* sender)
+    {
+
+    }
+
+    void SpellCreationDialog::open()
+    {
+        center();
+    }
+
+    void SpellCreationDialog::onReferenceUnavailable ()
+    {
+        mWindowManager.removeGuiMode (GM_Dialogue);
+        mWindowManager.removeGuiMode (GM_SpellCreation);
+    }
+
+    // ------------------------------------------------------------------------------------------------
+
+
+    EffectEditorBase::EffectEditorBase(MWBase::WindowManager& parWindowManager)
+        : mAddEffectDialog(parWindowManager)
+        , mSelectAttributeDialog(NULL)
+        , mSelectSkillDialog(NULL)
+    {
+        mAddEffectDialog.eventEffectAdded += MyGUI::newDelegate(this, &EffectEditorBase::onEffectAdded);
+        mAddEffectDialog.eventEffectModified += MyGUI::newDelegate(this, &EffectEditorBase::onEffectModified);
+        mAddEffectDialog.eventEffectRemoved += MyGUI::newDelegate(this, &EffectEditorBase::onEffectRemoved);
+
+        mAddEffectDialog.setVisible (false);
+    }
+
+    void EffectEditorBase::startEditing ()
+    {
+        // get the list of magic effects that are known to the player
+
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+        MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+        MWMechanics::Spells& spells = stats.getSpells();
+
+        std::vector<short> knownEffects;
+
+        for (MWMechanics::Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
+        {
+            const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().spells.find(*it);
+
+            // only normal spells count
+            if (spell->mData.mType != ESM::Spell::ST_Spell)
+                continue;
+
+            const std::vector<ESM::ENAMstruct>& list = spell->mEffects.mList;
+            for (std::vector<ESM::ENAMstruct>::const_iterator it2 = list.begin(); it2 != list.end(); ++it2)
+            {
+                if (std::find(knownEffects.begin(), knownEffects.end(), it2->mEffectID) == knownEffects.end())
+                    knownEffects.push_back(it2->mEffectID);
+            }
+        }
+
+        std::sort(knownEffects.begin(), knownEffects.end(), sortMagicEffects);
+
+        mAvailableEffectsList->clear ();
+
+        for (std::vector<short>::const_iterator it = knownEffects.begin(); it != knownEffects.end(); ++it)
+        {
+            mAvailableEffectsList->addItem(MWBase::Environment::get().getWorld ()->getStore ().gameSettings.find(
+                                               ESM::MagicEffect::effectIdToString  (*it))->getString());
+        }
+        mAvailableEffectsList->adjustSize ();
+
+        for (std::vector<short>::const_iterator it = knownEffects.begin(); it != knownEffects.end(); ++it)
+        {
+            std::string name = MWBase::Environment::get().getWorld ()->getStore ().gameSettings.find(
+                                               ESM::MagicEffect::effectIdToString  (*it))->getString();
+            MyGUI::Widget* w = mAvailableEffectsList->getItemWidget(name);
+            w->setUserData(*it);
+
+            ToolTips::createMagicEffectToolTip (w, *it);
+        }
+    }
+
+    void EffectEditorBase::setWidgets (Widgets::MWList *availableEffectsList, MyGUI::ScrollView *usedEffectsView)
+    {
+        mAvailableEffectsList = availableEffectsList;
+        mUsedEffectsView = usedEffectsView;
+
+        mAvailableEffectsList->eventWidgetSelected += MyGUI::newDelegate(this, &EffectEditorBase::onAvailableEffectClicked);
+    }
+
+    void EffectEditorBase::onSelectAttribute ()
+    {
+        mAddEffectDialog.setVisible(true);
+        mAddEffectDialog.setAttribute (mSelectAttributeDialog->getAttributeId());
+        MWBase::Environment::get().getWindowManager ()->removeDialog (mSelectAttributeDialog);
+        mSelectAttributeDialog = 0;
+    }
+
+    void EffectEditorBase::onSelectSkill ()
+    {
+        mAddEffectDialog.setVisible(true);
+        mAddEffectDialog.setSkill (mSelectSkillDialog->getSkillId ());
+        MWBase::Environment::get().getWindowManager ()->removeDialog (mSelectSkillDialog);
+        mSelectSkillDialog = 0;
+    }
+
+    void EffectEditorBase::onAttributeOrSkillCancel ()
+    {
+        if (mSelectSkillDialog)
+            MWBase::Environment::get().getWindowManager ()->removeDialog (mSelectSkillDialog);
+        if (mSelectAttributeDialog)
+            MWBase::Environment::get().getWindowManager ()->removeDialog (mSelectAttributeDialog);
+
+        mSelectSkillDialog = 0;
+        mSelectAttributeDialog = 0;
+    }
+
+    void EffectEditorBase::onAvailableEffectClicked (MyGUI::Widget* sender)
+    {
+
+        short effectId = *sender->getUserData<short>();
+        const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().magicEffects.find(effectId);
+
+        mAddEffectDialog.newEffect (effect);
+
+        if (effect->mData.mFlags & ESM::MagicEffect::TargetSkill)
+        {
+            delete mSelectSkillDialog;
+            mSelectSkillDialog = new SelectSkillDialog(*MWBase::Environment::get().getWindowManager ());
+            mSelectSkillDialog->eventCancel += MyGUI::newDelegate(this, &SpellCreationDialog::onAttributeOrSkillCancel);
+            mSelectSkillDialog->eventItemSelected += MyGUI::newDelegate(this, &SpellCreationDialog::onSelectSkill);
+            mSelectSkillDialog->setVisible (true);
+        }
+        else if (effect->mData.mFlags & ESM::MagicEffect::TargetAttribute)
+        {
+            delete mSelectAttributeDialog;
+            mSelectAttributeDialog = new SelectAttributeDialog(*MWBase::Environment::get().getWindowManager ());
+            mSelectAttributeDialog->eventCancel += MyGUI::newDelegate(this, &SpellCreationDialog::onAttributeOrSkillCancel);
+            mSelectAttributeDialog->eventItemSelected += MyGUI::newDelegate(this, &SpellCreationDialog::onSelectAttribute);
+            mSelectAttributeDialog->setVisible (true);
+        }
+        else
+        {
+            mAddEffectDialog.setVisible(true);
+        }
+    }
+
+    void EffectEditorBase::onEffectModified (ESM::ENAMstruct effect)
+    {
+        mEffects[mSelectedEffect] = effect;
+
+        updateEffectsView();
+    }
+
+    void EffectEditorBase::onEffectRemoved (ESM::ENAMstruct effect)
+    {
+        mEffects.erase(mEffects.begin() + mSelectedEffect);
+        updateEffectsView();
+    }
+
+    void EffectEditorBase::updateEffectsView ()
+    {
+        MyGUI::EnumeratorWidgetPtr oldWidgets = mUsedEffectsView->getEnumerator ();
+        MyGUI::Gui::getInstance ().destroyWidgets (oldWidgets);
+
+        MyGUI::IntSize size(0,0);
+
+        int i = 0;
+        for (std::vector<ESM::ENAMstruct>::const_iterator it = mEffects.begin(); it != mEffects.end(); ++it)
+        {
+            Widgets::SpellEffectParams params;
+            params.mEffectID = it->mEffectID;
+            params.mSkill = it->mSkill;
+            params.mAttribute = it->mAttribute;
+            params.mDuration = it->mDuration;
+            params.mMagnMin = it->mMagnMin;
+            params.mMagnMax = it->mMagnMax;
+            params.mRange = it->mRange;
+            params.mArea = it->mArea;
+
+            MyGUI::Button* button = mUsedEffectsView->createWidget<MyGUI::Button>("", MyGUI::IntCoord(0, size.height, 0, 24), MyGUI::Align::Default);
+            button->setUserData(i);
+            button->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellCreationDialog::onEditEffect);
+            button->setNeedMouseFocus (true);
+
+            Widgets::MWSpellEffectPtr effect = button->createWidget<Widgets::MWSpellEffect>("MW_EffectImage", MyGUI::IntCoord(0,0,0,24), MyGUI::Align::Default);
+
+            effect->setNeedMouseFocus (false);
+            effect->setWindowManager (MWBase::Environment::get().getWindowManager ());
+            effect->setSpellEffect (params);
+
+            effect->setSize(effect->getRequestedWidth (), 24);
+            button->setSize(effect->getRequestedWidth (), 24);
+
+            size.width = std::max(size.width, effect->getRequestedWidth ());
+            size.height += 24;
+            ++i;
+        }
+
+        mUsedEffectsView->setCanvasSize(size);
+    }
+
+    void EffectEditorBase::onEffectAdded (ESM::ENAMstruct effect)
+    {
+        mEffects.push_back(effect);
+
+        updateEffectsView();
+    }
+
+    void EffectEditorBase::onEditEffect (MyGUI::Widget *sender)
+    {
+        int id = *sender->getUserData<int>();
+
+        mSelectedEffect = id;
+
+        mAddEffectDialog.editEffect (mEffects[id]);
+        mAddEffectDialog.setVisible (true);
+    }
+}
diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp
new file mode 100644
index 0000000000..255b04cf6e
--- /dev/null
+++ b/apps/openmw/mwgui/spellcreationdialog.hpp
@@ -0,0 +1,150 @@
+#ifndef MWGUI_SPELLCREATION_H
+#define MWGUI_SPELLCREATION_H
+
+#include "window_base.hpp"
+#include "referenceinterface.hpp"
+#include "list.hpp"
+#include "widgets.hpp"
+
+namespace MWGui
+{
+
+    class SelectSkillDialog;
+    class SelectAttributeDialog;
+
+    class EditEffectDialog : public WindowModal
+    {
+    public:
+        EditEffectDialog(MWBase::WindowManager& parWindowManager);
+
+        virtual void open();
+
+        void setSkill(int skill);
+        void setAttribute(int attribute);
+
+        void newEffect (const ESM::MagicEffect* effect);
+        void editEffect (ESM::ENAMstruct effect);
+
+        typedef MyGUI::delegates::CMultiDelegate1<ESM::ENAMstruct> EventHandle_Effect;
+
+        EventHandle_Effect eventEffectAdded;
+        EventHandle_Effect eventEffectModified;
+        EventHandle_Effect eventEffectRemoved;
+
+    protected:
+        MyGUI::Button* mCancelButton;
+        MyGUI::Button* mOkButton;
+        MyGUI::Button* mDeleteButton;
+
+        MyGUI::Button* mRangeButton;
+
+        MyGUI::Widget* mDurationBox;
+        MyGUI::Widget* mMagnitudeBox;
+        MyGUI::Widget* mAreaBox;
+
+        MyGUI::TextBox* mMagnitudeMinValue;
+        MyGUI::TextBox* mMagnitudeMaxValue;
+        MyGUI::TextBox* mDurationValue;
+        MyGUI::TextBox* mAreaValue;
+
+        MyGUI::ScrollBar* mMagnitudeMinSlider;
+        MyGUI::ScrollBar* mMagnitudeMaxSlider;
+        MyGUI::ScrollBar* mDurationSlider;
+        MyGUI::ScrollBar* mAreaSlider;
+
+        MyGUI::TextBox* mAreaText;
+
+        MyGUI::ImageBox* mEffectImage;
+        MyGUI::TextBox* mEffectName;
+
+        bool mEditing;
+
+    protected:
+        void onRangeButtonClicked (MyGUI::Widget* sender);
+        void onDeleteButtonClicked (MyGUI::Widget* sender);
+        void onOkButtonClicked (MyGUI::Widget* sender);
+        void onCancelButtonClicked (MyGUI::Widget* sender);
+
+        void onMagnitudeMinChanged (MyGUI::ScrollBar* sender, size_t pos);
+        void onMagnitudeMaxChanged (MyGUI::ScrollBar* sender, size_t pos);
+        void onDurationChanged (MyGUI::ScrollBar* sender, size_t pos);
+        void onAreaChanged (MyGUI::ScrollBar* sender, size_t pos);
+
+        void setMagicEffect(const ESM::MagicEffect* effect);
+
+        void updateBoxes();
+
+    protected:
+        ESM::ENAMstruct mEffect;
+
+        const ESM::MagicEffect* mMagicEffect;
+    };
+
+
+    class EffectEditorBase
+    {
+    public:
+        EffectEditorBase(MWBase::WindowManager& parWindowManager);
+
+
+    protected:
+        Widgets::MWList* mAvailableEffectsList;
+        MyGUI::ScrollView* mUsedEffectsView;
+
+        EditEffectDialog mAddEffectDialog;
+        SelectAttributeDialog* mSelectAttributeDialog;
+        SelectSkillDialog* mSelectSkillDialog;
+
+        int mSelectedEffect;
+
+        std::vector<ESM::ENAMstruct> mEffects;
+
+        void onEffectAdded(ESM::ENAMstruct effect);
+        void onEffectModified(ESM::ENAMstruct effect);
+        void onEffectRemoved(ESM::ENAMstruct effect);
+
+        void onAvailableEffectClicked (MyGUI::Widget* sender);
+
+        void onAttributeOrSkillCancel();
+        void onSelectAttribute();
+        void onSelectSkill();
+
+        void onEditEffect(MyGUI::Widget* sender);
+
+        void updateEffectsView();
+
+        void startEditing();
+        void setWidgets (Widgets::MWList* availableEffectsList, MyGUI::ScrollView* usedEffectsView);
+
+    };
+
+    class SpellCreationDialog : public WindowBase, public ReferenceInterface, public EffectEditorBase
+    {
+    public:
+        SpellCreationDialog(MWBase::WindowManager& parWindowManager);
+
+        virtual void open();
+
+        void startSpellMaking(MWWorld::Ptr actor);
+
+    protected:
+        virtual void onReferenceUnavailable ();
+
+        void onCancelButtonClicked (MyGUI::Widget* sender);
+        void onBuyButtonClicked (MyGUI::Widget* sender);
+
+
+        MyGUI::EditBox* mNameEdit;
+        MyGUI::TextBox* mMagickaCost;
+        MyGUI::TextBox* mSuccessChance;
+        MyGUI::Button* mBuyButton;
+        MyGUI::Button* mCancelButton;
+        MyGUI::TextBox* mPriceLabel;
+
+        Widgets::MWEffectList* mUsedEffectsList;
+
+    };
+
+}
+
+#endif
diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp
index cc48438415..35224613ce 100644
--- a/apps/openmw/mwgui/tooltips.cpp
+++ b/apps/openmw/mwgui/tooltips.cpp
@@ -79,14 +79,10 @@ void ToolTips::onFrame(float frameDuration)
             || (mWindowManager->getMode() == GM_Inventory)))
         {
             std::string handle = MWBase::Environment::get().getWorld()->getFacedHandle();
-            try
-            {
-                mFocusObject = MWBase::Environment::get().getWorld()->getPtrViaHandle(handle);
-            }
-            catch (std::exception /* & e */)
-            {
+
+            mFocusObject = MWBase::Environment::get().getWorld()->searchPtrViaHandle(handle);
+            if (mFocusObject.isEmpty ())
                 return;
-            }
 
             MyGUI::IntSize tooltipSize = getToolTipViaPtr(true);
 
@@ -588,8 +584,6 @@ void ToolTips::createSkillToolTip(MyGUI::Widget* widget, int skillId)
     widget->setUserString("Caption_SkillNoProgressDescription", skill->mDescription);
     widget->setUserString("Caption_SkillNoProgressAttribute", "#{sGoverningAttribute}: #{" + attr->mName + "}");
     widget->setUserString("ImageTexture_SkillNoProgressImage", icon);
-    widget->setUserString("ToolTipLayout", "SkillNoProgressToolTip");
-    widget->setUserString("ToolTipLayout", "SkillNoProgressToolTip");
 }
 
 void ToolTips::createAttributeToolTip(MyGUI::Widget* widget, int attributeId)
@@ -715,6 +709,38 @@ void ToolTips::createClassToolTip(MyGUI::Widget* widget, const ESM::Class& playe
     widget->setUserString("ToolTipLayout", "ClassToolTip");
 }
 
+void ToolTips::createMagicEffectToolTip(MyGUI::Widget* widget, short id)
+{
+    const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld ()->getStore ().magicEffects.find(id);
+    const std::string &name = ESM::MagicEffect::effectIdToString (id);
+
+    std::string icon = effect->mIcon;
+
+    int slashPos = icon.find("\\");
+    icon.insert(slashPos+1, "b_");
+
+    icon[icon.size()-3] = 'd';
+    icon[icon.size()-2] = 'd';
+    icon[icon.size()-1] = 's';
+
+    icon = "icons\\" + icon;
+
+    std::vector<std::string> schools;
+    schools.push_back ("#{sSchoolAlteration}");
+    schools.push_back ("#{sSchoolConjuration}");
+    schools.push_back ("#{sSchoolDestruction}");
+    schools.push_back ("#{sSchoolIllusion}");
+    schools.push_back ("#{sSchoolMysticism}");
+    schools.push_back ("#{sSchoolRestoration}");
+
+    widget->setUserString("ToolTipType", "Layout");
+    widget->setUserString("ToolTipLayout", "MagicEffectToolTip");
+    widget->setUserString("Caption_MagicEffectName", "#{" + name + "}");
+    widget->setUserString("Caption_MagicEffectDescription", effect->mDescription);
+    widget->setUserString("Caption_MagicEffectSchool", "#{sSchool}: " + schools[effect->mData.mSchool]);
+    widget->setUserString("ImageTexture_MagicEffectImage", icon);
+}
+
 void ToolTips::setDelay(float delay)
 {
     mDelay = delay;
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index f67b6ea5c1..270df4ae2f 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -71,6 +71,7 @@ namespace MWGui
         static void createBirthsignToolTip(MyGUI::Widget* widget, const std::string& birthsignId);
         static void createRaceToolTip(MyGUI::Widget* widget, const ESM::Race* playerRace);
         static void createClassToolTip(MyGUI::Widget* widget, const ESM::Class& playerClass);
+        static void createMagicEffectToolTip(MyGUI::Widget* widget, short id);
 
     private:
         MyGUI::Widget* mDynamicToolTipBox;
diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp
new file mode 100644
index 0000000000..af61b3487b
--- /dev/null
+++ b/apps/openmw/mwgui/trainingwindow.cpp
@@ -0,0 +1,159 @@
+#include "trainingwindow.hpp"
+
+#include <boost/lexical_cast.hpp>
+
+#include <openengine/ogre/fader.hpp>
+
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwworld/player.hpp"
+
+#include "../mwmechanics/npcstats.hpp"
+
+#include "inventorywindow.hpp"
+#include "tradewindow.hpp"
+#include "tooltips.hpp"
+
+namespace MWGui
+{
+
+    TrainingWindow::TrainingWindow(MWBase::WindowManager &parWindowManager)
+        : WindowBase("openmw_trainingwindow.layout", parWindowManager)
+        , mFadeTimeRemaining(0)
+    {
+        getWidget(mTrainingOptions, "TrainingOptions");
+        getWidget(mCancelButton, "CancelButton");
+        getWidget(mPlayerGold, "PlayerGold");
+
+        mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &TrainingWindow::onCancelButtonClicked);
+    }
+
+    void TrainingWindow::open()
+    {
+        center();
+    }
+
+    void TrainingWindow::startTraining (MWWorld::Ptr actor)
+    {
+        mPtr = actor;
+
+        mPlayerGold->setCaptionWithReplacing("#{sGold}: " + boost::lexical_cast<std::string>(mWindowManager.getInventoryWindow()->getPlayerGold()));
+
+        MWMechanics::NpcStats& npcStats = MWWorld::Class::get(actor).getNpcStats (actor);
+
+        // NPC can train you in his best 3 skills
+        std::vector< std::pair<int, int> > bestSkills;
+        bestSkills.push_back (std::make_pair(-1, -1));
+        bestSkills.push_back (std::make_pair(-1, -1));
+        bestSkills.push_back (std::make_pair(-1, -1));
+
+        for (int i=0; i<ESM::Skill::Length; ++i)
+        {
+            int value = npcStats.getSkill (i).getBase ();
+
+            for (int j=0; j<3; ++j)
+            {
+                if (value > bestSkills[j].second)
+                {
+                    if (j<2)
+                    {
+                        bestSkills[j+1] = bestSkills[j];
+                    }
+                    bestSkills[j] = std::make_pair(i, value);
+                    break;
+                }
+            }
+        }
+
+        MyGUI::EnumeratorWidgetPtr widgets = mTrainingOptions->getEnumerator ();
+        MyGUI::Gui::getInstance ().destroyWidgets (widgets);
+
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer ();
+        MWMechanics::NpcStats& pcStats = MWWorld::Class::get(player).getNpcStats (player);
+
+        for (int i=0; i<3; ++i)
+        {
+            /// \todo mercantile skill
+            int price = pcStats.getSkill (bestSkills[i].first).getBase() * MWBase::Environment::get().getWorld ()->getStore ().gameSettings.find("iTrainingMod")->getInt ();
+
+            std::string skin = (price > mWindowManager.getInventoryWindow ()->getPlayerGold ()) ? "SandTextGreyedOut" : "SandTextButton";
+
+            MyGUI::Button* button = mTrainingOptions->createWidget<MyGUI::Button>(skin,
+                MyGUI::IntCoord(5, 5+i*18, mTrainingOptions->getWidth()-10, 18), MyGUI::Align::Default);
+
+            button->setUserData(bestSkills[i].first);
+            button->eventMouseButtonClick += MyGUI::newDelegate(this, &TrainingWindow::onTrainingSelected);
+
+            button->setCaptionWithReplacing("#{" + ESM::Skill::sSkillNameIds[bestSkills[i].first] + "} - " + boost::lexical_cast<std::string>(price));
+
+            button->setSize(button->getTextSize ().width+12, button->getSize().height);
+
+            ToolTips::createSkillToolTip (button, bestSkills[i].first);
+        }
+
+        center();
+    }
+
+    void TrainingWindow::onReferenceUnavailable ()
+    {
+        mWindowManager.removeGuiMode(GM_Training);
+    }
+
+    void TrainingWindow::onCancelButtonClicked (MyGUI::Widget *sender)
+    {
+        mWindowManager.removeGuiMode (GM_Training);
+    }
+
+    void TrainingWindow::onTrainingSelected (MyGUI::Widget *sender)
+    {
+        int skillId = *sender->getUserData<int>();
+
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld ()->getPlayer ().getPlayer ();
+        MWMechanics::NpcStats& pcStats = MWWorld::Class::get(player).getNpcStats (player);
+
+        /// \todo mercantile skill
+        int price = pcStats.getSkill (skillId).getBase() * MWBase::Environment::get().getWorld ()->getStore ().gameSettings.find("iTrainingMod")->getInt ();
+
+        if (mWindowManager.getInventoryWindow()->getPlayerGold()<price)
+            return;
+
+        MWMechanics::NpcStats& npcStats = MWWorld::Class::get(mPtr).getNpcStats (mPtr);
+        if (npcStats.getSkill (skillId).getBase () <= pcStats.getSkill (skillId).getBase ())
+        {
+            mWindowManager.messageBox ("#{sServiceTrainingWords}", std::vector<std::string>());
+            return;
+        }
+
+        // increase skill
+        MWWorld::LiveCellRef<ESM::NPC> *playerRef = player.get<ESM::NPC>();
+        const ESM::Class *class_ = MWBase::Environment::get().getWorld()->getStore().classes.find (
+            playerRef->base->mClass);
+        pcStats.increaseSkill (skillId, *class_, true);
+
+        // remove gold
+        mWindowManager.getTradeWindow()->addOrRemoveGold(-price);
+
+        // go back to game mode
+        mWindowManager.removeGuiMode (GM_Training);
+        mWindowManager.removeGuiMode (GM_Dialogue);
+
+        // advance time
+        MWBase::Environment::get().getWorld ()->advanceTime (2);
+
+        MWBase::Environment::get().getWorld ()->getFader()->fadeOut(0.25);
+        mFadeTimeRemaining = 0.5;
+    }
+
+    void TrainingWindow::onFrame(float dt)
+    {
+        if (mFadeTimeRemaining <= 0)
+            return;
+
+        mFadeTimeRemaining -= dt;
+
+        if (mFadeTimeRemaining <= 0)
+            MWBase::Environment::get().getWorld ()->getFader()->fadeIn(0.25);
+    }
+}
diff --git a/apps/openmw/mwgui/trainingwindow.hpp b/apps/openmw/mwgui/trainingwindow.hpp
new file mode 100644
index 0000000000..f2ef1714ee
--- /dev/null
+++ b/apps/openmw/mwgui/trainingwindow.hpp
@@ -0,0 +1,36 @@
+#ifndef MWGUI_TRAININGWINDOW_H
+#define MWGUI_TRAININGWINDOW_H
+
+#include "window_base.hpp"
+#include "referenceinterface.hpp"
+
+namespace MWGui
+{
+
+    class TrainingWindow : public WindowBase, public ReferenceInterface
+    {
+    public:
+        TrainingWindow(MWBase::WindowManager& parWindowManager);
+
+        virtual void open();
+
+        void startTraining(MWWorld::Ptr actor);
+
+        void onFrame(float dt);
+
+    protected:
+        virtual void onReferenceUnavailable ();
+
+        void onCancelButtonClicked (MyGUI::Widget* sender);
+        void onTrainingSelected(MyGUI::Widget* sender);
+
+        MyGUI::Widget* mTrainingOptions;
+        MyGUI::Button* mCancelButton;
+        MyGUI::TextBox* mPlayerGold;
+
+        float mFadeTimeRemaining;
+    };
+
+}
+
+#endif
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
new file mode 100644
index 0000000000..c19639aa6a
--- /dev/null
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -0,0 +1,187 @@
+#include "travelwindow.hpp"
+
+#include <algorithm>
+
+#include <boost/lexical_cast.hpp>
+
+#include <libs/openengine/ogre/fader.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+
+#include "../mwworld/player.hpp"
+#include "../mwworld/manualref.hpp"
+
+#include "../mwmechanics/spells.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+
+#include "inventorywindow.hpp"
+#include "tradewindow.hpp"
+
+namespace MWGui
+{
+    const int TravelWindow::sLineHeight = 18;
+
+    TravelWindow::TravelWindow(MWBase::WindowManager& parWindowManager) :
+        WindowBase("openmw_travel_window.layout", parWindowManager)
+        , mCurrentY(0)
+        , mLastPos(0)
+    {
+        setCoord(0, 0, 450, 300);
+
+        getWidget(mCancelButton, "CancelButton");
+        getWidget(mPlayerGold, "PlayerGold");
+        getWidget(mSelect, "Select");
+        getWidget(mDestinations, "Travel");
+        getWidget(mDestinationsView, "DestinationsView");
+
+        mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &TravelWindow::onCancelButtonClicked);
+
+        mDestinations->setCoord(450/2-mDestinations->getTextSize().width/2,
+                          mDestinations->getTop(),
+                          mDestinations->getTextSize().width,
+                          mDestinations->getHeight());
+        mSelect->setCoord(8,
+                          mSelect->getTop(),
+                          mSelect->getTextSize().width,
+                          mSelect->getHeight());
+    }
+
+    void TravelWindow::addDestination(const std::string& travelId,ESM::Position pos,bool interior)
+    {
+        int price = 0;
+
+        if(interior)
+        {
+            price = MWBase::Environment::get().getWorld()->getStore().gameSettings.find("fMagesGuildTravel")->getFloat();
+        }
+        else
+        {
+            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+            ESM::Position PlayerPos = player.getRefData().getPosition();
+            float d = sqrt( pow(pos.pos[0] - PlayerPos.pos[0],2) + pow(pos.pos[1] - PlayerPos.pos[1],2) + pow(pos.pos[2] - PlayerPos.pos[2],2)   );
+            price = d/MWBase::Environment::get().getWorld()->getStore().gameSettings.find("fTravelMult")->getFloat();
+        }
+
+        MyGUI::Button* toAdd = mDestinationsView->createWidget<MyGUI::Button>((price>mWindowManager.getInventoryWindow()->getPlayerGold()) ? "SandTextGreyedOut" : "SandTextButton", 0, mCurrentY, 200, sLineHeight, MyGUI::Align::Default);
+        mCurrentY += sLineHeight;
+        /// \todo price adjustment depending on merchantile skill
+        if(interior)
+            toAdd->setUserString("interior","y");
+        else
+            toAdd->setUserString("interior","n");
+
+        std::ostringstream oss;
+        oss << price;
+        toAdd->setUserString("price",oss.str());
+
+        toAdd->setCaptionWithReplacing(travelId+"   -   "+boost::lexical_cast<std::string>(price)+"#{sgp}");
+        toAdd->setSize(toAdd->getTextSize().width,sLineHeight);
+        toAdd->eventMouseWheel += MyGUI::newDelegate(this, &TravelWindow::onMouseWheel);
+        toAdd->setUserString("Destination", travelId);
+        toAdd->setUserData(pos);
+        toAdd->eventMouseButtonClick += MyGUI::newDelegate(this, &TravelWindow::onTravelButtonClick);
+        mDestinationsWidgetMap.insert(std::make_pair (toAdd, travelId));
+    }
+
+    void TravelWindow::clearDestinations()
+    {
+        mDestinationsView->setViewOffset(MyGUI::IntPoint(0,0));
+        mCurrentY = 0;
+        while (mDestinationsView->getChildCount())
+            MyGUI::Gui::getInstance().destroyWidget(mDestinationsView->getChildAt(0));
+        mDestinationsWidgetMap.clear();
+    }
+
+    void TravelWindow::startTravel(const MWWorld::Ptr& actor)
+    {
+        center();
+        mPtr = actor;
+        clearDestinations();
+
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+
+        for(unsigned int i = 0;i<mPtr.get<ESM::NPC>()->base->mTransport.size();i++)
+        {
+            std::string cellname = mPtr.get<ESM::NPC>()->base->mTransport[i].mCellName;
+            bool interior = true;
+            int x,y;
+            MWBase::Environment::get().getWorld()->positionToIndex(mPtr.get<ESM::NPC>()->base->mTransport[i].mPos.pos[0],
+                                                                   mPtr.get<ESM::NPC>()->base->mTransport[i].mPos.pos[1],x,y);
+            if(cellname == "") {cellname = MWBase::Environment::get().getWorld()->getExterior(x,y)->cell->mName; interior=  false;}
+            addDestination(cellname,mPtr.get<ESM::NPC>()->base->mTransport[i].mPos,interior);
+        }
+
+        updateLabels();
+        mDestinationsView->setCanvasSize (MyGUI::IntSize(mDestinationsView->getWidth(), std::max(mDestinationsView->getHeight(), mCurrentY)));
+    }
+
+    void TravelWindow::onTravelButtonClick(MyGUI::Widget* _sender)
+    {
+        std::istringstream iss(_sender->getUserString("price"));
+        int price;
+        iss >> price;
+
+        if (mWindowManager.getInventoryWindow()->getPlayerGold()<price)
+            return;
+
+        MWBase::Environment::get().getWorld ()->getFader ()->fadeOut(1);
+        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+        ESM::Position pos = *_sender->getUserData<ESM::Position>();
+        std::string cellname = _sender->getUserString("Destination");
+        int x,y;
+        bool interior = _sender->getUserString("interior") == "y";
+        MWBase::Environment::get().getWorld()->positionToIndex(pos.pos[0],pos.pos[1],x,y);
+        MWWorld::CellStore* cell;
+        if(interior) cell = MWBase::Environment::get().getWorld()->getInterior(cellname);
+        else
+        {
+            cell = MWBase::Environment::get().getWorld()->getExterior(x,y);
+            ESM::Position PlayerPos = player.getRefData().getPosition();
+            float d = sqrt( pow(pos.pos[0] - PlayerPos.pos[0],2) + pow(pos.pos[1] - PlayerPos.pos[1],2) + pow(pos.pos[2] - PlayerPos.pos[2],2)   );
+            int time = int(d /MWBase::Environment::get().getWorld()->getStore().gameSettings.find("fTravelTimeMult")->getFloat());
+            for(int i = 0;i < time;i++)
+            {
+                MWBase::Environment::get().getMechanicsManager ()->restoreDynamicStats ();
+            }
+            MWBase::Environment::get().getWorld()->advanceTime(time);
+        }
+        MWBase::Environment::get().getWorld()->moveObject(player,*cell,pos.pos[0],pos.pos[1],pos.pos[2]);
+        mWindowManager.removeGuiMode(GM_Travel);
+        mWindowManager.removeGuiMode(GM_Dialogue);
+        MWBase::Environment::get().getWorld ()->getFader ()->fadeOut(0);
+        MWBase::Environment::get().getWorld ()->getFader ()->fadeIn(1);
+    }
+
+    void TravelWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
+    {
+        mWindowManager.removeGuiMode(GM_Travel);
+    }
+
+    void TravelWindow::updateLabels()
+    {
+        mPlayerGold->setCaptionWithReplacing("#{sGold}: " + boost::lexical_cast<std::string>(mWindowManager.getInventoryWindow()->getPlayerGold()));
+        mPlayerGold->setCoord(8,
+                              mPlayerGold->getTop(),
+                              mPlayerGold->getTextSize().width,
+                              mPlayerGold->getHeight());
+    }
+
+    void TravelWindow::onReferenceUnavailable()
+    {
+        mWindowManager.removeGuiMode(GM_Travel);
+        mWindowManager.removeGuiMode(GM_Dialogue);
+    }
+
+    void TravelWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
+    {
+        if (mDestinationsView->getViewOffset().top + _rel*0.3 > 0)
+            mDestinationsView->setViewOffset(MyGUI::IntPoint(0, 0));
+        else
+            mDestinationsView->setViewOffset(MyGUI::IntPoint(0, mDestinationsView->getViewOffset().top + _rel*0.3));
+    }
+}
+
diff --git a/apps/openmw/mwgui/travelwindow.hpp b/apps/openmw/mwgui/travelwindow.hpp
new file mode 100644
index 0000000000..cc3d6a31f7
--- /dev/null
+++ b/apps/openmw/mwgui/travelwindow.hpp
@@ -0,0 +1,55 @@
+#ifndef MWGUI_TravelWINDOW_H
+#define MWGUI_TravelWINDOW_H
+
+#include "container.hpp"
+#include "window_base.hpp"
+
+#include "../mwworld/ptr.hpp"
+
+namespace MyGUI
+{
+  class Gui;
+  class Widget;
+}
+
+namespace MWGui
+{
+    class WindowManager;
+}
+
+
+namespace MWGui
+{
+    class TravelWindow : public ReferenceInterface, public WindowBase
+    {
+        public:
+            TravelWindow(MWBase::WindowManager& parWindowManager);
+
+            void startTravel(const MWWorld::Ptr& actor);
+
+        protected:
+            MyGUI::Button* mCancelButton;
+            MyGUI::TextBox* mPlayerGold;
+            MyGUI::TextBox* mDestinations;
+            MyGUI::TextBox* mSelect;
+
+            MyGUI::ScrollView* mDestinationsView;
+
+            std::map<MyGUI::Widget*, std::string> mDestinationsWidgetMap;
+
+            void onCancelButtonClicked(MyGUI::Widget* _sender);
+            void onTravelButtonClick(MyGUI::Widget* _sender);
+            void onMouseWheel(MyGUI::Widget* _sender, int _rel);
+            void addDestination(const std::string& destinationID,ESM::Position pos,bool interior);
+            void clearDestinations();
+            int mLastPos,mCurrentY;
+
+            static const int sLineHeight;
+
+            void updateLabels();
+
+            virtual void onReferenceUnavailable();
+    };
+}
+
+#endif
diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp
index 33aa1886c0..ed09b98058 100644
--- a/apps/openmw/mwgui/widgets.cpp
+++ b/apps/openmw/mwgui/widgets.cpp
@@ -362,6 +362,7 @@ SpellEffectList MWEffectList::effectListFromESM(const ESM::EffectList* effects)
         params.mMagnMin = it->mMagnMin;
         params.mMagnMax = it->mMagnMax;
         params.mRange = it->mRange;
+        params.mArea = it->mArea;
         result.push_back(params);
     }
     return result;
@@ -385,343 +386,82 @@ void MWSpellEffect::setSpellEffect(const SpellEffectParams& params)
 
 void MWSpellEffect::updateWidgets()
 {
-    if (!mWindowManager)
-        return;
-
     const ESMS::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
     const ESM::MagicEffect *magicEffect = store.magicEffects.search(mEffectParams.mEffectID);
-    if (!magicEffect)
-        return;
-    if (mTextWidget)
+
+    assert(magicEffect);
+    assert(mWindowManager);
+
+    std::string pt =  mWindowManager->getGameSettingString("spoint", "");
+    std::string pts =  mWindowManager->getGameSettingString("spoints", "");
+    std::string to =  " " + mWindowManager->getGameSettingString("sTo", "") + " ";
+    std::string sec =  " " + mWindowManager->getGameSettingString("ssecond", "");
+    std::string secs =  " " + mWindowManager->getGameSettingString("sseconds", "");
+
+    std::string effectIDStr = ESM::MagicEffect::effectIdToString(mEffectParams.mEffectID);
+    std::string spellLine = mWindowManager->getGameSettingString(effectIDStr, "");
+
+    if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetSkill)
     {
-        std::string pt =  mWindowManager->getGameSettingString("spoint", "");
-        std::string pts =  mWindowManager->getGameSettingString("spoints", "");
-        std::string to =  " " + mWindowManager->getGameSettingString("sTo", "") + " ";
-        std::string sec =  " " + mWindowManager->getGameSettingString("ssecond", "");
-        std::string secs =  " " + mWindowManager->getGameSettingString("sseconds", "");
-
-        std::string effectIDStr = effectIDToString(mEffectParams.mEffectID);
-        std::string spellLine = mWindowManager->getGameSettingString(effectIDStr, "");
-        if (effectInvolvesSkill(effectIDStr) && mEffectParams.mSkill >= 0 && mEffectParams.mSkill < ESM::Skill::Length)
-        {
-            spellLine += " " + mWindowManager->getGameSettingString(ESM::Skill::sSkillNameIds[mEffectParams.mSkill], "");
-        }
-        if (effectInvolvesAttribute(effectIDStr) && mEffectParams.mAttribute >= 0 && mEffectParams.mAttribute < 8)
-        {
-            static const char *attributes[8] = {
-                "sAttributeStrength",
-                "sAttributeIntelligence",
-                "sAttributeWillpower",
-                "sAttributeAgility",
-                "sAttributeSpeed",
-                "sAttributeEndurance",
-                "sAttributePersonality",
-                "sAttributeLuck"
-            };
-            spellLine += " " + mWindowManager->getGameSettingString(attributes[mEffectParams.mAttribute], "");
-        }
-
-        if ((mEffectParams.mMagnMin >= 0 || mEffectParams.mMagnMax >= 0) && effectHasMagnitude(effectIDStr))
-        {
-            if (mEffectParams.mMagnMin == mEffectParams.mMagnMax)
-                spellLine += " " + boost::lexical_cast<std::string>(mEffectParams.mMagnMin) + " " + ((mEffectParams.mMagnMin == 1) ? pt : pts);
-            else
-            {
-                spellLine += " " + boost::lexical_cast<std::string>(mEffectParams.mMagnMin) + to + boost::lexical_cast<std::string>(mEffectParams.mMagnMax) + " " + pts;
-            }
-        }
-
-        // constant effects have no duration and no target
-        if (!mEffectParams.mIsConstant)
-        {
-            if (mEffectParams.mDuration >= 0 && effectHasDuration(effectIDStr))
-            {
-                spellLine += " " + mWindowManager->getGameSettingString("sfor", "") + " " + boost::lexical_cast<std::string>(mEffectParams.mDuration) + ((mEffectParams.mDuration == 1) ? sec : secs);
-            }
-
-            // potions have no target
-            if (!mEffectParams.mNoTarget)
-            {
-                std::string on = mWindowManager->getGameSettingString("sonword", "");
-                if (mEffectParams.mRange == ESM::RT_Self)
-                    spellLine += " " + on + " " + mWindowManager->getGameSettingString("sRangeSelf", "");
-                else if (mEffectParams.mRange == ESM::RT_Touch)
-                    spellLine += " " + on + " " + mWindowManager->getGameSettingString("sRangeTouch", "");
-                else if (mEffectParams.mRange == ESM::RT_Target)
-                    spellLine += " " + on + " " + mWindowManager->getGameSettingString("sRangeTarget", "");
-            }
-        }
-
-        static_cast<MyGUI::TextBox*>(mTextWidget)->setCaption(spellLine);
-        mRequestedWidth = mTextWidget->getTextSize().width + 24;
+        spellLine += " " + mWindowManager->getGameSettingString(ESM::Skill::sSkillNameIds[mEffectParams.mSkill], "");
     }
-    if (mImageWidget)
+    if (magicEffect->mData.mFlags & ESM::MagicEffect::TargetAttribute)
     {
-        std::string path = std::string("icons\\") + magicEffect->mIcon;
-        fixTexturePath(path);
-        mImageWidget->setImageTexture(path);
+        static const char *attributes[8] = {
+            "sAttributeStrength",
+            "sAttributeIntelligence",
+            "sAttributeWillpower",
+            "sAttributeAgility",
+            "sAttributeSpeed",
+            "sAttributeEndurance",
+            "sAttributePersonality",
+            "sAttributeLuck"
+        };
+        spellLine += " " + mWindowManager->getGameSettingString(attributes[mEffectParams.mAttribute], "");
     }
-}
 
-std::string MWSpellEffect::effectIDToString(const short effectID)
-{
-    // Map effect ID to GMST name
-    // http://www.uesp.net/morrow/hints/mweffects.shtml
-    std::map<short, std::string> names;
-    names[85] ="sEffectAbsorbAttribute";
-    names[88] ="sEffectAbsorbFatigue";
-    names[86] ="sEffectAbsorbHealth";
-    names[87] ="sEffectAbsorbSpellPoints";
-    names[89] ="sEffectAbsorbSkill";
-    names[63] ="sEffectAlmsiviIntervention";
-    names[47] ="sEffectBlind";
-    names[123] ="sEffectBoundBattleAxe";
-    names[129] ="sEffectBoundBoots";
-    names[127] ="sEffectBoundCuirass";
-    names[120] ="sEffectBoundDagger";
-    names[131] ="sEffectBoundGloves";
-    names[128] ="sEffectBoundHelm";
-    names[125] ="sEffectBoundLongbow";
-    names[121] ="sEffectBoundLongsword";
-    names[122] ="sEffectBoundMace";
-    names[130] ="sEffectBoundShield";
-    names[124] ="sEffectBoundSpear";
-    names[7] ="sEffectBurden";
-    names[50] ="sEffectCalmCreature";
-    names[49] ="sEffectCalmHumanoid";
-    names[40] ="sEffectChameleon";
-    names[44] ="sEffectCharm";
-    names[118] ="sEffectCommandCreatures";
-    names[119] ="sEffectCommandHumanoids";
-    names[132] ="sEffectCorpus"; // NB this typo. (bethesda made it)
-    names[70] ="sEffectCureBlightDisease";
-    names[69] ="sEffectCureCommonDisease";
-    names[71] ="sEffectCureCorprusDisease";
-    names[73] ="sEffectCureParalyzation";
-    names[72] ="sEffectCurePoison";
-    names[22] ="sEffectDamageAttribute";
-    names[25] ="sEffectDamageFatigue";
-    names[23] ="sEffectDamageHealth";
-    names[24] ="sEffectDamageMagicka";
-    names[26] ="sEffectDamageSkill";
-    names[54] ="sEffectDemoralizeCreature";
-    names[53] ="sEffectDemoralizeHumanoid";
-    names[64] ="sEffectDetectAnimal";
-    names[65] ="sEffectDetectEnchantment";
-    names[66] ="sEffectDetectKey";
-    names[38] ="sEffectDisintegrateArmor";
-    names[37] ="sEffectDisintegrateWeapon";
-    names[57] ="sEffectDispel";
-    names[62] ="sEffectDivineIntervention";
-    names[17] ="sEffectDrainAttribute";
-    names[20] ="sEffectDrainFatigue";
-    names[18] ="sEffectDrainHealth";
-    names[19] ="sEffectDrainSpellpoints";
-    names[21] ="sEffectDrainSkill";
-    names[8] ="sEffectFeather";
-    names[14] ="sEffectFireDamage";
-    names[4] ="sEffectFireShield";
-    names[117] ="sEffectFortifyAttackBonus";
-    names[79] ="sEffectFortifyAttribute";
-    names[82] ="sEffectFortifyFatigue";
-    names[80] ="sEffectFortifyHealth";
-    names[81] ="sEffectFortifySpellpoints";
-    names[84] ="sEffectFortifyMagickaMultiplier";
-    names[83] ="sEffectFortifySkill";
-    names[52] ="sEffectFrenzyCreature";
-    names[51] ="sEffectFrenzyHumanoid";
-    names[16] ="sEffectFrostDamage";
-    names[6] ="sEffectFrostShield";
-    names[39] ="sEffectInvisibility";
-    names[9] ="sEffectJump";
-    names[10] ="sEffectLevitate";
-    names[41] ="sEffectLight";
-    names[5] ="sEffectLightningShield";
-    names[12] ="sEffectLock";
-    names[60] ="sEffectMark";
-    names[43] ="sEffectNightEye";
-    names[13] ="sEffectOpen";
-    names[45] ="sEffectParalyze";
-    names[27] ="sEffectPoison";
-    names[56] ="sEffectRallyCreature";
-    names[55] ="sEffectRallyHumanoid";
-    names[61] ="sEffectRecall";
-    names[68] ="sEffectReflect";
-    names[100] ="sEffectRemoveCurse";
-    names[95] ="sEffectResistBlightDisease";
-    names[94] ="sEffectResistCommonDisease";
-    names[96] ="sEffectResistCorprusDisease";
-    names[90] ="sEffectResistFire";
-    names[91] ="sEffectResistFrost";
-    names[93] ="sEffectResistMagicka";
-    names[98] ="sEffectResistNormalWeapons";
-    names[99] ="sEffectResistParalysis";
-    names[97] ="sEffectResistPoison";
-    names[92] ="sEffectResistShock";
-    names[74] ="sEffectRestoreAttribute";
-    names[77] ="sEffectRestoreFatigue";
-    names[75] ="sEffectRestoreHealth";
-    names[76] ="sEffectRestoreSpellPoints";
-    names[78] ="sEffectRestoreSkill";
-    names[42] ="sEffectSanctuary";
-    names[3] ="sEffectShield";
-    names[15] ="sEffectShockDamage";
-    names[46] ="sEffectSilence";
-    names[11] ="sEffectSlowFall";
-    names[58] ="sEffectSoultrap";
-    names[48] ="sEffectSound";
-    names[67] ="sEffectSpellAbsorption";
-    names[136] ="sEffectStuntedMagicka";
-    names[106] ="sEffectSummonAncestralGhost";
-    names[110] ="sEffectSummonBonelord";
-    names[108] ="sEffectSummonLeastBonewalker";
-    names[134] ="sEffectSummonCenturionSphere";
-    names[103] ="sEffectSummonClannfear";
-    names[104] ="sEffectSummonDaedroth";
-    names[105] ="sEffectSummonDremora";
-    names[114] ="sEffectSummonFlameAtronach";
-    names[115] ="sEffectSummonFrostAtronach";
-    names[113] ="sEffectSummonGoldenSaint";
-    names[109] ="sEffectSummonGreaterBonewalker";
-    names[112] ="sEffectSummonHunger";
-    names[102] ="sEffectSummonScamp";
-    names[107] ="sEffectSummonSkeletalMinion";
-    names[116] ="sEffectSummonStormAtronach";
-    names[111] ="sEffectSummonWingedTwilight";
-    names[135] ="sEffectSunDamage";
-    names[1] ="sEffectSwiftSwim";
-    names[59] ="sEffectTelekinesis";
-    names[101] ="sEffectTurnUndead";
-    names[133] ="sEffectVampirism";
-    names[0] ="sEffectWaterBreathing";
-    names[2] ="sEffectWaterWalking";
-    names[33] ="sEffectWeaknesstoBlightDisease";
-    names[32] ="sEffectWeaknesstoCommonDisease";
-    names[34] ="sEffectWeaknesstoCorprusDisease";
-    names[28] ="sEffectWeaknesstoFire";
-    names[29] ="sEffectWeaknesstoFrost";
-    names[31] ="sEffectWeaknesstoMagicka";
-    names[36] ="sEffectWeaknesstoNormalWeapons";
-    names[35] ="sEffectWeaknesstoPoison";
-    names[30] ="sEffectWeaknesstoShock";
+    if ((mEffectParams.mMagnMin >= 0 || mEffectParams.mMagnMax >= 0) && !(magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
+    {
+        if (mEffectParams.mMagnMin == mEffectParams.mMagnMax)
+            spellLine += " " + boost::lexical_cast<std::string>(mEffectParams.mMagnMin) + " " + ((mEffectParams.mMagnMin == 1) ? pt : pts);
+        else
+        {
+            spellLine += " " + boost::lexical_cast<std::string>(mEffectParams.mMagnMin) + to + boost::lexical_cast<std::string>(mEffectParams.mMagnMax) + " " + pts;
+        }
+    }
 
-    // bloodmoon
-    names[138] ="sEffectSummonCreature01";
-    names[139] ="sEffectSummonCreature02";
-    names[140] ="sEffectSummonCreature03";
-    names[141] ="sEffectSummonCreature04";
-    names[142] ="sEffectSummonCreature05";
+    // constant effects have no duration and no target
+    if (!mEffectParams.mIsConstant)
+    {
+        if (mEffectParams.mDuration >= 0 && !(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
+        {
+            spellLine += " " + mWindowManager->getGameSettingString("sfor", "") + " " + boost::lexical_cast<std::string>(mEffectParams.mDuration) + ((mEffectParams.mDuration == 1) ? sec : secs);
+        }
 
-    // tribunal
-    names[137] ="sEffectSummonFabricant";
+        if (mEffectParams.mArea > 0)
+        {
+            spellLine += " #{sin} " + boost::lexical_cast<std::string>(mEffectParams.mArea) + " #{sfootarea}";
+        }
 
-    assert(names.find(effectID) != names.end() && "Unimplemented effect type");
+        // potions have no target
+        if (!mEffectParams.mNoTarget)
+        {
+            std::string on = mWindowManager->getGameSettingString("sonword", "");
+            if (mEffectParams.mRange == ESM::RT_Self)
+                spellLine += " " + on + " " + mWindowManager->getGameSettingString("sRangeSelf", "");
+            else if (mEffectParams.mRange == ESM::RT_Touch)
+                spellLine += " " + on + " " + mWindowManager->getGameSettingString("sRangeTouch", "");
+            else if (mEffectParams.mRange == ESM::RT_Target)
+                spellLine += " " + on + " " + mWindowManager->getGameSettingString("sRangeTarget", "");
+        }
+    }
 
-    return names[effectID];
-}
+    static_cast<MyGUI::TextBox*>(mTextWidget)->setCaptionWithReplacing(spellLine);
+    mRequestedWidth = mTextWidget->getTextSize().width + 24;
 
-bool MWSpellEffect::effectHasDuration(const std::string& effect)
-{
-    // lists effects that have no duration (e.g. open lock)
-    std::vector<std::string> effectsWithoutDuration;
-    effectsWithoutDuration.push_back("sEffectOpen");
-    effectsWithoutDuration.push_back("sEffectLock");
-    effectsWithoutDuration.push_back("sEffectDispel");
-    effectsWithoutDuration.push_back("sEffectSunDamage");
-    effectsWithoutDuration.push_back("sEffectCorpus");
-    effectsWithoutDuration.push_back("sEffectVampirism");
-    effectsWithoutDuration.push_back("sEffectMark");
-    effectsWithoutDuration.push_back("sEffectRecall");
-    effectsWithoutDuration.push_back("sEffectDivineIntervention");
-    effectsWithoutDuration.push_back("sEffectAlmsiviIntervention");
-    effectsWithoutDuration.push_back("sEffectCureCommonDisease");
-    effectsWithoutDuration.push_back("sEffectCureBlightDisease");
-    effectsWithoutDuration.push_back("sEffectCureCorprusDisease");
-    effectsWithoutDuration.push_back("sEffectCurePoison");
-    effectsWithoutDuration.push_back("sEffectCureParalyzation");
-    effectsWithoutDuration.push_back("sEffectRemoveCurse");
-    effectsWithoutDuration.push_back("sEffectRestoreAttribute");
-
-    return (std::find(effectsWithoutDuration.begin(), effectsWithoutDuration.end(), effect) == effectsWithoutDuration.end());
-}
-
-bool MWSpellEffect::effectHasMagnitude(const std::string& effect)
-{
-    // lists effects that have no magnitude (e.g. invisiblity)
-    std::vector<std::string> effectsWithoutMagnitude;
-    effectsWithoutMagnitude.push_back("sEffectInvisibility");
-    effectsWithoutMagnitude.push_back("sEffectStuntedMagicka");
-    effectsWithoutMagnitude.push_back("sEffectParalyze");
-    effectsWithoutMagnitude.push_back("sEffectSoultrap");
-    effectsWithoutMagnitude.push_back("sEffectSilence");
-    effectsWithoutMagnitude.push_back("sEffectParalyze");
-    effectsWithoutMagnitude.push_back("sEffectInvisibility");
-    effectsWithoutMagnitude.push_back("sEffectWaterWalking");
-    effectsWithoutMagnitude.push_back("sEffectWaterBreathing");
-    effectsWithoutMagnitude.push_back("sEffectSummonScamp");
-    effectsWithoutMagnitude.push_back("sEffectSummonClannfear");
-    effectsWithoutMagnitude.push_back("sEffectSummonDaedroth");
-    effectsWithoutMagnitude.push_back("sEffectSummonDremora");
-    effectsWithoutMagnitude.push_back("sEffectSummonAncestralGhost");
-    effectsWithoutMagnitude.push_back("sEffectSummonSkeletalMinion");
-    effectsWithoutMagnitude.push_back("sEffectSummonBonewalker");
-    effectsWithoutMagnitude.push_back("sEffectSummonGreaterBonewalker");
-    effectsWithoutMagnitude.push_back("sEffectSummonBonelord");
-    effectsWithoutMagnitude.push_back("sEffectSummonWingedTwilight");
-    effectsWithoutMagnitude.push_back("sEffectSummonHunger");
-    effectsWithoutMagnitude.push_back("sEffectSummonGoldenSaint");
-    effectsWithoutMagnitude.push_back("sEffectSummonFlameAtronach");
-    effectsWithoutMagnitude.push_back("sEffectSummonFrostAtronach");
-    effectsWithoutMagnitude.push_back("sEffectSummonStormAtronach");
-    effectsWithoutMagnitude.push_back("sEffectSummonCenturionSphere");
-    effectsWithoutMagnitude.push_back("sEffectBoundDagger");
-    effectsWithoutMagnitude.push_back("sEffectBoundLongsword");
-    effectsWithoutMagnitude.push_back("sEffectBoundMace");
-    effectsWithoutMagnitude.push_back("sEffectBoundBattleAxe");
-    effectsWithoutMagnitude.push_back("sEffectBoundSpear");
-    effectsWithoutMagnitude.push_back("sEffectBoundLongbow");
-    effectsWithoutMagnitude.push_back("sEffectBoundCuirass");
-    effectsWithoutMagnitude.push_back("sEffectBoundHelm");
-    effectsWithoutMagnitude.push_back("sEffectBoundBoots");
-    effectsWithoutMagnitude.push_back("sEffectBoundShield");
-    effectsWithoutMagnitude.push_back("sEffectBoundGloves");
-    effectsWithoutMagnitude.push_back("sEffectStuntedMagicka");
-    effectsWithoutMagnitude.push_back("sEffectMark");
-    effectsWithoutMagnitude.push_back("sEffectRecall");
-    effectsWithoutMagnitude.push_back("sEffectDivineIntervention");
-    effectsWithoutMagnitude.push_back("sEffectAlmsiviIntervention");
-    effectsWithoutMagnitude.push_back("sEffectCureCommonDisease");
-    effectsWithoutMagnitude.push_back("sEffectCureBlightDisease");
-    effectsWithoutMagnitude.push_back("sEffectCureCorprusDisease");
-    effectsWithoutMagnitude.push_back("sEffectCurePoison");
-    effectsWithoutMagnitude.push_back("sEffectCureParalyzation");
-    effectsWithoutMagnitude.push_back("sEffectRemoveCurse");
-    effectsWithoutMagnitude.push_back("sEffectSummonCreature01");
-    effectsWithoutMagnitude.push_back("sEffectSummonCreature02");
-    effectsWithoutMagnitude.push_back("sEffectSummonCreature03");
-    effectsWithoutMagnitude.push_back("sEffectSummonCreature04");
-    effectsWithoutMagnitude.push_back("sEffectSummonCreature05");
-    effectsWithoutMagnitude.push_back("sEffectSummonFabricant");
-
-    return (std::find(effectsWithoutMagnitude.begin(), effectsWithoutMagnitude.end(), effect) == effectsWithoutMagnitude.end());
-}
-
-bool MWSpellEffect::effectInvolvesAttribute (const std::string& effect)
-{
-    return (effect == "sEffectRestoreAttribute"
-        || effect == "sEffectAbsorbAttribute"
-        || effect == "sEffectDrainAttribute"
-        || effect == "sEffectFortifyAttribute"
-        || effect == "sEffectDamageAttribute");
-}
-
-bool MWSpellEffect::effectInvolvesSkill (const std::string& effect)
-{
-    return (effect == "sEffectRestoreSkill"
-        || effect == "sEffectAbsorbSkill"
-        || effect == "sEffectDrainSkill"
-        || effect == "sEffectFortifySkill"
-        || effect == "sEffectDamageSkill");
+    std::string path = std::string("icons\\") + magicEffect->mIcon;
+    fixTexturePath(path);
+    mImageWidget->setImageTexture(path);
 }
 
 MWSpellEffect::~MWSpellEffect()
diff --git a/apps/openmw/mwgui/widgets.hpp b/apps/openmw/mwgui/widgets.hpp
index 6298ea77d7..a41e1f1238 100644
--- a/apps/openmw/mwgui/widgets.hpp
+++ b/apps/openmw/mwgui/widgets.hpp
@@ -32,6 +32,7 @@ namespace MWGui
                 , mRange(-1)
                 , mDuration(-1)
                 , mSkill(-1)
+                , mArea(0)
                 , mAttribute(-1)
                 , mEffectID(-1)
                 , mNoTarget(false)
@@ -51,6 +52,9 @@ namespace MWGui
             // value of -1 here means the value is unavailable
             int mMagnMin, mMagnMax, mRange, mDuration;
 
+            // value of 0 -> no area effect
+            int mArea;
+
             bool operator==(const SpellEffectParams& other) const
             {
                 if (mEffectID !=  other.mEffectID)
@@ -66,7 +70,7 @@ namespace MWGui
                                         || mEffectID == 21 // drain skill
                                         || mEffectID == 83 // fortify skill
                                         || mEffectID == 26); // damage skill
-                return ((other.mSkill == mSkill) || !involvesSkill) && ((other.mAttribute == mAttribute) && !involvesAttribute);
+                return ((other.mSkill == mSkill) || !involvesSkill) && ((other.mAttribute == mAttribute) && !involvesAttribute) && (other.mArea == mArea);
             }
         };
 
@@ -249,12 +253,6 @@ namespace MWGui
             void setWindowManager(MWBase::WindowManager* parWindowManager) { mWindowManager = parWindowManager; }
             void setSpellEffect(const SpellEffectParams& params);
 
-            std::string effectIDToString(const short effectID);
-            bool effectHasMagnitude (const std::string& effect);
-            bool effectHasDuration (const std::string& effect);
-            bool effectInvolvesAttribute (const std::string& effect);
-            bool effectInvolvesSkill (const std::string& effect);
-
             int getRequestedWidth() const { return mRequestedWidth; }
 
         protected:
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 2b592e2ca2..0350581e45 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -38,6 +38,7 @@
 #include "countdialog.hpp"
 #include "tradewindow.hpp"
 #include "spellbuyingwindow.hpp"
+#include "travelwindow.hpp"
 #include "settingswindow.hpp"
 #include "confirmationdialog.hpp"
 #include "alchemywindow.hpp"
@@ -46,6 +47,9 @@
 #include "loadingscreen.hpp"
 #include "levelupdialog.hpp"
 #include "waitdialog.hpp"
+#include "spellcreationdialog.hpp"
+#include "enchantingdialog.hpp"
+#include "trainingwindow.hpp"
 
 using namespace MWGui;
 
@@ -67,6 +71,7 @@ WindowManager::WindowManager(
   , mCountDialog(NULL)
   , mTradeWindow(NULL)
   , mSpellBuyingWindow(NULL)
+  , mTravelWindow(NULL)
   , mSettingsWindow(NULL)
   , mConfirmationDialog(NULL)
   , mAlchemyWindow(NULL)
@@ -75,6 +80,9 @@ WindowManager::WindowManager(
   , mCharGen(NULL)
   , mLevelupDialog(NULL)
   , mWaitDialog(NULL)
+  , mSpellCreationDialog(NULL)
+  , mEnchantingDialog(NULL)
+  , mTrainingWindow(NULL)
   , mPlayerClass()
   , mPlayerName()
   , mPlayerRaceId()
@@ -141,6 +149,7 @@ WindowManager::WindowManager(
     mInventoryWindow = new InventoryWindow(*this,mDragAndDrop);
     mTradeWindow = new TradeWindow(*this);
     mSpellBuyingWindow = new SpellBuyingWindow(*this);
+    mTravelWindow = new TravelWindow(*this);
     mDialogueWindow = new DialogueWindow(*this);
     mContainerWindow = new ContainerWindow(*this,mDragAndDrop);
     mHud = new HUD(w,h, mShowFPSLevel, mDragAndDrop);
@@ -155,6 +164,9 @@ WindowManager::WindowManager(
     mQuickKeysMenu = new QuickKeysMenu(*this);
     mLevelupDialog = new LevelupDialog(*this);
     mWaitDialog = new WaitDialog(*this);
+    mSpellCreationDialog = new SpellCreationDialog(*this);
+    mEnchantingDialog = new EnchantingDialog(*this);
+    mTrainingWindow = new TrainingWindow(*this);
 
     mLoadingScreen = new LoadingScreen(mOgre->getScene (), mOgre->getWindow (), *this);
     mLoadingScreen->onResChange (w,h);
@@ -203,6 +215,7 @@ WindowManager::~WindowManager()
     delete mScrollWindow;
     delete mTradeWindow;
     delete mSpellBuyingWindow;
+    delete mTravelWindow;
     delete mSettingsWindow;
     delete mConfirmationDialog;
     delete mAlchemyWindow;
@@ -210,6 +223,9 @@ WindowManager::~WindowManager()
     delete mLoadingScreen;
     delete mLevelupDialog;
     delete mWaitDialog;
+    delete mSpellCreationDialog;
+    delete mEnchantingDialog;
+    delete mTrainingWindow;
 
     cleanupGarbage();
 
@@ -253,12 +269,16 @@ void WindowManager::updateVisible()
     mBookWindow->setVisible(false);
     mTradeWindow->setVisible(false);
     mSpellBuyingWindow->setVisible(false);
+    mTravelWindow->setVisible(false);
     mSettingsWindow->setVisible(false);
     mAlchemyWindow->setVisible(false);
     mSpellWindow->setVisible(false);
     mQuickKeysMenu->setVisible(false);
     mLevelupDialog->setVisible(false);
     mWaitDialog->setVisible(false);
+    mSpellCreationDialog->setVisible(false);
+    mEnchantingDialog->setVisible(false);
+    mTrainingWindow->setVisible(false);
 
     mHud->setVisible(true);
 
@@ -359,6 +379,18 @@ void WindowManager::updateVisible()
         case GM_SpellBuying:
             mSpellBuyingWindow->setVisible(true);
             break;
+        case GM_Travel:
+            mTravelWindow->setVisible(true);
+            break;
+        case GM_SpellCreation:
+            mSpellCreationDialog->setVisible(true);
+            break;
+        case GM_Enchanting:
+            mEnchantingDialog->setVisible(true);
+            break;
+        case GM_Training:
+            mTrainingWindow->setVisible(true);
+            break;
         case GM_InterMessageBox:
             break;
         case GM_Journal:
@@ -558,9 +590,14 @@ void WindowManager::onFrame (float frameDuration)
 
     mHud->onFrame(frameDuration);
 
+    mTrainingWindow->onFrame (frameDuration);
+
+    mTrainingWindow->checkReferenceAvailable();
     mDialogueWindow->checkReferenceAvailable();
     mTradeWindow->checkReferenceAvailable();
     mSpellBuyingWindow->checkReferenceAvailable();
+    mSpellCreationDialog->checkReferenceAvailable();
+    mEnchantingDialog->checkReferenceAvailable();
     mContainerWindow->checkReferenceAvailable();
     mConsole->checkReferenceAvailable();
 }
@@ -844,6 +881,7 @@ MWGui::CountDialog* WindowManager::getCountDialog() { return mCountDialog; }
 MWGui::ConfirmationDialog* WindowManager::getConfirmationDialog() { return mConfirmationDialog; }
 MWGui::TradeWindow* WindowManager::getTradeWindow() { return mTradeWindow; }
 MWGui::SpellBuyingWindow* WindowManager::getSpellBuyingWindow() { return mSpellBuyingWindow; }
+MWGui::TravelWindow* WindowManager::getTravelWindow() { return mTravelWindow; }
 MWGui::SpellWindow* WindowManager::getSpellWindow() { return mSpellWindow; }
 MWGui::Console* WindowManager::getConsole() { return mConsole; }
 
@@ -965,3 +1003,18 @@ void WindowManager::addVisitedLocation(const std::string& name, int x, int y)
 {
     mMap->addVisitedLocation (name, x, y);
 }
+
+void WindowManager::startSpellMaking(MWWorld::Ptr actor)
+{
+    mSpellCreationDialog->startSpellMaking (actor);
+}
+
+void WindowManager::startEnchanting (MWWorld::Ptr actor)
+{
+    mEnchantingDialog->startEnchanting (actor);
+}
+
+void WindowManager::startTraining(MWWorld::Ptr actor)
+{
+    mTrainingWindow->startTraining(actor);
+}
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index f67559ccdd..aa796343e9 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -64,6 +64,9 @@ namespace MWGui
   class LoadingScreen;
   class LevelupDialog;
   class WaitDialog;
+  class SpellCreationDialog;
+  class EnchantingDialog;
+  class TrainingWindow;
 
   class WindowManager : public MWBase::WindowManager
   {
@@ -111,6 +114,7 @@ namespace MWGui
     virtual MWGui::ConfirmationDialog* getConfirmationDialog();
     virtual MWGui::TradeWindow* getTradeWindow();
     virtual MWGui::SpellBuyingWindow* getSpellBuyingWindow();
+    virtual MWGui::TravelWindow* getTravelWindow();
     virtual MWGui::SpellWindow* getSpellWindow();
     virtual MWGui::Console* getConsole();
 
@@ -211,6 +215,10 @@ namespace MWGui
     virtual bool getPlayerSleeping();
     virtual void wakeUpPlayer();
 
+    virtual void startSpellMaking(MWWorld::Ptr actor);
+    virtual void startEnchanting(MWWorld::Ptr actor);
+    virtual void startTraining(MWWorld::Ptr actor);
+
   private:
     OEngine::GUI::MyGUIManager *mGuiManager;
     HUD *mHud;
@@ -230,6 +238,7 @@ namespace MWGui
     CountDialog* mCountDialog;
     TradeWindow* mTradeWindow;
     SpellBuyingWindow* mSpellBuyingWindow;
+    TravelWindow* mTravelWindow;
     SettingsWindow* mSettingsWindow;
     ConfirmationDialog* mConfirmationDialog;
     AlchemyWindow* mAlchemyWindow;
@@ -238,6 +247,9 @@ namespace MWGui
     LoadingScreen* mLoadingScreen;
     LevelupDialog* mLevelupDialog;
     WaitDialog* mWaitDialog;
+    SpellCreationDialog* mSpellCreationDialog;
+    EnchantingDialog* mEnchantingDialog;
+    TrainingWindow* mTrainingWindow;
 
     CharacterCreation* mCharGen;
 
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 87a0583948..ab332eb960 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -118,18 +118,14 @@ namespace MWMechanics
                     + fRestMagicMult * stats.getAttribute(ESM::Attribute::Intelligence).getModified ());
             }
         }
-
-
-
     }
 
-
     void Actors::calculateCreatureStatModifiers (const MWWorld::Ptr& ptr)
     {
         CreatureStats& creatureStats = MWWorld::Class::get (ptr).getCreatureStats (ptr);
 
         // attributes
-        for (int i=0; i<5; ++i)
+        for (int i=0; i<8; ++i)
         {
             int modifier =
                 creatureStats.getMagicEffects().get (EffectKey (79, i)).mMagnitude;
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
new file mode 100644
index 0000000000..df7c786b1e
--- /dev/null
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -0,0 +1,490 @@
+
+#include "alchemy.hpp"
+
+#include <cassert>
+#include <cstdlib>
+
+#include <algorithm>
+#include <stdexcept>
+
+#include <components/esm/loadskil.hpp>
+#include <components/esm/loadappa.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadmgef.hpp>
+
+#include <components/esm_store/store.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
+#include "../mwworld/containerstore.hpp"
+#include "../mwworld/class.hpp"
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/manualref.hpp"
+
+#include "magiceffects.hpp"
+#include "creaturestats.hpp"
+#include "npcstats.hpp"
+
+std::set<MWMechanics::EffectKey> MWMechanics::Alchemy::listEffects() const
+{
+    std::set<EffectKey> effects;
+    
+    for (TIngredientsIterator iter (mIngredients.begin()); iter!=mIngredients.end(); ++iter)
+    {
+        if (!iter->isEmpty())
+        {
+            const MWWorld::LiveCellRef<ESM::Ingredient> *ingredient = iter->get<ESM::Ingredient>();
+            
+            for (int i=0; i<4; ++i)
+                if (ingredient->base->mData.mEffectID[i]!=-1)
+                    effects.insert (EffectKey (
+                        ingredient->base->mData.mEffectID[i], ingredient->base->mData.mSkills[i]!=-1 ?
+                        ingredient->base->mData.mSkills[i] : ingredient->base->mData.mAttributes[i]));
+        }
+    }
+    
+    return effects;
+}
+
+void MWMechanics::Alchemy::filterEffects (std::set<EffectKey>& effects) const
+{
+    std::set<EffectKey>::iterator iter = effects.begin();
+    
+    while (iter!=effects.end())
+    {
+        bool remove = false;
+        
+        const EffectKey& key = *iter;
+        
+        { // dodge pointless g++ warning
+            for (TIngredientsIterator iter (mIngredients.begin()); iter!=mIngredients.end(); ++iter)
+            {
+                bool found = false;
+
+                if (iter->isEmpty())
+                    continue;
+
+                const MWWorld::LiveCellRef<ESM::Ingredient> *ingredient = iter->get<ESM::Ingredient>();       
+
+                for (int i=0; i<4; ++i)
+                    if (key.mId==ingredient->base->mData.mEffectID[i] &&
+                        (key.mArg==ingredient->base->mData.mSkills[i] ||
+                        key.mArg==ingredient->base->mData.mAttributes[i]))
+                    {
+                        found = true;
+                        break;
+                    }
+            
+                if (!found)
+                {
+                    remove = true;
+                    break;
+                }
+            }
+        }       
+        
+        if (remove)
+            effects.erase (iter++);
+        else
+            ++iter;
+    }
+}
+
+void MWMechanics::Alchemy::applyTools (int flags, float& value) const
+{
+    bool magnitude = !(flags & ESM::MagicEffect::NoMagnitude);
+    bool duration = !(flags & ESM::MagicEffect::NoDuration);
+    bool negative = flags & (ESM::MagicEffect::Negative | ESM::MagicEffect::Harmful);
+
+    int tool = negative ? ESM::Apparatus::Retort : ESM::Apparatus::Albemic;
+
+    int setup = 0;
+    
+    if (!mTools[tool].isEmpty() && !mTools[ESM::Apparatus::Calcinator].isEmpty())
+        setup = 1;
+    else if (!mTools[tool].isEmpty())
+        setup = 2;
+    else if (!mTools[ESM::Apparatus::Calcinator].isEmpty())
+        setup = 3;
+    else
+        return;
+
+    float toolQuality = setup==1 || setup==2 ? mTools[tool].get<ESM::Apparatus>()->base->mData.mQuality : 0;
+    float calcinatorQuality = setup==1 || setup==3 ?
+        mTools[ESM::Apparatus::Calcinator].get<ESM::Apparatus>()->base->mData.mQuality : 0;
+
+    float quality = 1;
+    
+    switch (setup)
+    {
+        case 1:
+        
+            quality = negative ? 2 * toolQuality + 3 * calcinatorQuality :
+                (magnitude && duration ?
+                2 * toolQuality + calcinatorQuality : 2/3.0 * (toolQuality + calcinatorQuality) + 0.5);
+            break;
+        
+        case 2:
+        
+            quality = negative ? 1+toolQuality : (magnitude && duration ? toolQuality : toolQuality + 0.5);
+            break;
+        
+        case 3:
+        
+            quality = magnitude && duration ? calcinatorQuality : calcinatorQuality + 0.5;
+            break;
+    }
+
+    if (setup==3 || !negative)
+    {
+        value += quality;
+    }
+    else
+    {
+        if (quality==0)
+            throw std::runtime_error ("invalid derived alchemy apparatus quality"); 
+            
+        value /= quality;
+    }
+}
+
+void MWMechanics::Alchemy::updateEffects()
+{
+    mEffects.clear();
+    mValue = 0;
+
+    if (countIngredients()<2 || mAlchemist.isEmpty() || mTools[ESM::Apparatus::MortarPestle].isEmpty())
+        return;
+
+    // find effects
+    std::set<EffectKey> effects (listEffects());
+    filterEffects (effects);
+
+    // general alchemy factor
+    float x = getChance();
+
+    x *= mTools[ESM::Apparatus::MortarPestle].get<ESM::Apparatus>()->base->mData.mQuality;
+    x *= MWBase::Environment::get().getWorld()->getStore().gameSettings.find ("fPotionStrengthMult")->getFloat();
+
+    // value
+    mValue = static_cast<int> (
+        x * MWBase::Environment::get().getWorld()->getStore().gameSettings.find ("iAlchemyMod")->getFloat());
+
+    // build quantified effect list
+    for (std::set<EffectKey>::const_iterator iter (effects.begin()); iter!=effects.end(); ++iter)
+    {
+        const ESM::MagicEffect *magicEffect =
+            MWBase::Environment::get().getWorld()->getStore().magicEffects.find (iter->mId);         
+        
+        if (magicEffect->mData.mBaseCost<=0)
+            throw std::runtime_error ("invalid base cost for magic effect " + iter->mId);
+        
+        float fPotionT1MagMul =
+            MWBase::Environment::get().getWorld()->getStore().gameSettings.find ("fPotionT1MagMult")->getFloat();
+
+        if (fPotionT1MagMul<=0)
+            throw std::runtime_error ("invalid gmst: fPotionT1MagMul");
+        
+        float fPotionT1DurMult =
+            MWBase::Environment::get().getWorld()->getStore().gameSettings.find ("fPotionT1DurMult")->getFloat();
+
+        if (fPotionT1DurMult<=0)
+            throw std::runtime_error ("invalid gmst: fPotionT1DurMult");
+
+        float magnitude = magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude ?
+            1 : (x / fPotionT1MagMul) / magicEffect->mData.mBaseCost;
+        float duration = magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration ?
+            1 : (x / fPotionT1DurMult) / magicEffect->mData.mBaseCost;
+
+        if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
+            applyTools (magicEffect->mData.mFlags, magnitude);
+
+        if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))
+            applyTools (magicEffect->mData.mFlags, duration);
+        
+        duration = static_cast<int> (duration+0.5);           
+        magnitude = static_cast<int> (magnitude+0.5);
+
+        if (magnitude>0 && duration>0)
+        {
+            ESM::ENAMstruct effect;
+            effect.mEffectID = iter->mId;
+            
+            effect.mSkill = effect.mAttribute = iter->mArg; // somewhat hack-ish, but should work
+            
+            effect.mRange = 0;
+            effect.mArea = 0;       
+            
+            effect.mDuration = duration;
+            effect.mMagnMin = effect.mMagnMax = magnitude;
+
+            mEffects.push_back (effect);
+        }   
+    }
+}
+
+const ESM::Potion *MWMechanics::Alchemy::getRecord() const
+{
+    for (ESMS::RecListWithIDT<ESM::Potion>::MapType::const_iterator iter (
+        MWBase::Environment::get().getWorld()->getStore().potions.list.begin());
+        iter!=MWBase::Environment::get().getWorld()->getStore().potions.list.end(); ++iter)
+    {
+        if (iter->second.mEffects.mList.size()!=mEffects.size())
+            continue;
+         
+        bool mismatch = false; 
+
+        for (int i=0; i<static_cast<int> (iter->second.mEffects.mList.size()); ++iter)
+        {
+            const ESM::ENAMstruct& first = iter->second.mEffects.mList[i];
+            const ESM::ENAMstruct& second = mEffects[i];
+                
+            if (first.mEffectID!=second.mEffectID ||
+                first.mArea!=second.mArea ||
+                first.mRange!=second.mRange ||
+                first.mSkill!=second.mSkill ||
+                first.mAttribute!=second.mAttribute ||
+                first.mMagnMin!=second.mMagnMin ||
+                first.mMagnMax!=second.mMagnMax ||
+                first.mDuration!=second.mDuration)
+            {
+                mismatch = true;
+                break;
+            }
+        }
+        
+        if (!mismatch)
+            return &iter->second;
+    }
+    
+    return 0;
+}
+
+void MWMechanics::Alchemy::removeIngredients()
+{
+    bool needsUpdate = false;
+    
+    for (TIngredientsContainer::iterator iter (mIngredients.begin()); iter!=mIngredients.end(); ++iter)
+        if (!iter->isEmpty())
+        {
+            iter->getRefData().setCount (iter->getRefData().getCount()-1);
+            if (iter->getRefData().getCount()<1)
+            {
+                needsUpdate = true;
+                *iter = MWWorld::Ptr();
+            }
+        }
+    
+    if (needsUpdate)
+        updateEffects();
+}
+
+void MWMechanics::Alchemy::addPotion (const std::string& name)
+{
+    const ESM::Potion *record = getRecord();
+    
+    if (!record)
+    {
+        ESM::Potion newRecord;
+        
+        newRecord.mData.mWeight = 0;
+        
+        for (TIngredientsIterator iter (beginIngredients()); iter!=endIngredients(); ++iter)
+            if (!iter->isEmpty())
+                newRecord.mData.mWeight += iter->get<ESM::Ingredient>()->base->mData.mWeight;
+            
+        newRecord.mData.mWeight /= countIngredients();
+        
+        newRecord.mData.mValue = mValue;
+        newRecord.mData.mAutoCalc = 0;
+        
+        newRecord.mName = name;
+
+        int index = static_cast<int> (std::rand()/static_cast<double> (RAND_MAX)*6);
+        assert (index>=0 && index<6);
+        
+        static const char *name[] = { "standard", "bargain", "cheap", "fresh", "exclusive", "quality" };
+        
+        newRecord.mModel = "m\\misc_potion_" + std::string (name[index]) + "_01.nif";
+        newRecord.mIcon = "m\\tx_potion_" + std::string (name[index]) + "_01.dds";
+        
+        newRecord.mEffects.mList = mEffects;
+        
+        record = MWBase::Environment::get().getWorld()->createRecord (newRecord).second;
+    }
+    
+    MWWorld::ManualRef ref (MWBase::Environment::get().getWorld()->getStore(), record->mId);
+    MWWorld::Class::get (mAlchemist).getContainerStore (mAlchemist).add (ref.getPtr());
+}
+
+void MWMechanics::Alchemy::increaseSkill()
+{
+    MWWorld::Class::get (mAlchemist).skillUsageSucceeded (mAlchemist, ESM::Skill::Alchemy, 0);
+}
+
+float MWMechanics::Alchemy::getChance() const
+{
+    const CreatureStats& creatureStats = MWWorld::Class::get (mAlchemist).getCreatureStats (mAlchemist);
+    const NpcStats& npcStats = MWWorld::Class::get (mAlchemist).getNpcStats (mAlchemist);
+        
+    return
+        (npcStats.getSkill (ESM::Skill::Alchemy).getModified() +
+        0.1 * creatureStats.getAttribute (1).getModified()
+        + 0.1 * creatureStats.getAttribute (7).getModified());
+}
+
+int MWMechanics::Alchemy::countIngredients() const
+{
+    int ingredients = 0;
+
+    for (TIngredientsIterator iter (beginIngredients()); iter!=endIngredients(); ++iter)
+        if (!iter->isEmpty())
+            ++ingredients;
+
+    return ingredients;
+}
+
+void MWMechanics::Alchemy::setAlchemist (const MWWorld::Ptr& npc)
+{
+    mAlchemist = npc;
+    
+    mIngredients.resize (4);
+
+    std::fill (mIngredients.begin(), mIngredients.end(), MWWorld::Ptr());
+    
+    mTools.resize (4);
+    
+    std::fill (mTools.begin(), mTools.end(), MWWorld::Ptr());
+    
+    mEffects.clear();
+    
+    MWWorld::ContainerStore& store = MWWorld::Class::get (npc).getContainerStore (npc);
+    
+    for (MWWorld::ContainerStoreIterator iter (store.begin (MWWorld::ContainerStore::Type_Apparatus));
+        iter!=store.end(); ++iter)
+    {    
+        MWWorld::LiveCellRef<ESM::Apparatus>* ref = iter->get<ESM::Apparatus>();
+    
+        int type = ref->base->mData.mType;
+    
+        if (type<0 || type>=static_cast<int> (mTools.size()))
+            throw std::runtime_error ("invalid apparatus type");
+            
+        if (!mTools[type].isEmpty())
+            if (ref->base->mData.mQuality<=mTools[type].get<ESM::Apparatus>()->base->mData.mQuality)
+                continue;
+        
+        mTools[type] = *iter;        
+    }
+}
+
+MWMechanics::Alchemy::TToolsIterator MWMechanics::Alchemy::beginTools() const
+{
+    return mTools.begin();
+}
+
+MWMechanics::Alchemy::TToolsIterator MWMechanics::Alchemy::endTools() const
+{
+    return mTools.end();
+}
+
+MWMechanics::Alchemy::TIngredientsIterator MWMechanics::Alchemy::beginIngredients() const
+{
+    return mIngredients.begin();
+}
+
+MWMechanics::Alchemy::TIngredientsIterator MWMechanics::Alchemy::endIngredients() const
+{
+    return mIngredients.end();
+}
+
+void MWMechanics::Alchemy::clear()
+{
+    mAlchemist = MWWorld::Ptr();
+    mTools.clear();
+    mIngredients.clear();
+    mEffects.clear();
+}
+
+int MWMechanics::Alchemy::addIngredient (const MWWorld::Ptr& ingredient)
+{
+    // find a free slot
+    int slot = -1;
+
+    for (int i=0; i<static_cast<int> (mIngredients.size()); ++i)
+        if (mIngredients[i].isEmpty())
+        {
+            slot = i;
+            break;
+        }    
+    
+    if (slot==-1)
+        return -1;
+        
+    for (TIngredientsIterator iter (mIngredients.begin()); iter!=mIngredients.end(); ++iter)
+        if (!iter->isEmpty() && ingredient.get<ESM::Ingredient>()==iter->get<ESM::Ingredient>())
+            return -1;
+        
+    mIngredients[slot] = ingredient;
+    
+    updateEffects();
+        
+    return slot;
+}
+
+void MWMechanics::Alchemy::removeIngredient (int index)
+{
+    if (index>=0 && index<static_cast<int> (mIngredients.size()))
+    {
+        mIngredients[index] = MWWorld::Ptr();
+        updateEffects();
+    }
+}
+
+MWMechanics::Alchemy::TEffectsIterator MWMechanics::Alchemy::beginEffects() const
+{
+    return mEffects.begin();
+}
+
+MWMechanics::Alchemy::TEffectsIterator MWMechanics::Alchemy::endEffects() const
+{
+    return mEffects.end();
+}
+
+std::string MWMechanics::Alchemy::getPotionName() const
+{
+    if (const ESM::Potion *potion = getRecord())
+        return potion->mName;
+        
+    return "";
+}
+
+MWMechanics::Alchemy::Result MWMechanics::Alchemy::create (const std::string& name)
+{
+    if (mTools[ESM::Apparatus::MortarPestle].isEmpty())
+        return Result_NoMortarAndPestle;
+           
+    if (countIngredients()<2)
+        return Result_LessThanTwoIngredients;
+
+    if (name.empty() && getPotionName().empty())
+        return Result_NoName;
+        
+    if (beginEffects()==endEffects())
+        return Result_NoEffects;
+
+    if (getChance()<std::rand()/static_cast<double> (RAND_MAX)*100)
+    {
+        removeIngredients();
+        return Result_RandomFailure;
+    }
+
+    addPotion (name);
+
+    removeIngredients();
+       
+    increaseSkill();
+
+    return Result_Success;
+}
diff --git a/apps/openmw/mwmechanics/alchemy.hpp b/apps/openmw/mwmechanics/alchemy.hpp
new file mode 100644
index 0000000000..7f3e2c0eaa
--- /dev/null
+++ b/apps/openmw/mwmechanics/alchemy.hpp
@@ -0,0 +1,121 @@
+#ifndef GAME_MWMECHANICS_ALCHEMY_H
+#define GAME_MWMECHANICS_ALCHEMY_H
+
+#include <vector>
+#include <set>
+
+#include <components/esm/effectlist.hpp>
+
+#include "../mwworld/ptr.hpp"
+
+namespace MWMechanics
+{
+    struct EffectKey;
+
+    /// \brief Potion creation via alchemy skill
+    class Alchemy
+    {
+        public:
+        
+            typedef std::vector<MWWorld::Ptr> TToolsContainer;
+            typedef TToolsContainer::const_iterator TToolsIterator;
+    
+            typedef std::vector<MWWorld::Ptr> TIngredientsContainer;
+            typedef TIngredientsContainer::const_iterator TIngredientsIterator;
+
+            typedef std::vector<ESM::ENAMstruct> TEffectsContainer;
+            typedef TEffectsContainer::const_iterator TEffectsIterator;
+    
+            enum Result
+            {
+                Result_Success,
+                
+                Result_NoMortarAndPestle,
+                Result_LessThanTwoIngredients,
+                Result_NoName,
+                Result_NoEffects,
+                Result_RandomFailure
+            };
+    
+        private:
+    
+            MWWorld::Ptr mAlchemist;
+            TToolsContainer mTools;
+            TIngredientsContainer mIngredients;
+            TEffectsContainer mEffects;
+            int mValue;
+
+            std::set<EffectKey> listEffects() const;
+            ///< List all effects of all used ingredients.
+            
+            void filterEffects (std::set<EffectKey>& effects) const;
+            ///< Filter out effects not shared by all ingredients.
+
+            void applyTools (int flags, float& value) const;
+
+            void updateEffects();
+            
+            const ESM::Potion *getRecord() const;
+            ///< Return existing recrod for created potion (may return 0)
+            
+            void removeIngredients();
+            ///< Remove selected ingredients from alchemist's inventory, cleanup selected ingredients and
+            /// update effect list accordingly.
+
+            void addPotion (const std::string& name);
+            ///< Add a potion to the alchemist's inventory.
+            
+            void increaseSkill();
+            ///< Increase alchemist's skill.
+            
+            float getChance() const;
+            ///< Return chance of success.
+            
+            int countIngredients() const;
+            
+        public:
+        
+            void setAlchemist (const MWWorld::Ptr& npc);
+            ///< Set alchemist and configure alchemy setup accordingly. \a npc may be empty to indicate that
+            /// there is no alchemist (alchemy session has ended).
+            
+            TToolsIterator beginTools() const;
+            ///< \attention Iterates over tool slots, not over tools. Some of the slots may be empty.
+            
+            TToolsIterator endTools() const;
+            
+            TIngredientsIterator beginIngredients() const;
+            ///< \attention Iterates over ingredient slots, not over ingredients. Some of the slots may be empty.
+            
+            TIngredientsIterator endIngredients() const;
+            
+            void clear();
+            ///< Remove alchemist, tools and ingredients.
+            
+            int addIngredient (const MWWorld::Ptr& ingredient);
+            ///< Add ingredient into the next free slot.
+            ///
+            /// \return Slot index or -1, if adding failed because of no free slot or the ingredient type being
+            /// listed already.
+            
+            void removeIngredient (int index);
+            ///< Remove ingredient from slot (calling this function on an empty slot is a no-op).
+            
+            TEffectsIterator beginEffects() const;
+            
+            TEffectsIterator endEffects() const;
+            
+            std::string getPotionName() const;
+            ///< Return the name of the potion that would be created when calling create (if a record for such
+            /// a potion already exists) or return an empty string.
+            
+            Result create (const std::string& name);
+            ///< Try to create a potion from the ingredients, place it in the inventory of the alchemist and
+            /// adjust the skills of the alchemist accordingly.
+            /// \param name must not be an empty string, unless there is already a potion record (
+            /// getPotionName() does not return an empty string).
+    };
+}
+
+#endif
+
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index c937c9894f..21299e25c1 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -180,6 +180,8 @@ RenderingManager::~RenderingManager ()
     delete mOcclusionQuery;
     delete mCompositors;
     delete mWater;
+
+    delete mFactory;
 }
 
 MWRender::SkyManager* RenderingManager::getSkyManager()
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index 4344397c70..7b028e1d0b 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -54,6 +54,6 @@ namespace MWSound
 #ifndef DEFAULT_DECODER
 #define DEFAULT_DECODER (::MWSound::FFmpeg_Decoder)
 #endif
-};
+}
 
 #endif
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 6fc228f0b5..2e3d80aa42 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -326,6 +326,14 @@ namespace MWWorld
     }
 
     Ptr World::getPtrViaHandle (const std::string& handle)
+    {
+        Ptr res = searchPtrViaHandle (handle);
+        if (res.isEmpty ())
+            throw std::runtime_error ("unknown Ogre handle: " + handle);
+        return res;
+    }
+
+    Ptr World::searchPtrViaHandle (const std::string& handle)
     {
         if (mPlayer->getPlayer().getRefData().getHandle()==handle)
             return mPlayer->getPlayer();
@@ -339,7 +347,7 @@ namespace MWWorld
                 return ptr;
         }
 
-        throw std::runtime_error ("unknown Ogre handle: " + handle);
+        return MWWorld::Ptr();
     }
 
     void World::enable (const Ptr& reference)
@@ -850,12 +858,13 @@ namespace MWWorld
         mWeatherManager->update (duration);
 
         // inform the GUI about focused object
-        try
-        {
-            MWWorld::Ptr object = getPtrViaHandle(mFacedHandle);
-            MWBase::Environment::get().getWindowManager()->setFocusObject(object);
+        MWWorld::Ptr object = searchPtrViaHandle(mFacedHandle);
 
-            // retrieve object dimensions so we know where to place the floating label
+        MWBase::Environment::get().getWindowManager()->setFocusObject(object);
+
+        // retrieve object dimensions so we know where to place the floating label
+        if (!object.isEmpty ())
+        {
             Ogre::SceneNode* node = object.getRefData().getBaseNode();
             Ogre::AxisAlignedBox bounds;
             int i;
@@ -871,11 +880,6 @@ namespace MWWorld
                     screenCoords[0], screenCoords[1], screenCoords[2], screenCoords[3]);
             }
         }
-        catch (std::runtime_error&)
-        {
-            MWWorld::Ptr null;
-            MWBase::Environment::get().getWindowManager()->setFocusObject(null);
-        }
 
         if (!mRendering->occlusionQuerySupported())
         {
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 90cd2151b6..f94882c102 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -163,6 +163,9 @@ namespace MWWorld
             virtual Ptr getPtrViaHandle (const std::string& handle);
             ///< Return a pointer to a liveCellRef with the given Ogre handle.
 
+            virtual Ptr searchPtrViaHandle (const std::string& handle);
+            ///< Return a pointer to a liveCellRef with the given Ogre handle or Ptr() if not found
+
             virtual void enable (const Ptr& ptr);
 
             virtual void disable (const Ptr& ptr);
diff --git a/components/bsa/bsa_archive.cpp b/components/bsa/bsa_archive.cpp
index 081207b0c8..8380b08388 100644
--- a/components/bsa/bsa_archive.cpp
+++ b/components/bsa/bsa_archive.cpp
@@ -375,7 +375,7 @@ void addBSA(const std::string& name, const std::string& group)
 {
   insertBSAFactory();
   ResourceGroupManager::getSingleton().
-    addResourceLocation(name, "BSA", group);
+    addResourceLocation(name, "BSA", group, true);
 }
 
 void addDir(const std::string& name, const bool& fs, const std::string& group)
@@ -384,7 +384,7 @@ void addDir(const std::string& name, const bool& fs, const std::string& group)
     insertDirFactory();
 
     ResourceGroupManager::getSingleton().
-    addResourceLocation(name, "Dir", group);
+    addResourceLocation(name, "Dir", group, true);
 }
 
 }
diff --git a/components/esm/aipackage.hpp b/components/esm/aipackage.hpp
index 8e55b68892..3128fe0c61 100644
--- a/components/esm/aipackage.hpp
+++ b/components/esm/aipackage.hpp
@@ -18,8 +18,6 @@ namespace ESM
     {
         // These are probabilities
         char mHello, mU1, mFight, mFlee, mAlarm, mU2, mU3, mU4;
-        // The last u's might be the skills that this NPC can train you
-        // in?
         int mServices; // See the Services enum
     }; // 12 bytes
 
diff --git a/components/esm/loadmgef.cpp b/components/esm/loadmgef.cpp
index be588fbb01..d0230e3b6a 100644
--- a/components/esm/loadmgef.cpp
+++ b/components/esm/loadmgef.cpp
@@ -1,5 +1,7 @@
 #include "loadmgef.hpp"
 
+#include <boost/lexical_cast.hpp>
+
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
 
@@ -79,4 +81,162 @@ void MagicEffect::save(ESMWriter &esm)
     esm.writeHNOString("DESC", mDescription);
 }
 
+std::string MagicEffect::effectIdToString(short effectID)
+{
+    // Map effect ID to GMST name
+    // http://www.uesp.net/morrow/hints/mweffects.shtml
+    std::map<short, std::string> names;
+    names[85] ="sEffectAbsorbAttribute";
+    names[88] ="sEffectAbsorbFatigue";
+    names[86] ="sEffectAbsorbHealth";
+    names[87] ="sEffectAbsorbSpellPoints";
+    names[89] ="sEffectAbsorbSkill";
+    names[63] ="sEffectAlmsiviIntervention";
+    names[47] ="sEffectBlind";
+    names[123] ="sEffectBoundBattleAxe";
+    names[129] ="sEffectBoundBoots";
+    names[127] ="sEffectBoundCuirass";
+    names[120] ="sEffectBoundDagger";
+    names[131] ="sEffectBoundGloves";
+    names[128] ="sEffectBoundHelm";
+    names[125] ="sEffectBoundLongbow";
+    names[121] ="sEffectBoundLongsword";
+    names[122] ="sEffectBoundMace";
+    names[130] ="sEffectBoundShield";
+    names[124] ="sEffectBoundSpear";
+    names[7] ="sEffectBurden";
+    names[50] ="sEffectCalmCreature";
+    names[49] ="sEffectCalmHumanoid";
+    names[40] ="sEffectChameleon";
+    names[44] ="sEffectCharm";
+    names[118] ="sEffectCommandCreatures";
+    names[119] ="sEffectCommandHumanoids";
+    names[132] ="sEffectCorpus"; // NB this typo. (bethesda made it)
+    names[70] ="sEffectCureBlightDisease";
+    names[69] ="sEffectCureCommonDisease";
+    names[71] ="sEffectCureCorprusDisease";
+    names[73] ="sEffectCureParalyzation";
+    names[72] ="sEffectCurePoison";
+    names[22] ="sEffectDamageAttribute";
+    names[25] ="sEffectDamageFatigue";
+    names[23] ="sEffectDamageHealth";
+    names[24] ="sEffectDamageMagicka";
+    names[26] ="sEffectDamageSkill";
+    names[54] ="sEffectDemoralizeCreature";
+    names[53] ="sEffectDemoralizeHumanoid";
+    names[64] ="sEffectDetectAnimal";
+    names[65] ="sEffectDetectEnchantment";
+    names[66] ="sEffectDetectKey";
+    names[38] ="sEffectDisintegrateArmor";
+    names[37] ="sEffectDisintegrateWeapon";
+    names[57] ="sEffectDispel";
+    names[62] ="sEffectDivineIntervention";
+    names[17] ="sEffectDrainAttribute";
+    names[20] ="sEffectDrainFatigue";
+    names[18] ="sEffectDrainHealth";
+    names[19] ="sEffectDrainSpellpoints";
+    names[21] ="sEffectDrainSkill";
+    names[8] ="sEffectFeather";
+    names[14] ="sEffectFireDamage";
+    names[4] ="sEffectFireShield";
+    names[117] ="sEffectFortifyAttackBonus";
+    names[79] ="sEffectFortifyAttribute";
+    names[82] ="sEffectFortifyFatigue";
+    names[80] ="sEffectFortifyHealth";
+    names[81] ="sEffectFortifySpellpoints";
+    names[84] ="sEffectFortifyMagickaMultiplier";
+    names[83] ="sEffectFortifySkill";
+    names[52] ="sEffectFrenzyCreature";
+    names[51] ="sEffectFrenzyHumanoid";
+    names[16] ="sEffectFrostDamage";
+    names[6] ="sEffectFrostShield";
+    names[39] ="sEffectInvisibility";
+    names[9] ="sEffectJump";
+    names[10] ="sEffectLevitate";
+    names[41] ="sEffectLight";
+    names[5] ="sEffectLightningShield";
+    names[12] ="sEffectLock";
+    names[60] ="sEffectMark";
+    names[43] ="sEffectNightEye";
+    names[13] ="sEffectOpen";
+    names[45] ="sEffectParalyze";
+    names[27] ="sEffectPoison";
+    names[56] ="sEffectRallyCreature";
+    names[55] ="sEffectRallyHumanoid";
+    names[61] ="sEffectRecall";
+    names[68] ="sEffectReflect";
+    names[100] ="sEffectRemoveCurse";
+    names[95] ="sEffectResistBlightDisease";
+    names[94] ="sEffectResistCommonDisease";
+    names[96] ="sEffectResistCorprusDisease";
+    names[90] ="sEffectResistFire";
+    names[91] ="sEffectResistFrost";
+    names[93] ="sEffectResistMagicka";
+    names[98] ="sEffectResistNormalWeapons";
+    names[99] ="sEffectResistParalysis";
+    names[97] ="sEffectResistPoison";
+    names[92] ="sEffectResistShock";
+    names[74] ="sEffectRestoreAttribute";
+    names[77] ="sEffectRestoreFatigue";
+    names[75] ="sEffectRestoreHealth";
+    names[76] ="sEffectRestoreSpellPoints";
+    names[78] ="sEffectRestoreSkill";
+    names[42] ="sEffectSanctuary";
+    names[3] ="sEffectShield";
+    names[15] ="sEffectShockDamage";
+    names[46] ="sEffectSilence";
+    names[11] ="sEffectSlowFall";
+    names[58] ="sEffectSoultrap";
+    names[48] ="sEffectSound";
+    names[67] ="sEffectSpellAbsorption";
+    names[136] ="sEffectStuntedMagicka";
+    names[106] ="sEffectSummonAncestralGhost";
+    names[110] ="sEffectSummonBonelord";
+    names[108] ="sEffectSummonLeastBonewalker";
+    names[134] ="sEffectSummonCenturionSphere";
+    names[103] ="sEffectSummonClannfear";
+    names[104] ="sEffectSummonDaedroth";
+    names[105] ="sEffectSummonDremora";
+    names[114] ="sEffectSummonFlameAtronach";
+    names[115] ="sEffectSummonFrostAtronach";
+    names[113] ="sEffectSummonGoldenSaint";
+    names[109] ="sEffectSummonGreaterBonewalker";
+    names[112] ="sEffectSummonHunger";
+    names[102] ="sEffectSummonScamp";
+    names[107] ="sEffectSummonSkeletalMinion";
+    names[116] ="sEffectSummonStormAtronach";
+    names[111] ="sEffectSummonWingedTwilight";
+    names[135] ="sEffectSunDamage";
+    names[1] ="sEffectSwiftSwim";
+    names[59] ="sEffectTelekinesis";
+    names[101] ="sEffectTurnUndead";
+    names[133] ="sEffectVampirism";
+    names[0] ="sEffectWaterBreathing";
+    names[2] ="sEffectWaterWalking";
+    names[33] ="sEffectWeaknesstoBlightDisease";
+    names[32] ="sEffectWeaknesstoCommonDisease";
+    names[34] ="sEffectWeaknesstoCorprusDisease";
+    names[28] ="sEffectWeaknesstoFire";
+    names[29] ="sEffectWeaknesstoFrost";
+    names[31] ="sEffectWeaknesstoMagicka";
+    names[36] ="sEffectWeaknesstoNormalWeapons";
+    names[35] ="sEffectWeaknesstoPoison";
+    names[30] ="sEffectWeaknesstoShock";
+
+    // bloodmoon
+    names[138] ="sEffectSummonCreature01";
+    names[139] ="sEffectSummonCreature02";
+    names[140] ="sEffectSummonCreature03";
+    names[141] ="sEffectSummonCreature04";
+    names[142] ="sEffectSummonCreature05";
+
+    // tribunal
+    names[137] ="sEffectSummonFabricant";
+
+    if (names.find(effectID) == names.end())
+        throw std::runtime_error( std::string("Unimplemented effect ID ") + boost::lexical_cast<std::string>(effectID));
+
+    return names[effectID];
+}
+
 }
diff --git a/components/esm/loadmgef.hpp b/components/esm/loadmgef.hpp
index 861f66be05..93c59f9cbe 100644
--- a/components/esm/loadmgef.hpp
+++ b/components/esm/loadmgef.hpp
@@ -13,11 +13,23 @@ struct MagicEffect
 {
     enum Flags
     {
-        NoDuration = 0x4,
+        TargetSkill = 0x1, // Affects a specific skill, which is specified elsewhere in the effect structure.
+        TargetAttribute = 0x2, // Affects a specific attribute, which is specified elsewhere in the effect structure.
+        NoDuration = 0x4, // Has no duration. Only runs effect once on cast.
+        NoMagnitude = 0x8, // Has no magnitude.
+        Harmful = 0x10, // Counts as a negative effect. Interpreted as useful for attack, and is treated as a bad effect in alchemy.
+        ContinuousVfx = 0x20, // The effect's hit particle VFX repeats for the full duration of the spell, rather than occuring once on hit.
+        CastSelf = 0x40, // Allows range - cast on self.
+        CastTouch = 0x80, // Allows range - cast on touch.
+        CastTarget = 0x100, // Allows range - cast on target.
+        UncappedDamage = 0x1000, // Negates multiple cap behaviours. Allows an effect to reduce an attribute below zero; removes the normal minimum effect duration of 1 second.
+        NonRecastable = 0x4000,	// Does not land if parent spell is already affecting target. Shows "you cannot re-cast" message for self target.
+        Unreflectable = 0x10000, // Cannot be reflected, the effect always lands normally.
+        CasterLinked = 0x20000,	// Must quench if caster is dead, or not an NPC/creature. Not allowed in containter/door trap spells.
         SpellMaking = 0x0200,
         Enchanting = 0x0400,
         Negative = 0x0800 // A harmful effect. Will determine whether
-                          // eg. NPCs regard this spell as an attack.
+                          // eg. NPCs regard this spell as an attack. (same as 0x10?)
     };
 
     struct MEDTstruct
@@ -30,6 +42,9 @@ struct MagicEffect
         float mSpeed, mSize, mSizeCap;
     }; // 36 bytes
 
+    static std::string effectIdToString(short effectID);
+
+
     MEDTstruct mData;
 
     std::string mIcon, mParticle; // Textures
diff --git a/files/materials/objects.shader b/files/materials/objects.shader
index 45f33774db..525e4ab636 100644
--- a/files/materials/objects.shader
+++ b/files/materials/objects.shader
@@ -256,7 +256,7 @@
 #endif
 
 #if FOG
-        float fogValue = shSaturate((depthPassthrough - fogParams.y) * fogParams.w);
+        float fogValue = shSaturate((length(cameraPos.xyz-worldPos) - fogParams.y) * fogParams.w);
         
         #if UNDERWATER
         // regular fog only if fragment is above water
diff --git a/files/materials/openmw.configuration b/files/materials/openmw.configuration
index ee97451d39..2f84680f0e 100644
--- a/files/materials/openmw.configuration
+++ b/files/materials/openmw.configuration
@@ -1,6 +1,5 @@
 configuration water_reflection
 {
-    fog false
     shadows false
     shadows_pssm false
     mrt_output false
diff --git a/files/materials/terrain.shader b/files/materials/terrain.shader
index 9183595e34..35ce403307 100644
--- a/files/materials/terrain.shader
+++ b/files/materials/terrain.shader
@@ -332,7 +332,7 @@
     
         
 #if FOG
-        float fogValue = shSaturate((depth - fogParams.y) * fogParams.w);
+        float fogValue = shSaturate((length(cameraPos.xyz-worldPos) - fogParams.y) * fogParams.w);
         
         #if UNDERWATER
         // regular fog only if fragment is above water
diff --git a/files/materials/water.shader b/files/materials/water.shader
index 947dc72f5e..6bd277eab6 100644
--- a/files/materials/water.shader
+++ b/files/materials/water.shader
@@ -298,7 +298,7 @@
         }
         else
         {
-            float fogValue = shSaturate((depthPassthrough - fogParams.y) * fogParams.w);
+            float fogValue = shSaturate((length(cameraPos.xyz-position.xyz) - fogParams.y) * fogParams.w);
             shOutputColour(0).xyz = shLerp (shOutputColour(0).xyz, gammaCorrectRead(fogColor), fogValue);
         }
 
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index ae8d3afbed..da8fba62c0 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -75,6 +75,11 @@ set(MYGUI_FILES
     openmw_levelup_dialog.layout
     openmw_wait_dialog.layout
     openmw_wait_dialog_progressbar.layout
+    openmw_spellcreation_dialog.layout
+    openmw_edit_effect.layout
+    openmw_enchanting_dialog.layout
+    openmw_trainingwindow.layout
+    openmw_travel_window.layout
     smallbars.png
     VeraMono.ttf
     markers.png
diff --git a/files/mygui/core_layouteditor.xml b/files/mygui/core_layouteditor.xml
index 740f129cc6..db917b6efe 100644
--- a/files/mygui/core_layouteditor.xml
+++ b/files/mygui/core_layouteditor.xml
@@ -3,7 +3,7 @@
     <MyGUI type="List">
         <List file="core.skin" />
         <List file="openmw_resources.xml" />
-        <List file="openmw.font.xml" />
+        <List file="openmw_font.xml"/>
         <List file="openmw_text.skin.xml" />
         <List file="openmw_windows.skin.xml" />
         <List file="openmw_button.skin.xml" />
diff --git a/files/mygui/openmw_edit_effect.layout b/files/mygui/openmw_edit_effect.layout
new file mode 100644
index 0000000000..45ecb63edf
--- /dev/null
+++ b/files/mygui/openmw_edit_effect.layout
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 362 310" name="_Main">
+
+        <Widget type="ImageBox" skin="ImageBox" position="8 12 16 16" name="EffectImage">
+        </Widget>
+
+        <Widget type="TextBox" skin="NormalText" position="36 8 400 24" name="EffectName">
+            <Property key="TextAlign" value="Left HCenter"/>
+        </Widget>
+
+
+        <!-- Range -->
+        <Widget type="TextBox" skin="NormalText" position="8 36 400 24">
+            <Property key="Caption" value="#{sRange}"/>
+            <Property key="TextAlign" value="Left HCenter"/>
+        </Widget>
+        <Widget type="AutoSizedButton" skin="MW_Button" position="130 36 0 24" name="RangeButton">
+            <Property key="Caption" value="#{sRangeTouch}"/>
+        </Widget>
+
+        <!-- Magnitude -->
+        <Widget type="Widget" position="8 80 400 70" name="MagnitudeBox">
+            <Widget type="TextBox" skin="NormalText" position="0 0 400 24">
+                <Property key="Caption" value="#{sMagnitude}"/>
+                <Property key="TextAlign" value="Left HCenter"/>
+            </Widget>
+
+            <Widget type="TextBox" skin="SandText" position="122 0 210 20" name="MagnitudeMinValue">
+                <Property key="TextAlign" value="Center"/>
+                <Property key="Caption" value="0"/>
+            </Widget>
+            <Widget type="ScrollBar" skin="MW_HSlider" position="122 20 210 13" name="MagnitudeMinSlider">
+                <Property key="Range" value="100"/>
+            </Widget>
+
+            <Widget type="TextBox" skin="SandText" position="122 32 210 20" name="MagnitudeMaxValue">
+                <Property key="TextAlign" value="Center"/>
+                <Property key="Caption" value="0"/>
+            </Widget>
+            <Widget type="ScrollBar" skin="MW_HSlider" position="122 52 210 13" name="MagnitudeMaxSlider">
+                <Property key="Range" value="100"/>
+            </Widget>
+        </Widget>
+
+
+        <!-- Duration -->
+        <Widget type="Widget" position="8 153 400 40" name="DurationBox">
+            <Widget type="TextBox" skin="NormalText" position="0 20 400 24">
+                <Property key="Caption" value="#{sDuration}"/>
+                <Property key="TextAlign" value="Left Top"/>
+            </Widget>
+
+            <Widget type="TextBox" skin="SandText" position="122 0 210 20" name="DurationValue">
+                <Property key="TextAlign" value="Center"/>
+                <Property key="Caption" value="0"/>
+            </Widget>
+            <Widget type="ScrollBar" skin="MW_HSlider" position="122 20 210 13" name="DurationSlider">
+                <Property key="Range" value="1440"/>
+            </Widget>
+        </Widget>
+
+        <!-- Area -->
+        <Widget type="Widget" position="8 197 400 40" name="AreaBox">
+            <Widget type="TextBox" skin="NormalText" position="0 20 400 24" name="AreaText">
+                <Property key="Caption" value="#{sArea}"/>
+                <Property key="TextAlign" value="Left Top"/>
+            </Widget>
+
+            <Widget type="TextBox" skin="SandText" position="122 0 210 20" name="AreaValue">
+                <Property key="TextAlign" value="Center"/>
+                <Property key="Caption" value="0"/>
+            </Widget>
+            <Widget type="ScrollBar" skin="MW_HSlider" position="122 20 210 13" name="AreaSlider">
+                <Property key="Range" value="51"/>
+            </Widget>
+        </Widget>
+
+        <Widget type="HBox" position="8 266 336 24">
+            <Widget type="Widget">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
+
+            <Widget type="AutoSizedButton" skin="MW_Button" name="DeleteButton">
+                <Property key="Caption" value="#{sDelete}"/>
+            </Widget>
+
+            <Widget type="AutoSizedButton" skin="MW_Button" name="OkButton">
+                <Property key="Caption" value="#{sOk}"/>
+            </Widget>
+
+            <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
+                <Property key="Caption" value="#{sCancel}"/>
+            </Widget>
+        </Widget>
+
+    </Widget>
+</MyGUI>
diff --git a/files/mygui/openmw_enchanting_dialog.layout b/files/mygui/openmw_enchanting_dialog.layout
new file mode 100644
index 0000000000..a19c569256
--- /dev/null
+++ b/files/mygui/openmw_enchanting_dialog.layout
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 400" name="_Main">
+
+        <Widget type="HBox" position="12 12 250 30">
+
+            <Widget type="AutoSizedTextBox" skin="NormalText">
+                <Property key="Caption" value="#{sName}"/>
+            </Widget>
+
+            <Widget type="EditBox" skin="MW_TextEdit" position="0 0 30 30" name="NameEdit">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
+
+            <Widget type="Widget">
+            </Widget>
+
+        </Widget>
+
+        <!-- Item -->
+
+        <Widget type="HBox" position="12 48 400 59">
+            <Property key="Spacing" value="8"/>
+
+            <Widget type="AutoSizedTextBox" skin="NormalText">
+                <Property key="Caption" value="#{sItem}"/>
+            </Widget>
+            <Widget type="Button" skin="MW_Box" position="0 0 60 59" name="ItemBox"/>
+
+            <Widget type="Widget" position="0 0 8 0"/>
+
+            <Widget type="AutoSizedTextBox" skin="NormalText">
+                <Property key="Caption" value="#{sSoulGem}"/>
+            </Widget>
+            <Widget type="Button" skin="MW_Box" position="0 0 60 59" name="SoulBox"/>
+
+        </Widget>
+
+
+        <Widget type="TextBox" skin="NormalText" position="320 0 300 24">
+            <Property key="Caption" value="#{sEnchantmentMenu3}:"/>
+        </Widget>
+        <Widget type="TextBox" skin="SandText" position="280 0 258 24" name="Enchantment">
+            <Property key="Caption" value="1"/>
+            <Property key="TextAlign" value="Right HCenter"/>
+        </Widget>
+
+
+        <Widget type="TextBox" skin="NormalText" position="320 24 300 24">
+            <Property key="Caption" value="#{sCastCost}:"/>
+        </Widget>
+        <Widget type="TextBox" skin="SandText" position="280 24 258 24" name="CastCost">
+            <Property key="Caption" value="39"/>
+            <Property key="TextAlign" value="Right HCenter"/>
+        </Widget>
+
+
+        <Widget type="TextBox" skin="NormalText" position="320 48 300 24">
+            <Property key="Caption" value="#{sCharges}"/>
+        </Widget>
+        <Widget type="TextBox" skin="SandText" position="280 48 258 24" name="Charge">
+            <Property key="Caption" value="39"/>
+            <Property key="TextAlign" value="Right HCenter"/>
+        </Widget>
+
+
+        <!-- Available effects -->
+        <Widget type="TextBox" skin="NormalText" position="12 148 300 24">
+            <Property key="Caption" value="#{sMagicEffects}"/>
+        </Widget>
+        <Widget type="MWList" skin="MW_SimpleList" position="12 176 202 169" name="AvailableEffects">
+        </Widget>
+
+        <!-- Used effects -->
+        <Widget type="TextBox" skin="NormalText" position="226 148 300 24">
+            <Property key="Caption" value="#{sEffects}"/>
+        </Widget>
+        <Widget type="Widget" skin="MW_Box" position="226 176 316 169">
+            <Widget type="ScrollView" skin="MW_ScrollViewH" position="4 4 308 161" name="UsedEffects">
+                <Property key="CanvasAlign" value="Left Top"/>
+            </Widget>
+        </Widget>
+
+        <Widget type="HBox" position="0 340 560 60">
+            <Property key="Padding" value="16"/>
+
+            <Widget type="Widget" position="0 0 0 0">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
+
+            <Widget type="AutoSizedTextBox" skin="NormalText">
+                <Property key="Caption" value="#{sBarterDialog7}"/>
+            </Widget>
+            <Widget type="AutoSizedTextBox" skin="SandText" name="PriceLabel">
+                <Property key="Caption" value="30"/>
+            </Widget>
+
+
+            <Widget type="AutoSizedButton" skin="MW_Button" name="BuyButton">
+                <Property key="Caption" value="#{sBuy}"/>
+            </Widget>
+
+            <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
+                <Property key="Caption" value="#{sCancel}"/>
+            </Widget>
+        </Widget>
+
+    </Widget>
+</MyGUI>
diff --git a/files/mygui/openmw_spellcreation_dialog.layout b/files/mygui/openmw_spellcreation_dialog.layout
new file mode 100644
index 0000000000..4992243620
--- /dev/null
+++ b/files/mygui/openmw_spellcreation_dialog.layout
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 400" name="_Main">
+
+        <Widget type="HBox" position="12 12 250 30">
+
+            <Widget type="AutoSizedTextBox" skin="NormalText">
+                <Property key="Caption" value="#{sName}"/>
+            </Widget>
+
+            <Widget type="EditBox" skin="MW_TextEdit" position="0 0 30 30" name="NameEdit">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
+
+            <Widget type="Widget">
+            </Widget>
+
+        </Widget>
+
+        <Widget type="TextBox" skin="NormalText" position="280 0 300 24">
+            <Property key="Caption" value="#{sEnchantmentMenu4}"/>
+        </Widget>
+        <Widget type="TextBox" skin="SandText" position="280 0 258 24" name="MagickaCost">
+            <Property key="Caption" value="1"/>
+            <Property key="TextAlign" value="Right HCenter"/>
+        </Widget>
+
+
+        <Widget type="TextBox" skin="NormalText" position="280 24 300 24">
+            <Property key="Caption" value="#{sSpellmakingMenu1}"/>
+        </Widget>
+        <Widget type="TextBox" skin="SandText" position="280 24 258 24" name="SuccessChance">
+            <Property key="Caption" value="39"/>
+            <Property key="TextAlign" value="Right HCenter"/>
+        </Widget>
+
+
+        <!-- Available effects -->
+        <Widget type="TextBox" skin="NormalText" position="12 48 300 24">
+            <Property key="Caption" value="#{sMagicEffects}"/>
+        </Widget>
+        <Widget type="MWList" skin="MW_SimpleList" position="12 76 202 269" name="AvailableEffects">
+        </Widget>
+
+        <!-- Used effects -->
+        <Widget type="TextBox" skin="NormalText" position="226 48 300 24">
+            <Property key="Caption" value="#{sEffects}"/>
+        </Widget>
+        <Widget type="Widget" skin="MW_Box" position="226 76 316 269">
+            <Widget type="ScrollView" skin="MW_ScrollViewH" position="4 4 308 261" name="UsedEffects">
+                <Property key="CanvasAlign" value="Left Top"/>
+            </Widget>
+        </Widget>
+
+        <Widget type="HBox" position="0 340 560 60">
+            <Property key="Padding" value="16"/>
+
+            <Widget type="Widget" position="0 0 0 0">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
+
+            <Widget type="AutoSizedTextBox" skin="NormalText">
+                <Property key="Caption" value="#{sBarterDialog7}"/>
+            </Widget>
+            <Widget type="AutoSizedTextBox" skin="SandText" name="PriceLabel">
+                <Property key="Caption" value="30"/>
+            </Widget>
+
+
+            <Widget type="AutoSizedButton" skin="MW_Button" name="BuyButton">
+                <Property key="Caption" value="#{sBuy}"/>
+            </Widget>
+
+            <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
+                <Property key="Caption" value="#{sCancel}"/>
+            </Widget>
+        </Widget>
+
+    </Widget>
+</MyGUI>
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index 148e98064f..514d1a25b3 100644
--- a/files/mygui/openmw_tooltips.layout
+++ b/files/mygui/openmw_tooltips.layout
@@ -196,6 +196,31 @@
             </Widget>
         </Widget>
 
+        <!-- Magic effect tooltip -->
+        <Widget type="Widget" skin="HUD_Box_NoTransp" position="0 0 300 52" align="Stretch" name="MagicEffectToolTip">
+            <Property key="Visible" value="false"/>
+
+            <Widget type="ImageBox" skin="ImageBox" position="8 8 32 32" align="Left Top" name="MagicEffectImage"/>
+
+            <Widget type="TextBox" skin="NormalText" position="44 8 252 16" align="Left Top HStretch" name="MagicEffectName">
+                <Property key="TextAlign" value="Left"/>
+                <UserString key="AutoResizeHorizontal" value="true"/>
+            </Widget>
+
+            <Widget type="TextBox" skin="SandText" position="44 24 252 16" align="Left Top HStretch" name="MagicEffectSchool">
+                <Property key="TextAlign" value="Left"/>
+                <UserString key="AutoResizeHorizontal" value="true"/>
+            </Widget>
+
+            <Widget type="EditBox" skin="SandText" position="8 44 284 0" align="Left Top Stretch" name="MagicEffectDescription">
+                <Property key="MultiLine" value="true"/>
+                <Property key="WordWrap" value="true"/>
+                <Property key="TextAlign" value="Left Top"/>
+                <UserString key="AutoResizeHorizontal" value="true"/>
+                <UserString key="AutoResizeVertical" value="true"/>
+            </Widget>
+        </Widget>
+
     </Widget>
 </MyGUI>
 
diff --git a/files/mygui/openmw_trainingwindow.layout b/files/mygui/openmw_trainingwindow.layout
new file mode 100644
index 0000000000..c58bd0ab3a
--- /dev/null
+++ b/files/mygui/openmw_trainingwindow.layout
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 319 200" name="_Main">
+
+        <Widget type="TextBox" skin="NormalText" position="0 5 319 24" name="Select" align="Right Top">
+            <Property key="TextAlign" value="Center"/>
+            <Property key="Caption" value="#{sServiceTrainingTitle}"/>
+        </Widget>
+        <Widget type="TextBox" skin="SandText" position="5 30 319 24" name="Travel" align="Right Top">
+            <Property key="TextAlign" value="Left"/>
+            <Property key="Caption" value="#{sTrainingServiceTitle}"/>
+        </Widget>
+
+
+        <Widget type="Widget" skin="MW_Box" position="6 54 299 100" align="Left Top" name="TrainingOptions">
+        </Widget>
+
+
+        <Widget type="TextBox" skin="SandText" position="8 161 200 24" name="PlayerGold" align="Right Top">
+            <Property key="TextAlign" value="Left"/>
+        </Widget>
+        <Widget type="AutoSizedButton" skin="MW_Button" position="244 161 60 24" name="CancelButton" align="Right Top">
+            <Property key="ExpandDirection" value="Left"/>
+            <Property key="Caption" value="#{sCancel}"/>
+        </Widget>
+
+    </Widget>
+
+</MyGUI>
diff --git a/files/mygui/openmw_travel_window.layout b/files/mygui/openmw_travel_window.layout
new file mode 100644
index 0000000000..07a6daf489
--- /dev/null
+++ b/files/mygui/openmw_travel_window.layout
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 300" name="_Main">
+        <Property key="Visible" value="false"/>
+
+
+        <Widget type="TextBox" skin="SandText" position="8 10 24 24" name="Select" align="Right Top">
+            <Property key="TextAlign" value="Right"/>
+            <Property key="Caption" value="#{sTravelServiceTitle}"/>
+        </Widget>
+        <Widget type="TextBox" skin="SandText" position="0 0 24 24" name="Travel" align="Right Top">
+            <Property key="TextAlign" value="Right"/>
+            <Property key="Caption" value="#D8C09A#{sTravel}"/>
+        </Widget>
+
+
+        <Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="ALIGN_LEFT ALIGN_STRETCH">
+            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="ALIGN_LEFT ALIGN_TOP ALIGN_STRETCH" name="DestinationsView">
+                <Property key="CanvasAlign" value="Left"/>
+            </Widget>
+        </Widget>
+
+
+        <Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top">
+            <Property key="TextAlign" value="Right"/>
+        </Widget>
+        <Widget type="AutoSizedButton" skin="MW_Button" position="375 260 60 24" name="CancelButton" align="Right Top">
+            <Property key="ExpandDirection" value="Left"/>
+            <Property key="Caption" value="#{sOK}"/>
+        </Widget>
+
+    </Widget>
+
+</MyGUI>
\ No newline at end of file
diff --git a/files/openmw.desktop b/files/openmw.desktop
index 234f660c62..118cd3bbe6 100644
--- a/files/openmw.desktop
+++ b/files/openmw.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Version=${OPENMW_VERSION}
 Type=Application
 Name=OpenMW Launcher
 GenericName=Role Playing Game
diff --git a/libs/openengine/ogre/fader.cpp b/libs/openengine/ogre/fader.cpp
index 6965ffc78b..9390d06647 100644
--- a/libs/openengine/ogre/fader.cpp
+++ b/libs/openengine/ogre/fader.cpp
@@ -40,7 +40,7 @@ Fader::Fader(Ogre::SceneManager* sceneMgr)
     Ogre::SceneNode* node = mSceneMgr->getRootSceneNode()->createChildSceneNode();
     node->attachObject(mRectangle);
     mRectangle->setVisible(false);
-    mRectangle->setVisibilityFlags (0x01);
+    mRectangle->setVisibilityFlags (2048);
 }
 
 Fader::~Fader()