diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..ebd76f5e4
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,31 @@
+name: Run Gradle build on push
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-          
+      - name: Build with Gradle
+        run: ./gradlew build
+      - name: Cleanup Gradle Cache
+        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
+        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
+        run: |
+          rm -f ~/.gradle/caches/modules-2/modules-2.lock
+          rm -f ~/.gradle/caches/modules-2/gc.properties        
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 8a7d02425..c3b7aabab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.ipr
 *.iml
 out/
+.idea/
 
 # Eclipse
 .project
@@ -17,6 +18,6 @@ bin/
 build/
 .gradle/
 
-gradle.properties
-
+*.log
 
+.DS_Store
diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 7cfdc4d49..000000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,31 +0,0 @@
-[0.6.0]
-- COMPOSER: fix package naming when creating ios project
-
-[0.5.0]
-- Updated to libgdx 1.4.1
-- ENGINE: Debug screen with speed control, record/play games and go to any scene in runtime
-- ENGINE: Material style buttons in engine UI. Better look and feel for inventory and pie menu.
-
-[0.4.0]
-- ENGINE: Custom game UI Screen support
-
-[0.3.2]
-- COMPOSER: Fixed bug when running project without console
-
-[0.3.1]
-- COMPOSER: Fixed accessing opengl context issue when creating project in the new thread.
-
-[0.3.0]
-- ENGINE: Action refactoring. WARNING: Names have changed. All previous games are not compatible.
-- ENGINE: New DebugScreen (Work in progress)
-- ENGINE: Change speed support for fastforward.
-- ENGINE: The blade-engine.jar are now in Maven Central. When creating a new game, the Maven dependency is added instead of adding the engine jar in libs folder.
-
-[0.2.0]
-- COMPOSER: Fixed NullPointer error when creating project
-- COMPOSER: Threads for long tasks to show UI message status
-- COMPOSER: FIXED packaging with embedded JRE.
-- ENGINE: CreditsScreen fonts now obtained from Skin
-
-[0.1.0]
-- Initial release
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..7f542ff91
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,976 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [4.3.1]
+
+- Bugfix small font size.
+- Update libgdx v1.12.1.
+
+## [4.3.0]
+
+- Fallback fonts/multiple fonts files to support dynamic font changing needed for Chinese and other logographic
+  languages.
+- Upgrade gradle + robovm + android plugin to latest versions.
+- Bugfix when adding a new item to a Ink list.
+
+## [4.2.0]
+
+- EDITOR: Latest Inklecate and build JDK can be downloaded from the editor.
+- EDITOR: Disable Particle Editor button. It doesn't support LWJGL3.
+- LWJGL3 backend for desktop. That means support for JDK 17 and ARM architectures.
+- TextRenderer now supports maxWidth.
+- Smooth animation to center camera after finishing walking.
+- Show text in screen at least for 0.5secs before skipping it.
+- Delete 3D support.
+- Now we can use ':' in Ink to indicate the actor talking. '>' is still supported.
+- Updated Blade Ink to v1.1.2.
+- Minimum supported iOS version to 11.0.
+- Bump spine runtimes to v4.1.0.
+- Updated libgdx to v1.12.0.
+- Updated packr version.
+- A lot of bugs fixed (see git log).
+
+## [4.1.0]
+
+- EDITOR: Text filter for scene and actor lists.
+- EDITOR: Button to show/hide actors in the scene.
+- Ink: Support for multi flow.
+- InkRunAction can pass params to Ink paths.
+- New InkCancelAction action.
+- Updated Blade Ink to v1.0.0.
+- Updated libgdx to v1.10.0.
+- Updated packr version.
+
+## [4.0.2]
+
+- Controller (gamepad) support.
+- .aab package generation for Android.
+- In panel showing choose options, up/down buttons now have animation.
+- Update libgdx to latest version 1.9.13.
+- Better Ink text extraction for I18N.
+- Fix: Bug deleting animation if initial animation is not set.
+
+## [4.0.1]
+
+- Fix error serializing cb when Ink library is not used.
+- Fix error creating resolution when there are atlases with subfolders.
+- Fix Android launcher to make expansion files (.obb) works again.
+
+## [4.0.0]
+
+- Fix error when android keystore path had spaces.
+- Added scene counter in the editor ui.
+- Updated ios minosversion to 8.
+- Better calc of speed when walking and fake depth is used.
+
+## [3.2.5]
+
+- Some validations adding/editing animations and verbs to avoid errors.
+- Fixed dealing with OpenAL bug in credits screen.
+- Fixed bug extracting ink texts.
+
+## [3.2.4]
+
+- Added more external functions for Ink.
+- Added support to load/save game preferences.
+- Scale and Rotate actions now work with ui actors.
+- Many bugs fixed.
+
+## [3.2.3]
+
+- Added "initVerb" param to the "Leave" action. This verb will be executed if set instead of the "init" verb.
+- Now, the "init" verb doesn't run if the "test" verb is executed.
+- Load/Save preferences support.
+- Allow to move BaseActors in MoveToSceneAction.
+- FIX: Scale and Rotate actions didn't work with ui actors.
+- Save also callbacks that are not in the current scene.
+
+## [3.2.2]
+
+- Inventory button style now in the InventoryUI style. This allows to customize the inventory button by player.
+- Update Blade Ink to v0.7.3 which fixes an important bug.
+- A lot of bugs fixed (see git log).
+
+## [3.2.1]
+
+- Added bubble positioning parameters on ui.json.
+- Better multiple inventory support in actions.
+- Better Spine skin handling.
+- Update Blade Ink to v0.7.2.
+- A lot of bugs fixed (see git log).
+
+## [3.2.0]
+
+- Say Action: Talk animation also for text types PLAIN and SUBTITLE.
+- Only save modified actor properties on savegames.
+- New SetDesc action to change the actor descriptions.
+- Added 'show_hotspots' config key to enable/disable the show hotspots feature.
+- Added INSIDE property to IfAttrProperty action to check if an actor is inside other actor.
+- Improve size of chapter files and savegames.
+- Updated libgdx to v1.9.10
+- Updated Spine to v3.8.
+- Update gradle to v5.4.1
+
+## [3.1.2]
+
+- Animated ui icons and cursors.
+- Update RoboVM to v2.3.7.
+- Don't extract string expresions from ink files for i18n.
+- Allow empty values in Property action.
+- Added public methods to the SpineRenderer to get access to the current skeleton and animation.
+
+## [3.1.1]
+
+- Dialog to create the android keystore inside the editor.
+- Label and text to warn about legacy dialogs.
+- Added RandomPosition action.
+- Added reload assets icon to scene list.
+- Added support for combining skins in Spine.
+- Delete last_project key if loadproject fails so the editor doesn't fail forever.
+- Delete SetModelProp action and supporting library. It was not useful and make porting dificult.
+- Added IN_UI if property.
+- Fix: Now search in all inventories.
+- Fix: Set skin now updates properly.
+
+## [3.1.0]
+
+- Update Spine runtime to v3.7
+- Dialog to compile Ink stories.
+- Show 'Saved game' text when saved game to give user feedback.
+
+## [3.0.0] aka Johnny Bonasera 3
+
+- Ink button in editor to link Ink stories with chapters.
+- Better handling of up/down buttons when showing options.
+- Improved debug info and fix tester bot.
+- Update vis-ui lib to latest stable.
+- FIX: Show warning message when a game is playing also if not saved before.
+- FIX: Bug in edit anim spine atlas.
+- FIX: Several fixes in InkManager handling concurrency.
+- FIX: uiactors camera refresh.
+- FIX: Bug saving current dialog actor.
+- FIX: 'desktop:dist' task in template.
+
+## [2.2.0]
+
+- Java 11 support (Gradle v4.10.2).
+- Update to libgdx v1.9.9.
+- iOS 12 bug fix (robovm v2.3.5).
+- Added property to change the text position of bubbles for character actors.
+- Add max width/height in the create atlas dialog.
+- Android SDK is not mandatory to create or edit projects.
+- A lot of bugs fixed (see git log).
+
+## [2.1.4]
+
+- Now the editor works without having the Android SDK installed.
+- FIX: Bug when moving target actor.
+- FIX: Bug in 'Transition' action.
+- FIX:'actorTextPosition' property in 'SetActorAttr' action wasn't working.
+
+## [2.1.3]
+
+- Support for several walkzones in a scene. Now walkzones are also actors.
+- Added icons to translate, scale and rotate actors in editor.
+- Android: Added runtime permission query when necessary to make expansion files work in newer android apis.
+- EDITOR: Added play in fullscreen option.
+- Added talking text position to characters.
+- Update Blade Ink to v0.5.1.
+- FIX: Reset pointer always when updating UI to avoid showing last pointer when changing scene.
+- FIX: Bad bubble alignment showing small texts.
+- FIX: Bug creating/deleting chapters in editor.
+- FIX: The current scene was setting twice when loading a saved game triggering an error.
+- FIX: The dialog option was showing for 1 frame when autoselected enabled.
+
+## [2.1.2]
+
+- Sprite Actors can have different scales in X and Y axis allowing unproportional scaling.
+- Check project version before loading + show loading message.
+- Fix gradle deprecation warnings.
+- Continue loading custom classes if some error found in one of them.
+
+## [2.1.1]
+
+- Fix several UI bugs: inventory button doesn't hide, dialog not working well when autoselect one option and text
+  doesn't show when returning to a scene without init.
+- Add -s parameter to DestkopLauncher.
+
+## [2.1.0]
+
+- TextManager now sets the talk animation for characters. This ease characters to have conversations in the background.
+- Code refactor to get rid of the 'World' singleton. This breaks custom action backwards compatibility.
+- Leave action have the param 'init' to avoid call the init verb when false. This allows to change between scenes
+  without worrying about losing the state.
+- Update blade-ink lib to v0.5.0.
+- Upgrade to gradle 2.6. Maybe it needs some more tweaks.
+- Added new text type 'UI' to show debug or ui messages.
+- Added one click 'action' verb.
+- Don't use ref point in position actions if the target actor is the same that the current actor.
+- All intensive tasks (load music, voices and ink) are now executed in a background thread.
+- FIX: filteredbox height bigger than screen and don't show the last element.
+
+## [2.0.6]
+
+- All intensive tasks (load music, voices and ink) are now executed in a background thread.
+
+- Added search box to combo boxes.
+- Added desktop files to generate Flatpak package.
+- Don't generate the key for desc if exists when editing actor. Better generation of not duplicated keys.
+- Safety nullchecks.
+- Error message if actor with same id exists when adding an actor to scene.
+- RunVerb now uses the Verb IP.
+- Added search box to combo boxes.
+- Added desktop files to generate Flatpak package.
+
+## [2.0.2]
+
+- FIX: Stop voices when changing scene.
+- FIX: Volume action musn't wait if duration=0
+- FIX: Changes to try to fix the OpenAL error in desktop
+
+## [2.0.1]
+
+- Added option to the create atlas dialog to allow generating .jpg atlases.
+- Added build script custom parameter input box in the package dialog.
+- FIX: Capture random music error on desktop in credit screen.
+
+## [2.0.0]
+
+- HelpScreen doesn't stretch in 4:3 aspect ratio.
+- InkManager translation files support.
+- Import ink texts in order. Better I18N checks.
+- Add music volume fade support in MusicVolume action.
+- VoiceManager doesn't hide texts, now waits to the calc time.
+- FIX: bug when saving ink cb.
+
+## [1.3.5]
+
+- Added Spine's skins support.
+- Choose the best matching 'use' verb when target and inventory actor have it.
+- Added pitch parameter to sounds.
+- Updated libgdx to v1.9.8.
+- Special keys (testerbot, record, play, etc) only enabled in debug mode.
+- Delete red tint in hotspots.
+- Added sound input panel.
+- FIX: Error in walking path calculation.
+- FIX: running test scene in android.
+- FIX: bad viewport configuration when pausing and restore the qqqgame when screen in 4:3.
+- FIX: bug when setting ink property if it doesn't exists after load game.
+- FIX: getCurrentTarget() in RunVerbAction.
+- FIX: sound list reload when changing chapters.
+- FIX: main class detection in desktop packaging.
+- FIX: error reading Cb from InkManager.
+- FIX: particles and bboxfromrenderer for resolutions other than 1.
+
+## [1.3.4]
+
+- Added currentTarget to verbs.
+- Null checks in SoundManager before pause/resume sounds.
+- Fix loading callbacks from saved inventories.
+- Fix: Loop, volume and pan was not used when playing a sound.
+- Missing fbo dispose.
+- Fix: toString() instead of casting in getModelProp.
+
+## [1.3.3]
+
+- Added 'textStyle' attribute to character actors.
+- Added basic QA rules/metrics of project.
+- EDITOR: Understand SNAPSHOT versions when checking for updating versions.
+- Actor 'tint' property are now used to draw inventory actors when dragged.
+- Catch back key in android.
+- Added load chapter option to the debug screen.
+- Fix not showing saved games in tests folder.
+- Fix error removing all items from inventory in 'DropItem' action.
+- Fix error creating screenshots for savedgames in Mac.
+- Fix crash when screenshot of a savegame doesn't exists.
+
+## [1.3.2]
+
+- Added Google Play expansion file support.
+- Added 64 and 32 bit support when generating package for windows. Previously only 64 bits was supported.
+- Bigger edit toolbar icons.
+- Create initial scene in new projects.
+- Fix: Recorder not recording dialog options.
+- Add target scene to DropItemAction and mark RemoveInventoryItem action deprecated.
+- Updated to libgdx v1.9.7.
+- EDITOR: Fix testing not working with scenes with spaces in ID
+- EDITOR: Fix nullpointer error when disabled imagen not exists.
+- EDITOR: Fix bug when undo bbox points.
+
+## [1.3.1]
+
+- Asset folder is created now in the project root.
+- Updated Gradle to v4.0.2
+- FIX sound error preventing to save the game.
+
+## [1.3.0]
+
+- New Sound System. Now adding sounds is more usable. Backwards compatibility preserved.
+- World properties can also be set in BladeEngine.properties.
+- Added PLATFORM property.
+- Added OpenURL action.
+- Added actions for accessing to Ink variables: InkVariable and IfInkVariable actions.
+- Added DIRECTION attribute to IfActorAttr action.
+- Initial support for assets in the root folder.
+- Ink: Change the ':' character talk separator by '>'.
+- Set actor fake depth as boolean.
+- Custom icon support for the 'leave' verb.
+- Updated blade-ink to v0.4.3.
+- Updated InGameConsole to v0.7.1.
+- 'world.json' is now called 'world'. Old files can still be loaded.
+- EDITOR: Add refPoint to the EditActorDialog.
+- EDITOR: Undo bbox points, depth markers, ref. points and walkzone points.
+- EDITOR: Added zoom keys: '+' and '-'.
+- EDITOR: Filter .zip files in File Input Dialog when selecting JRE in the package dialog.
+- And many fixes Fixes.
+
+## [1.2.7]
+
+- Added secondary animation support for Spine actors.
+- Added 'keepDirection' param to Animation action.
+- Added 'target' actor to position in Camera action.
+- Added 'LAYER' and 'IN_SCENE' params in IfAttr action.
+- Updated Spine plugin to latest Spine version.
+- Updated blade-ink dependency to v0.4.2
+- Added title image and aligment to the menu screen.
+- EDITOR: Edit Animation dialog now sets the initial source based in previous sources.
+
+## [1.2.6]
+
+- Actors in inventory can be animated now.
+- Added UI actors: Actors that stays in all scenes not affected by scrolling nor any other scene camera effect. Normally
+  used to create UI buttons.
+- Multiline texts can have a voice file per line using a '#' mark in each line.
+- Check for Ink engine errors after each line.
+- FIX: SpineRenderer serialization error when loading.
+- FIX: error loading objects in inventory when they have changed from layer.
+
+## [1.2.5]
+
+- Update Robovm to v2.3.1 fixing problems with the latest XCode update.
+- FIX: VoiceManager show log and continues when the voice file is not found instead of crash.
+- FIX: voice was mandatory in the edit option dialog.
+- FIX: Show only the first line of comment actions in the action list.
+
+## [1.2.4]
+
+- NEW BIG FEATURE: Voice support.
+- OSX Sandbox support to support releasing the game in the Mac App Store.
+- Updated Spine engine to v3.5.51
+- When adding new assets throught the Asset List view, create the asset folder if it doesn't exist.
+- FIX: Scene parameter in LoadChapterAction incorrect.
+- FIX: Scale and Rotation actions.
+- FIX: Loading integer atributes in actions.
+- FIX: Serialization error in TextManager.
+
+## [1.2.3]
+
+- Added 'ignoreWalkZone' parameter to Goto.
+- Get rid of SpriteActor restriction in PositionAnim target.
+- Update to gradle v3.4.1
+- EDITOR: Dialogs can exit the editor borders.
+- EDITOR: Scroll the actor list when actor is selected in ScnWidget.
+- FIX: bad rotation in Spine actors.
+- FIX: Error disposing source in getInternalAnimations.
+- FIX: Add WHITE tint to Sprite actor in anim if the actor doesn't have
+  it.
+
+## [1.2.2]
+
+- Added I18N support to Text Actors.
+- New AlphaAnimation action to animate the alpha channel of sprite actors.
+- Added 'orgAlign' to Sprite Actors to set the origin for scale and rotation.
+- Updated library libgdx to v1.9.6
+- AnimationRenderer refactor.
+- Added text align to text actors.
+- FIX: tint for text actors not working.
+- FIX: Error saving/loading tweens state.
+- EDITOR: Added icons for text and particle actors.
+- EDITOR FIX: Problem when changing id to animations.
+
+## [1.2.1]
+
+- Added music support to the default Menu screen.
+- Added rotation property to SetActorAttr action.
+- FIX: Check if renderer is an AnimationRenderer when changing the selected animation in the editor.
+- FIX: Error disposing Spine actors when creating new project.
+- FIX: Error creating new project in Linux and MacOS due to CRLF in gradlew.
+
+## [1.2.0]
+
+- Added particle effect actors.
+- Added text actors.
+- Added rotation to actors.
+- Several improvements to the ink integration. Updated 'blade-ink' package to v0.4.0.
+- Updated 'packr' package to the latest version.
+- Toggle debug mode tapping in the menu version label.
+- Autodetect the Android SDK version installed.
+- EDITOR: Show actor position when editing actor for precision positioning.
+- EDITOR: Added color selector dialog for color input.
+- EDITOR FIX: Init animation was not showing properly.
+
+## [1.1.1]
+
+- Added new action to add an integer value to a property to increment/decrement it. Useful to create counters.
+- Add MacOS .icon when packaging.
+- Add .app extension to the MacOS package.
+- Added autoselect style property to the DialogUI.
+- Ink support cleanup.
+- FIX: music was stopped changing from scene when a change to the
+  loading screen was needed.
+
+## [1.1.0]
+
+- Ink support. (http://www.inklestudios.com/ink/)
+- Update libgdx version to 1.9.5.
+- Improve text styles in ui.json for TextManager.
+- Added 'target' parameter to TextAction.
+- Added tint/color animation support.
+- Added interpolation to camera animation.
+
+## [1.0.3]
+
+- FIX: error loading recordings from 'tests' folder.
+
+## [1.0.2]
+
+- Added support to have several games packaged in the same application.
+- Reset previous walk animation before new walk animation added.
+
+## [1.0.1]
+
+- Music not working for iOS in CreditScreen
+- EDITOR: FIX bug when setting the init scene. The document wasn't marking as modified.
+
+## [1.0.0]
+
+- Images can be localized now.
+- Added xxxhdpi icon folder to Android.
+- Better scroll handling in text areas.
+- Added "show console" checkbox in the view menu.
+
+## [0.9.19]
+
+- EDITOR: Use libgdx FileChooser and get rid of JavaFX to avoid freezing when loading projects.
+- EDITOR: Added UI Atlas import/export buttons in Tools menu.
+- EDITOR: Added scroll bars to Text Boxes.
+- EDITOR: Add "clean" target in IOS because the app is not signing well if not cleaning first.
+
+- Added tags to Skin styles to increase the ui.json readability.
+- Better scroll amount calculation in dialog ui scroll buttons.
+
+- FIX: error when loading project with custom actions. Not detecting no compiled project properly.
+- FIX: DisableAction must not be visible in the action combo.
+- FIX: The editor was losing the scroll focus when the log console was shown.
+
+## [0.9.18]
+
+- EDITOR: The Action list now supports multiple selection to copy, paste, show... use Shift and Ctrl keys to
+  multiselect.
+- EDITOR: Added console log. Use F1 key to show/hide.
+- EDITOR: Better scrollbars. Always showing now.
+- Now the editor generates IOS packages ready to submit to the Apple Store. Fixed several config parameters related to
+  this problem.
+- Added "Comment" action.
+- Updated packr to v2.0. Better desktop packages are generated now.
+- Dialog option UI now shows buttons to scroll add and down when necessary. New styles added to ui.json.
+- Added parameter in TextManagerUI style inside ui.json to set the subtitle Y position.
+- Improvement to the pathfinder. Now the clap algorithm always returns a point inside the polygon.
+- In IOS platform, sounds and music in ACC (.m4a) format are used if exists. As .ogg is not supported in IOS.
+- FIX: The name of the loaded chapter was not set correctly, causing saved games not loading the current chapter.
+- FIX: Weird bug. Use toUpperCase with Locale.English to read enum values.
+- FIX: Bad IOS splash screen orientation.
+
+## [0.9.17]
+
+- Updated libgdx library to v1.9.4.
+- Added null sanity check for actor parameter in SayAction.
+
+## [0.9.16]
+
+- NEW FEAUTRE: The text manager can now show a character image/icon in texts.
+- Added MusicVolumeAction
+- Play recorded game directly if passed as parameter in command line.
+- Added relative position to target in position and goto actions.
+- Added animation param to SayAction.
+- Added -aspect parameter to desktop launcher.
+- Update spine plugin to latest spine runtime version.
+- EDITOR: Save/Restore version in package dialog.
+- EDITOR: Save/Restore selected scene.
+- EDITOR: Show verb panel when no actor is selected to allow adding scene and
+  world verbs.
+
+- FIX: Reset UI when changing scene.
+- FIX: CameraAction animation params not mandatory.
+- FIX: Android Test: Uninstall android debug version before install.
+- FIX: Count default value in AnimationAction.
+- FIX: SceneActorInputPanel getText() when no actor is selected.
+- FIX: bug pasting spine actors.
+
+## [0.9.15]
+
+- Ask for updating the engine version of the game if the editor detects that is old.
+- Custom actions now are autodetected by the editor and handled as engine actions.
+- Save view menu state.
+- Show project path in window title.
+- Select 'init' scene when loading a project.
+- Ask for saving current project when loading or creating new project.
+- Added preload parameter to sounds to avoid loading all scene sounds in init.
+- FIX: Music was not restored from savedgames.
+- FIX: Error in REVERSE_REPEAT animations.
+
+## [0.9.14]
+
+- Multiinventory support.
+- EDITOR: Fix when adding custom actions.
+
+## [0.9.13]
+
+- Added new buttons in the Tools menu to test the scene in Iphone/Ipad emulator and device.
+- Support for changing players in runtime: Added $PLAYER variable.
+- Added actor Tint attribute to allow lighting effects.
+- EDITOR: Disable not working HTML platform.
+- Update RoboVM to Mobidevelop 2.1.0 release.
+- Added 'initNewGame' and 'initSavedGame' verbs to allow calling actions when a game is started or loaded.
+- Fix error in text position when drawing SUBTITLE texts.
+- Fix action color serialize.
+- DialogUI gets scrollbar style.
+- Update fonts for better language support.
+- Fix bug when loading project and scene scope is selected.
+- Delete unused 'delay' field in AnimationDesc.
+- Fix: bug in yoyo animatinons.
+
+## [0.9.12]
+
+- Added Refpoint to interactive actors.
+- Support for fast leave scene when double click.
+- Updated Spine Runtime library to latest Spine release.
+- Updated to libgdx v1.9.3
+
+## [0.9.11]
+
+- Unicode character support. Previously only ISO-8859-1 character set was supported.
+- Shadow and outline font support.
+- Editor fonts are now .ttf
+- Added "Single Action" support to inventory.
+- FIX: Hide inventory in cutmode
+- EDITOR: Avoid dragging object by mistake when clicked to select it.
+- FIX: Multiply position by scale for multiresolution support in TextAction.
+- Better tolerance handling when dragging inventory objects.
+- FIX: Use screen height instead of world height for size calculation in InventoryUI.
+
+## [0.9.10]
+
+- FIX: Bad width calculation in DialogUI.
+- Change help screen language in runtime.
+- Sets Ctrl+d to toggle debug mode.
+- Catch 'BACK' key in android.
+
+## [0.9.9]
+
+- New music engine.
+- I18N: language change support in runtime.
+- EDITOR: Added I18N tools for importing and exporting texts in .tsv format for translation.
+- EDITOR: Added button to play sounds in EditSoundDialog and SoundList.
+- Added methods to MenuScreen to ease extension.
+- FIX: Get desktop launcher properly when packaging.
+- FIX: EndGameAction now returns true to stop the verb execution.
+- FIX: bug playing music in credit screen.
+- Doesn't play animation sounds when animation is in reverse mode.
+- FIX: Pass debug flag when testing scene.
+- FIX: In EditableSelectBox, check empty list before setting default value.
+
+## [0.9.8]
+
+- Show only ui state and time in screen debug text
+- Add 'id' attribute to SoundFX.
+- FIX: Pausing sounds when show menu.
+- Support new properties in 'if' actions: in_inventory, interactive, current scene, previous scene and target actor in '
+  use' verbs
+- FIX: It was cleaning sound list when disposing sounds.
+- FIX: bug when disposing Spine and sound assets.
+- SoundAction: Delete stop parameter. Now the current sound stops if the play parameter is empty.
+- EDITOR: Disable Spine event handling in editor.
+- FIX: Flickering due to swapBuffer.
+- More fault tolerant when loading actions: Action field not found.
+- Change stopSound from actor for stopCurrentSound
+- Doesn't play spine events in reverse mode. Spine doesn't works well in that case, maybe a spine bug?
+- EDITOR: New View and Tools menu. 'Run on Android device' button.
+- FIX: Inventory capacity error. Inventory now change its item size dynamically to increase his capacity.
+- FIX: Bug obtaining the window title from properties in desktop launcher.
+- FIX: bug saving interpolation
+- Automatic generation of versions.properties
+- Better version handling when packaging for android.
+- Show game version in menu screen.
+- Update UI ATLAS
+- FIX: EDITOR bug in zindex not setting for interactive actor when editing.
+- FIX: EDITOR bug setting interaction property in editor. Better interaction property handling.
+- Prevent event trigger when retrieving assets
+- FIX: added hotspot image
+- 'Remove Savegame' button size depends on dpi
+
+## [0.9.7]
+
+- Better Load/Save game screen.
+- Confirmation dialog when overwrite current game in new game or load game.
+- Updated spine plugin to Spine v3
+- Show time in debug. Time is now long to avoid float overflow.
+- Updated to libgdx 1.9.1
+- Android SDK not mandatory when creating a project.
+- More fault tolerant when loading saved games. Good for patches.
+- Saved games can be stored in 'tests' folder inside game. These games are distributed with the game and in debug mode
+  these saved games can be loaded. Good for testing.
+- When creating a verb an icon can be specified. This icon will be showed in the UI.
+- Add movement to the inventory button when picking an object.
+- Doesn't hide inventory when running a verb.
+- And tons of bug fixing.
+
+## [0.9.6]
+
+- Layer parallax feature
+- Several fixes in atlasrenderer related with drawing atlases with striped whitespaces
+- Drop lightmap support
+- Fix inventory loading bug
+- Fix inventory auto width calc
+- Change default character actor speed
+- Editor: add combo values in world props
+- EDITOR: Fix losing player attr when editing actor.
+- EDITOR: HTML not supported message
+- Fix checking if a path is absolute in windows.
+- Avoid nullpointer when lookat if animation doesn't exists in 3d sprite
+- EDITOR: fixed NullPointer error when creating 3d sprite actor.
+- Drop XML Loader
+
+## [0.9.5]
+
+- ENGINE: Added infinity text duration when duration < 0.
+- ENGINE: fix: ImageRenderer check if currentAnimation==null in toString()
+- EDITOR: align left actor panel to left. To always show the '+' button.
+- ENGINE: fix sceneextendviewport world size calc.
+- ENGINE: NEW ScreenPositionAction
+- EDITOR: fixed bug when editing assets
+- EDITOR: Fixed bug in TextInputPanel when text=null
+- EDITOR: Fixed Issue #25. Error deleting elements from lists.
+- EDITOR: fix: change world.json SayAction changed for LookatAction
+- EDITOR: fix bug when paste IfAttr actions.
+- EDITOR: Fix generated build.gradle BladeEngine.properties path reference when updating versions.
+
+## [0.9.4]
+
+- Compile custom classes when not found in loading project.
+- Fix issue #23: Edit an existing actor
+- Sets editor window size to 0.9 * screen size
+- Better version control:
+    - Extract version strings from build.gradle to gradle.properties in games.
+    - Put versions in BladeEngine.properties when compiling games.
+    - Show versions in DebugScreen
+    - Added version to game model and saved games for further checks.
+    - Put version variables in game gradle.properties
+- Bug fix adding assets because of bad filter strings.
+- Get appName from gradle.properties
+- fix little bug when loading project and the custom actions are not compiled
+- Editor: Better msg handling: Message Dialog
+- Change RECTANGLE to SUBTITLE type of Text
+- Editor: adjust colors in skin for a more pleasant feel.
+- update pathfinder classes for no warnings.
+- Use Gdx library instead JavaFX to set the window size.
+- Use enum toString() as key to retrieve custom screens implementation.
+
+## [0.9.3]
+
+- Fix error when interpolation=null
+
+## [0.9.2]
+
+- Issue #22 fixed. Something went wrong while creating project.
+- Set document modified when changing player
+- Walking speed depends on scale
+- Better direction calculation
+- fixes: Null checks in animation dialogs/widget
+- Fix calculating position when speed!=1 in reversing animation.
+- Some ajustements in Action annotations: Better description and required field
+
+## [0.9.1]
+
+- Fixes several bugs in the editor related to the big refactor.
+- Created EndGameAction
+- Action refactor. VerbRunner parameter instead of ActionCallback.
+
+## [0.9.0]
+
+- Game model and saved games are now in JSON format.
+    * XML is deprecated. Backward compatibility broken.
+    * Saved games are patch friendly.
+- EDITOR: Big refactor. Editor uses engine model objects now.
+- Change I18N file encoding from ISO-889-1 to UTF-8
+
+## [0.8.10]
+
+### Added
+
+- Change to TEXT_INPUT for Lookat and Say actions text fields.
+
+### Fixed
+
+- fix: set last frame in atlasrenderer when reverse mode
+
+## [0.8.9]
+
+### Added
+
+- EDITOR: Added input panels for text input.
+- Better aspect ratio support. Correct support for 4:3, 16:9 and 16:10.
+- Pause the game when an exception/error is thrown and debug mode is
+  activated.
+- Updated to libgdx v0.6.4
+- Text from dialog ui wrap to screen size.
+
+### Fixed
+
+- fix: stop processing ActionCallbackQueue when changing scene
+
+## [0.8.8]
+
+### Added
+
+- Interpolation support for position and scale actions
+- Update to libgdx v1.6.2. WARNING: Projects have to be modified in order to work the IOS version.
+  More info: http://www.badlogicgames.com/wordpress/?p=3694
+
+### Fixed
+
+- Compute BBox in renderer Refactor to allow recompute bbox when animation complete.
+- Fix animationTime when reverse animation in SpineRenderer
+- Fix save/game screen slot size
+- EDITOR: fix when generating world keys for i18n + doesn't remove ui.* keys.
+
+## [0.8.7]
+
+### Fixed
+
+- Fix: use scale factor for speed in PositionAction
+- Added ui missing translations for menu screen
+- Spine RT updated to latest version
+
+## [0.8.6]
+
+### Fixed
+
+- Fix fakeDepthScale() calc: added world scale factor
+- Change 'assets/test' folder name for 'assets/tests' when creating a project
+- Some debugscreen changes
+- Load/Save Game Screen improvements
+
+## [0.8.5]
+
+### Fixed
+
+- SetActorAttrAction: multiply position by scale
+- Check because the ActionCallbackQueue can call to setCurrentScene()
+
+## [0.8.4]
+
+### Fixed
+
+- fix camera loading state
+- fix bad casting when read saved game
+- fix walking speed double scale multiply
+
+## [0.8.3]
+
+### Added
+
+- UI Fixes
+    - Inventory ui over inventory icon
+    - Edit verbs dialog improvement
+    - Custom autosize button
+
+## [0.8.2]
+
+### Added
+
+- Inventory improved
+    - Added configurable align (top, down, left, right, center)
+    - Added configurable autosize behaviour
+- Added arrow icon for exits when showing hotspots
+- EDITOR: Added several config properties in the Game Properties tab
+
+### Fixed
+
+-EDITOR: fix world width and height was not recalculated when loading
+
+## [0.8.1]
+
+### Fixed
+
+- Tester Bot fixes
+- Dialog render fixes when character position is not inside the screen
+- Dialog nullpointer fix when playing recorded files
+
+## [0.8.0]
+
+### Added
+
+- Added a Tester Bot that plays the game randomly
+- Spine atlas in animations
+
+### Fixed
+
+- EDITOR: Dialog editing fix
+
+## [0.7.2]
+
+### Added
+
+- libgdx v1.5.6 update
+- update to the latest spine libgdx runtime
+- EDITOR: Enable/disable actions
+- Backround images must be inside atlas now
+- Added control actions
+- Added ActorAttrAction
+- GotoAction: Change margin.
+- Added log when verb finished
+- GotoAction: add anchor parameter
+- PositionAction now works with BaseActors (no animation)
+
+### Fixed
+
+- EDITOR: fixes to inputpanels
+- fix OptionInputPanel when mandatory
+- Reset testScene when changing current scene
+- ActorProps: Show pos for BaseActors
+- EDITOR: change some edit defaults
+- walkzone fix when dinamic obstacles
+- fill animation/actor list when setText()
+
+## [0.7.1]
+
+- Action refactor
+- EDITOR: Undo support
+- EDITOR: Fake depth vector can be setting dragging ui markers
+- Actor ZIndex
+- RunVerb now allows iterating over a list of verbs
+- Scene cache
+- SpriteActor: scale support
+- SpineRenderer: Reverse animation support
+- Scene layer support
+
+## [0.6.9]
+
+- libgdx updated to v1.5.4
+- Sprite Actor Scale support
+- Added scene state handling
+
+### Fixed
+
+- javadoc fixes for jdk 1.8
+
+## [0.6.8]
+
+### Fixed
+
+- Editor only release: Fix bug when saving project
+
+## [0.6.7]
+
+### Added
+
+- Load/Save game screens
+- libgdx updated to v1.5.3.
+
+### Fixed
+
+- fixed fillanimations combo bug. set selection to the first element
+- Fix for windows gradle exec
+
+## [0.6.6]
+
+- creditscreen: set scroll speed resolution independent
+- creditscreen: added background style. Style now obtained from skin
+
+### Fixed
+
+- fixed textureunpacker bug when image was rotated in atlas
+
+## [0.6.5]
+
+- better text size management for small screens
+- text bubble smaller and better management
+
+### Fixed
+
+- fix ActionCallbackQueue serialization
+
+## [0.6.4]
+
+- ActionCallbackQueue serialization
+- world defaultverbs serialization
+- i18n UI support
+
+## [0.6.3]
+
+- Updated libgdx to 1.5.2 version
+- Menu Screen Refactor
+- Transition moved to World
+
+## [0.6.2]
+
+- i18n workflow in Editor working
+- Added event handling in Spine plugin
+- Editor dialog tree: edit and delete fixes
+- fix CameraAction when no selecting any target
+- fix enter/leave verb conflicts name. Rename to enter/exit
+- fix xml action loading
+- Call cb before cleaning text fifo
+- fix RunVerb action in repeat
+
+## [0.6.1]
+
+- fix show assets folder
+- fix when packaging android release (build.gradle bug)
+
+## [0.6.0]
+
+- Created Spine plugin and set as optional when creating a project.
+- Refactor: FrameAnimation -> AnimationDesc, SpriteRenderer -> ActorRenderer
+- EDITOR: fix several IOS related bugs. IOS Ipad/Iphone testing and working fine.
+- EDITOR: fix create resolution. Now atlas upacking/packing is supported
+
+## [0.5.0]
+
+- Updated to libgdx 1.4.1
+- ENGINE: Debug screen with speed control, record/play games and go to any scene in runtime
+- ENGINE: Material style buttons in engine UI. Better look and feel for inventory and pie menu.
+
+## [0.4.0]
+
+- ENGINE: Custom game UI Screen support
+
+## [0.3.2]
+
+- EDITOR: Fixed bug when running project without console
+
+## [0.3.1]
+
+- EDITOR: Fixed accessing opengl context issue when creating project in the new thread.
+
+## [0.3.0]
+
+- ENGINE: Action refactoring. WARNING: Names have changed. All previous games are not compatible.
+- ENGINE: New DebugScreen (Work in progress)
+- ENGINE: Change speed support for fastforward.
+- ENGINE: The blade-engine.jar are now in Maven Central. When creating a new game, the Maven dependency is added instead
+  of adding the engine jar in libs folder.
+
+## [0.2.0]
+
+- EDITOR: Fixed NullPointer error when creating project
+- EDITOR: Threads for long tasks to show UI message status
+- EDITOR: FIXED packaging with embedded JRE.
+- ENGINE: CreditsScreen fonts now obtained from Skin
+
+## [0.1.0]
+
+- Initial release
diff --git a/README.md b/README.md
index c562b4f7a..833b09cce 100644
--- a/README.md
+++ b/README.md
@@ -1,61 +1,90 @@
 Bladecoder Adventure Engine
 ===========================
 
-The **Bladecoder Adventure Engine** is a set of tools to create interactive graphic adventures (classical point ant click games).
+The **Bladecoder Adventure Engine** is a set of tools to create interactive graphic adventures (classical point and
+click games).
 
-I think that this type of games is a great medium to tell stories and the new mobile devices provides a big opportunity to rebird and evolve them.
+I think that this type of games are a great medium to tell stories and mobile devices provide a big opportunity to
+rebirth and evolve them.
 
-By creating Bladecoder Adventure Engine, I want to create a platform to tell stories. Interactive stories with modern graphics, animations and music.
+By creating the **Bladecoder Adventure Engine**, I want to create a platform to tell stories. Interactive stories with
+modern graphics, animations and music.
 
-The Bladecoder Adventure Engine is composed by the following subprojects:
+The **Bladecoder Adventure Engine** is composed of the following subprojects:
 
-* **adventure-composer**: It ss the graphical editor for creating point and click games.
-* **blade-engine**: It is the engine to run the games creates with the adventure-composer.
- 
-The **Bladecoder Adventure Engine** is developped using the [LibGDX](http://libgdx.badlogicgames.com/) framework and the projects generates a layout similar to any LibGDX project, this lowers the learning curve and ease the development and deploy in several platforms.
+* **adventure-editor**: the graphical editor for creating point and click games.
+* **blade-engine**: the engine to run the games created with `adventure-editor`.
 
-### Adventure Composer
-The Adventure Composer is a graphical editor to create full point and click games with minimal programming.
+The **Bladecoder Adventure Engine** has been developed using the [LibGDX](http://libgdx.badlogicgames.com/) framework
+and the project generates a layout similar to any LibGDX project. This lowers the learning curve and eases development
+and deploy on several platforms.
 
-![adventure composer 2014-09-26](https://cloud.githubusercontent.com/assets/6229260/4420346/1d3a1b8a-4578-11e4-8eec-415f5e27c005.png)
+### Adventure Editor
+
+The **Adventure Editor** is a graphical editor to create full point and click games with minimal programming.
+
+![adventure editor 2014-09-26](https://cloud.githubusercontent.com/assets/6229260/4420346/1d3a1b8a-4578-11e4-8eec-415f5e27c005.png)
 
 ### Blade Engine
+
 The Engine has the following features:
-* Multi platform support: Android, IOS, Desktop (windows, OSX, Linux) and HTML
-* Several animation techniques: sprite/atlas animation, Spine (cutout) animation and 3d model animation
-* 3d character support
-* Multiresolution to deal with differents densities and screen sizes
-* Multilanguaje support
+
+* Multi platform support: Android, IOS and Desktop (Windows, OSX and Linux)
+* Several animation techniques: sprite/atlas animation and Spine (cutout) animation
+* Multiresolution to deal with different densities and screen sizes
+* Multilanguage support
+* Use of the [Ink](https://www.inklestudios.com/ink/) language to create dialogs and puzzles easily.
 
 ### The Goddess Robbery
 
-The **Bladecoder Adventure Engine** is currently under continous development and it is almost ready for production. The Goddess Robbery is a test game created to show the features of the Engine.
+The **Bladecoder Adventure Engine** is currently under continuous development and it's ready for production. **The
+Goddess Robbery** is a test game created to show the features of the Engine.
+
+The source of **The Goddess Robbery** can be
+downloaded  [here](https://github.com/bladecoder/bladecoder-adventure-tests/tree/master/venus) and it's useful to learn
+how to use the **Adventure Editor**.
+
+**The Goddess Robbery** is also available for Android devices at the Google Play Store.
+
+[![The Goddess Robbery on Google Play](http://i.imgur.com/yn6RYuX.png)](https://play.google.com/store/apps/details?id=org.bladecoder.engine)
 
-The source of **The Goddess Robbery** can be downloaded  [here](https://github.com/bladecoder/bladecoder-adventure-tests/tree/master/venus) and it is useful to learn how to use the **Adventure Composer**. 
+### Documentation
 
-The Goddess Robbery is also available for Android devices at the Google Play Store.
+All available documentation is in the [wiki page](https://github.com/bladecoder/bladecoder-adventure-engine/wiki). The
+documentation is not good enough and needs to improve, we are working on it. Meanwhile you can download and look into
+the [test projects](https://github.com/bladecoder/bladecoder-adventure-tests/).
 
-[![The Goddess Robbery on Google Play](http://developer.android.com/images/brand/en_app_rgb_wo_60.png)](http://play.google.com/store/apps/details?id=com.bladecoder.engine)
+### Download latest release
+
+Check the [release page](https://github.com/bladecoder/bladecoder-adventure-engine/releases/latest) to download the
+latest version.
+
+For Linux users, there is a Flatpack package with all the dependencies included.
+
+<a href="https://flathub.org/apps/details/com.bladecoder.adventure-editor"><img width="240" alt="Download on Flathub" src="https://flathub.org/assets/badges/flathub-badge-en.png"/></a>
 
 ### Building and running
-In order to compile, build and run the engine, the Java platform is necessary. The project uses Gradle to build and package.
+
+In order to compile, build and run the engine, the Java platform is necessary. The project uses Gradle to build and
+package.
 
 Build:
 
     $ ./gradlew build
 
-Run the Adventure Composer:
+Run the Adventure Editor:
 
     $ ./gradlew run
 
-Create a distribution package for the Adventure Composer:
+Create a distribution package for the Adventure Editor:
 
     $ ./gradlew distZip
 
-A zip package ready for distribution is created in the folder 'bladecoder-adventure-engine/adventure-composer/build/distributions'
+A zip package ready for distribution is created in the folder '
+bladecoder-adventure-engine/adventure-editor/build/distributions'
 
 ### License
-Bladecoder Adventure Engine is licensed under the [Apache 2 License](http://www.apache.org/licenses/LICENSE-2.0.html), meaning you
-can use it free of charge, without strings attached in commercial and non-commercial projects.
-
 
+The **Bladecoder Adventure Engine** is licensed under
+the [Apache 2 License](http://www.apache.org/licenses/LICENSE-2.0.html), meaning you
+can use it free of charge, without strings attached in commercial and non-commercial projects.
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/paytone-one-18_00.png b/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/paytone-one-18_00.png
deleted file mode 100644
index 5ec445b67..000000000
Binary files a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/paytone-one-18_00.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/ubuntu-light-12_00.png b/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/ubuntu-light-12_00.png
deleted file mode 100644
index fb9d49564..000000000
Binary files a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/ubuntu-light-12_00.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/ubuntu-medium-14_00.png b/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/ubuntu-medium-14_00.png
deleted file mode 100644
index 921f82c70..000000000
Binary files a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/ubuntu-medium-14_00.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/icons-atlas.svg b/adventure-composer/assets-raw/editor/icons-atlas/icons-atlas.svg
deleted file mode 100644
index 9f494da92..000000000
--- a/adventure-composer/assets-raw/editor/icons-atlas/icons-atlas.svg
+++ /dev/null
@@ -1,3569 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48+devel r"
-   sodipodi:docname="icons.svg"
-   inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_goto.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#2043dd"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.7062793"
-     inkscape:cx="857.97017"
-     inkscape:cy="-47.82528"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     borderlayer="true"
-     inkscape:window-width="1124"
-     inkscape:window-height="866"
-     inkscape:window-x="1470"
-     inkscape:window-y="79"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:object-paths="true" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="60.752535 : -73.49258 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="-198.14519 : 246.2576 : 1"
-       inkscape:persp3d-origin="64 : 42.666667 : 1"
-       id="perspective4594" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="60.752535 : -73.49258 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="-198.14519 : 246.2576 : 1"
-       inkscape:persp3d-origin="64 : 42.666667 : 1"
-       id="perspective4564" />
-    <clipPath
-       id="clipPath5598-8-0-5"
-       clipPathUnits="userSpaceOnUse">
-      <g
-         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)"
-         style="fill:#ffffff"
-         id="g5600-9-9-5">
-        <path
-           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 z"
-           id="path5602-1-7-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccscscsscccccsccccccsccc" />
-        <path
-           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.07579465;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
-           id="path5604-6-6-2"
-           inkscape:connector-curvature="0" />
-      </g>
-    </clipPath>
-    <linearGradient
-       x1="212.29"
-       y1="86.987"
-       gradientTransform="scale(0.67336,1.4851)"
-       x2="179.6"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2446"
-       y2="60.986"
-       id="linearGradient2453" />
-    <linearGradient
-       x1="211.84"
-       y1="162.05"
-       gradientTransform="scale(1.1402,0.87702)"
-       x2="164.58"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2446"
-       y2="115.26"
-       id="linearGradient2449" />
-    <linearGradient
-       x1="118.93"
-       y1="96.168"
-       gradientTransform="scale(0.88075,1.1354)"
-       x2="137.29"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2414"
-       y2="112.8"
-       id="linearGradient2445" />
-    <linearGradient
-       x1="286.48"
-       y1="118.48"
-       gradientTransform="scale(1.0801,0.92582)"
-       x2="272.27"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2414"
-       y2="142.42"
-       id="linearGradient2441" />
-    <linearGradient
-       x1="77.193"
-       y1="33.315"
-       gradientTransform="scale(1.3671,0.73146)"
-       x2="146.55"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2414"
-       y2="114.87"
-       id="linearGradient2437" />
-    <linearGradient
-       x1="293.39"
-       y1="44.554"
-       gradientTransform="scale(1.1832,0.84515)"
-       x2="201.5"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2414"
-       y2="119.48"
-       id="linearGradient2433" />
-    <linearGradient
-       x1="59.088"
-       y1="219.27"
-       gradientTransform="scale(1.1261,0.88801)"
-       x2="154.07"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2414"
-       y2="158.92"
-       id="linearGradient2429" />
-    <linearGradient
-       x1="242.89"
-       y1="281.31"
-       gradientTransform="scale(1.4649,0.68264)"
-       x2="155.26"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2414"
-       y2="210.25"
-       id="linearGradient2425" />
-    <linearGradient
-       x1="105.5"
-       y1="249.1"
-       gradientTransform="scale(0.92394,1.0823)"
-       x2="181.91"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2414"
-       y2="184.14"
-       id="linearGradient2421" />
-    <linearGradient
-       x1="278.58"
-       y1="292.7"
-       gradientTransform="scale(1.0748,0.93042)"
-       x2="185.44"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2414"
-       y2="206.96"
-       id="linearGradient2417" />
-    <linearGradient
-       id="linearGradient2414">
-      <stop
-         offset="0"
-         stop-color="#e3b681"
-         id="stop2415" />
-      <stop
-         offset="1"
-         stop-color="#fde8b0"
-         id="stop2416" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2446">
-      <stop
-         offset="0"
-         stop-color="#e0e0e0"
-         id="stop2447" />
-      <stop
-         offset="1"
-         stop-color="#fff"
-         id="stop2448" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="bg"
-     sodipodi:insensitive="true">
-    <rect
-       transform="translate(0,-924.3622)"
-       style="fill:#b3b3b3;stroke:#ffffff;stroke-width:7.39798403;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect4476"
-       width="1927.3734"
-       height="2373.0876"
-       x="-269.68878"
-       y="149.37595"
-       rx="9.5087242"
-       ry="13.555182" />
-  </g>
-  <g
-     transform="translate(0,-924.3622)"
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Capa 1">
-    <text
-       sodipodi:linespacing="125%"
-       id="text2988"
-       y="1066.2908"
-       x="24.642857"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1066.2908"
-         x="24.642857"
-         id="tspan2990"
-         sodipodi:role="line">Character Actor</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text2988-6"
-       y="1066.8046"
-       x="155.96574"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1066.8046"
-         x="155.96574"
-         id="tspan2990-6"
-         sodipodi:role="line">Base Actor</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       x="289.53717"
-       y="1066.8046"
-       id="text3017"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3019"
-         x="289.53717"
-         y="1066.8046">Sprite Actor</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3025"
-       y="1067.3097"
-       x="440.0499"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1067.3097"
-         x="440.0499"
-         id="tspan3027"
-         sodipodi:role="line">FG Actor</tspan></text>
-    <g
-       inkscape:export-ydpi="22.851562"
-       inkscape:export-xdpi="22.851562"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_sprite_actor.png"
-       id="g3042">
-      <rect
-         y="926.27539"
-         x="264.41318"
-         height="126.03077"
-         width="126.03078"
-         id="rect3015"
-         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077000000002px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <g
-         id="g3023">
-        <path
-           sodipodi:nodetypes="ccccc"
-           transform="translate(0,924.3622)"
-           inkscape:connector-curvature="0"
-           id="path3007"
-           d="M 313.65236,68.401 334.86557,81.532983 360.62446,18.39845 C 360.46557,9.7742526 357.30423,13.159908 354.56354,14.862916 341.40827,33.057996 327.36107,50.616737 313.65236,68.401 z"
-           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           transform="translate(0,924.3622)"
-           inkscape:connector-curvature="0"
-           id="path3009"
-           d="m 312.64221,70.926381 19.69798,12.121831 -7.07107,8.08122 -14.64721,-10.606601 z"
-           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           transform="translate(0,924.3622)"
-           inkscape:connector-curvature="0"
-           id="path3011"
-           d="m 310.11683,84.058364 13.13198,9.091373 c 0,0 3.81611,8.215953 -2.52538,15.152293 -17.21129,14.49883 -28.24073,2.98516 -39.39595,-12.121834 24.77147,18.680814 13.67052,-10.014133 28.78935,-12.121832 z"
-           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      </g>
-    </g>
-    <g
-       inkscape:export-ydpi="22.851562"
-       inkscape:export-xdpi="22.851562"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_base_actor.png"
-       id="g3036">
-      <rect
-         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077000000002px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="rect2986"
-         width="126.03078"
-         height="126.03077"
-         x="130.84175"
-         y="926.27539" />
-      <rect
-         style="fill:none;stroke:#ffffff;stroke-width:0.99682093000000005"
-         id="rect3013"
-         width="107.77778"
-         height="88.901855"
-         x="141.14188"
-         y="947.67273" />
-      <text
-         xml:space="preserve"
-         style="font-size:11.43463326000000002px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
-         x="133.8445"
-         y="1045.9761"
-         id="text3013"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan3015"
-           x="133.8445"
-           y="1045.9761">x,y</tspan></text>
-    </g>
-    <path
-       sodipodi:nodetypes="ccccscccccccsscccccccccccccccccccccccccccccsccccc"
-       transform="translate(0,924.3622)"
-       inkscape:connector-curvature="0"
-       id="path3017"
-       d="m 35.860415,117.3934 14.647212,1.51523 -0.505076,-5.05077 5.050763,-25.253809 c 0,0 8.08122,-17.172593 8.08122,-15.152288 0,2.020305 2.777919,15.152288 2.777919,15.152288 l 20.960665,17.677669 -6.818528,7.32361 -0.757616,2.77792 12.626907,-8.5863 -4.545686,-4.04061 -18.687822,-17.172594 c 0,0 2.141266,-15.741979 1.104742,-28.260376 -1.035167,-12.502 0.883372,-20.796403 2.430791,-17.701565 3.030458,6.060916 3.030458,9.091373 3.030458,9.091373 l 3.535534,16.667517 -3.030458,3.535534 3.030458,-1.010152 1.010153,4.04061 3.535533,-3.535534 L 79.802051,64.865466 76.771593,45.167492 72.225906,34.56089 68.690373,23.954289 64.649762,18.650988 65.659915,16.630683 65.927259,8.7975903 63.134533,4.5088522 55.55839,6.5291573 c -1.077801,1.6835876 -0.345622,3.3671751 1.262691,5.0507627 l -1.262691,6.81853 1.515228,0 2.272843,2.777919 1.767767,-1.010152 2.901131,2.136525 -1.133363,3.671852 -0.757615,6.060915 -2.020305,13.637059 -8.08122,15.152288 -3.535534,1.010153 1.515229,3.535534 3.535534,-3.535534 0.505076,-2.020305 c 0,0 8.586296,-14.142136 7.071068,-11.616755 -1.515229,2.525382 -1.767767,11.111678 -1.767767,11.111678 l -8.838835,28.789348 c 0.904671,9.380675 -1.085684,18.037595 -2.77792,26.769045 l -11.169644,0.99025 z"
-       style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <g
-       inkscape:export-ydpi="22.851562"
-       inkscape:export-xdpi="22.851562"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_fg_actor.png"
-       id="g3049">
-      <rect
-         style="fill:none;stroke:#ffffff"
-         id="rect3021"
-         width="70.328865"
-         height="76.138458"
-         x="409.27252"
-         y="936.12628" />
-      <rect
-         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077000000002px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="rect3023"
-         width="126.03078"
-         height="126.03077"
-         x="400.27869"
-         y="926.27539" />
-      <rect
-         style="fill:none;stroke:#ffffff"
-         id="rect3029"
-         width="48.343479"
-         height="64.884583"
-         x="468.47949"
-         y="954.52216" />
-      <rect
-         y="971.46973"
-         x="414.21808"
-         height="76.468552"
-         width="87.580612"
-         id="rect3019"
-         style="fill:#cccccc;stroke:none" />
-      <g
-         id="g3028"
-         transform="matrix(1.0138417,0,0,1.0138417,146.98573,-17.250149)"
-         style="fill:#000000">
-        <path
-           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 313.65236,68.401 334.86557,81.532983 360.62446,18.39845 C 360.46557,9.7742526 357.30423,13.159908 354.56354,14.862916 341.40827,33.057996 327.36107,50.616737 313.65236,68.401 z"
-           id="path3030"
-           inkscape:connector-curvature="0"
-           transform="translate(0,924.3622)"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 312.64221,70.926381 19.69798,12.121831 -7.07107,8.08122 -14.64721,-10.606601 z"
-           id="path3032"
-           inkscape:connector-curvature="0"
-           transform="translate(0,924.3622)"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 310.11683,84.058364 13.13198,9.091373 c 0,0 3.81611,8.215953 -2.52538,15.152293 -17.21129,14.49883 -28.24073,2.98516 -39.39595,-12.121834 24.77147,18.680814 13.67052,-10.014133 28.78935,-12.121832 z"
-           id="path3034"
-           inkscape:connector-curvature="0"
-           transform="translate(0,924.3622)"
-           sodipodi:nodetypes="ccccc" />
-      </g>
-    </g>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3024"
-       y="1236.5101"
-       x="38.009186"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1236.5101"
-         x="38.009186"
-         id="tspan3026"
-         sodipodi:role="line">animation</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       x="170.33917"
-       y="1236.5101"
-       id="text3035"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3037"
-         x="170.33917"
-         y="1236.5101">repeat</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3041"
-       y="1406.2157"
-       x="34.978737"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1406.2157"
-         x="34.978737"
-         id="tspan3043"
-         sodipodi:role="line">pickup</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       x="184.29855"
-       y="1406.2157"
-       id="text3047"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3049"
-         x="184.29855"
-         y="1406.2157">lookup</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3053"
-       y="1406.2157"
-       x="310.62854"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1406.2157"
-         x="310.62854"
-         id="tspan3055"
-         sodipodi:role="line">talk</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       x="442.95853"
-       y="1406.2157"
-       id="text3059"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3061"
-         x="442.95853"
-         y="1406.2157">use</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3065"
-       y="1406.2157"
-       x="578.31897"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1406.2157"
-         x="578.31897"
-         id="tspan3067"
-         sodipodi:role="line">init</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       x="46.978733"
-       y="1563.7994"
-       id="text3071"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3073"
-         x="46.978733"
-         y="1563.7994">test</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3077"
-       y="1563.7994"
-       x="181.32903"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1563.7994"
-         x="181.32903"
-         id="tspan3079"
-         sodipodi:role="line">leave</tspan></text>
-    <g
-       inkscape:export-ydpi="22.851561"
-       inkscape:export-xdpi="22.851561"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_lookat.png"
-       style="stroke:none"
-       id="g3667">
-      <rect
-         y="1262.6561"
-         x="129.05273"
-         height="126.03077"
-         width="126.03078"
-         id="rect3045"
-         style="fill:none;stroke:none" />
-      <g
-         inkscape:export-ydpi="84"
-         inkscape:export-xdpi="84"
-         transform="matrix(1.043479,0,0,1.043479,-311.76888,-529.98822)"
-         id="g995"
-         style="fill:#000000;stroke:none">
-        <path
-           sodipodi:nodetypes="ccccccc"
-           inkscape:connector-curvature="0"
-           id="path997"
-           d="m 442.86429,1754.1491 c 10.78295,-2.0415 22.63506,-3.5484 31.72963,-6.4341 17.41543,4.5145 34.8732,6.2578 52.61828,9.7833 l -0.79324,5.6408 c -13.94799,-3.6905 -30.86751,-7.0314 -52.79456,-9.7833 -14.53933,2.2933 -27.21975,5.5161 -39.92644,8.7257 z"
-           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517823999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           sodipodi:nodetypes="ccccssccscsscccssccs"
-           inkscape:connector-curvature="0"
-           id="path999"
-           d="m 469.53272,1756.2959 c -12.32701,5.3522 -23.74909,10.1265 -35.83835,9.8143 l -0.76134,5.3571 c 8.03045,0.5053 15.01189,3.1755 19.07502,11.9461 0,0 -2.79705,8.0239 -3.50216,9.7867 -0.40755,1.0188 10.0109,4.9058 17.9261,9.2745 5.7789,3.1895 9.70362,7.3365 9.70362,7.3365 l -14.9361,-26.7161 c 30.24932,16.4667 62.28535,27.4255 70.27709,9.4129 4.42574,-9.9751 -6.88933,-18.2849 -10.71262,-10.1604 0,0 5.16501,-2.3834 6.00766,1.4396 4.44189,20.1524 -29.73454,11.8551 -43.36869,0.2354 -1.49294,-1.2724 46.44174,-11.7994 46.44174,-10.1189 l 1.61958,-5.8001 c -18.13025,4.301 -40.95965,-10.4622 -61.93155,-11.8076 z m 2.9623,9.4544 c 11.19809,-0.067 24.28852,1.3987 36.94576,6.0077 0.93698,0.3412 -27.67125,6.6029 -27.67125,6.6029 l -32.91758,-9.9667 c 5.34462,-1.3315 13.7624,-2.5851 23.64307,-2.6439 z"
-           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517823999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path1001"
-           d="m 470.73702,1761.8052 c -0.83593,1.3734 -1.3012,2.9024 -1.3012,4.5265 0,5.8124 5.99006,10.5342 13.38574,10.5342 7.39568,0 13.38574,-4.7218 13.38574,-10.5342 0,-0.3491 -0.027,-0.684 -0.0692,-1.0244 -7.51389,-0.9914 -19.42592,-2.5902 -25.40108,-3.5021 z"
-           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:1.01290547999999991;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-    </g>
-    <g
-       inkscape:export-ydpi="22.851561"
-       inkscape:export-xdpi="22.851561"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_pickup.png"
-       style="stroke:none"
-       id="g3663">
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3039"
-         width="126.03078"
-         height="126.03077"
-         x="-2.2670839"
-         y="1262.6561" />
-      <path
-         inkscape:export-ydpi="84"
-         inkscape:export-xdpi="84"
-         clip-path="url(#clipPath5598-8-0-5)"
-         sodipodi:type="arc"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.13543986999999991;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path1003"
-         sodipodi:cx="353.77585"
-         sodipodi:cy="549.35583"
-         sodipodi:rx="173.90331"
-         sodipodi:ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z"
-         transform="matrix(0.38619269,0,0,0.37671016,-71.103241,1124.5068)" />
-    </g>
-    <g
-       inkscape:export-ydpi="22.851559"
-       inkscape:export-xdpi="22.851559"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-       style="stroke:none"
-       id="g3674">
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3051"
-         width="126.03078"
-         height="126.03077"
-         x="261.38272"
-         y="1262.6561" />
-      <g
-         id="g1013"
-         transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-         inkscape:export-xdpi="84"
-         inkscape:export-ydpi="84"
-         style="fill:#000000;stroke:none">
-        <path
-           id="rect1009"
-           transform="matrix(1.0251802,0,0,1.0251802,733.2748,485.65628)"
-           d="M 293.5 358.5625 C 279.99018 358.5625 269.125 369.42768 269.125 382.9375 L 269.125 402.0625 C 269.125 415.57232 279.99018 426.4375 293.5 426.4375 L 312.375 426.4375 L 320.03125 450.96875 L 329.0625 426.4375 L 356 426.4375 C 369.50982 426.4375 380.375 415.57232 380.375 402.0625 L 380.375 382.9375 C 380.375 369.42768 369.50982 358.5625 356 358.5625 L 293.5 358.5625 z "
-           style="color:#000000;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-    </g>
-    <g
-       inkscape:export-ydpi="22.851559"
-       inkscape:export-xdpi="22.851559"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_leave.png"
-       style="stroke:none"
-       id="g3698">
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3075"
-         width="126.03078"
-         height="126.03077"
-         x="132.08318"
-         y="1420.2399" />
-      <path
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 139.76383,1506.2702 -1.63977,-36.0745 68.86975,0 0,-25.4163 43.45357,43.4536 c 0,0 -44.09434,26.5217 -45.01577,25.9899 -0.92148,-0.532 0.81989,-22.7105 0.81989,-22.7105 z"
-         id="path936-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         inkscape:export-xdpi="100"
-         inkscape:export-ydpi="100" />
-    </g>
-    <g
-       inkscape:export-ydpi="22.851559"
-       inkscape:export-xdpi="22.851559"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_test.png"
-       style="stroke:none"
-       id="g3694">
-      <rect
-         y="1420.2399"
-         x="-2.2671149"
-         height="126.03077"
-         width="126.03078"
-         id="rect3069"
-         style="fill:none;stroke:none" />
-      <path
-         style="fill:#ffffff;stroke:none;stroke-width:1.03658688000000021px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 48.549451,1430.9526 28.268952,-1.4293 -8.562007,35.5583 31.147027,74.4052 -80.235419,-0.1294 36.419641,-74.2758 z"
-         id="path3143"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-    </g>
-    <g
-       inkscape:export-ydpi="22.851561"
-       inkscape:export-xdpi="22.851561"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_use.png"
-       style="stroke:none"
-       id="g3680">
-      <rect
-         y="1262.6561"
-         x="393.71271"
-         height="126.03077"
-         width="126.03078"
-         id="rect3057"
-         style="fill:none;stroke:none" />
-      <rect
-         style="fill:#ffffff;stroke:none"
-         id="rect3145"
-         width="112.99651"
-         height="67.142853"
-         x="400.78745"
-         y="1306.6479"
-         rx="9.5146341"
-         ry="9.5146341" />
-      <path
-         style="fill:#ffffff;stroke:none"
-         d="m 440.59375,1293.2997 c -1.87244,0 -3.375,1.5026 -3.375,3.375 l 0,17.0938 c 0,1.8724 1.50256,3.375 3.375,3.375 l 33.375,0 c 1.87244,0 3.375,-1.5026 3.375,-3.375 l 0,-17.0938 c 0,-1.8724 -1.50256,-3.375 -3.375,-3.375 l -33.375,0 z m 5,3.5625 23.375,0 c 1.31168,0 2.375,1.0633 2.375,2.375 l 0,11.9688 c 0,1.3116 -1.06332,2.375 -2.375,2.375 l -23.375,0 c -1.31168,0 -2.375,-1.0634 -2.375,-2.375 l 0,-11.9688 c 0,-1.3117 1.06332,-2.375 2.375,-2.375 z"
-         id="rect3147"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       inkscape:export-ydpi="22.851561"
-       inkscape:export-xdpi="22.851561"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_animation.png"
-       style="stroke:none"
-       id="g3556">
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3014"
-         width="126.03078"
-         height="126.03077"
-         x="0.76336503"
-         y="1092.9506" />
-      <g
-         style="stroke:none"
-         id="g3434">
-        <rect
-           y="1124.4402"
-           x="5.7142863"
-           height="62.987011"
-           width="114.28571"
-           id="rect3156"
-           style="fill:#ffffff;stroke:none" />
-        <rect
-           inkscape:tile-y0="204.42882"
-           inkscape:tile-x0="10.714288"
-           inkscape:tile-h="5.7142835"
-           inkscape:tile-w="5.7142835"
-           inkscape:tile-cy="207.28596"
-           inkscape:tile-cx="13.571429"
-           style="fill:#000000;stroke:none"
-           id="rect3160"
-           width="5.7142835"
-           height="5.7142835"
-           x="12.142859"
-           y="1128.791"
-           rx="0.5360356"
-           ry="0.5360356" />
-        <use
-           style="stroke:none"
-           transform="translate(-7.8571428,0)"
-           height="128"
-           width="128"
-           id="use3306"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3308"
-           transform="translate(7.9999969,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3310"
-           transform="translate(15.999994,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3312"
-           transform="translate(23.999991,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3314"
-           transform="translate(31.999988,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3316"
-           transform="translate(39.999984,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3318"
-           transform="translate(47.999981,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3320"
-           transform="translate(55.999978,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3322"
-           transform="translate(63.999975,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3324"
-           transform="translate(71.999972,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3326"
-           transform="translate(79.999969,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3328"
-           transform="translate(87.999966,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3330"
-           transform="translate(95.999963,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3332"
-           transform="translate(103.99996,0)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <rect
-           ry="0.5360356"
-           rx="0.5360356"
-           y="1175.9338"
-           x="12.142859"
-           height="5.7142835"
-           width="5.7142835"
-           id="rect3336"
-           style="fill:#000000;stroke:none"
-           inkscape:tile-cx="13.571429"
-           inkscape:tile-cy="207.28596"
-           inkscape:tile-w="5.7142835"
-           inkscape:tile-h="5.7142835"
-           inkscape:tile-x0="10.714288"
-           inkscape:tile-y0="204.42882" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           id="use3338"
-           width="128"
-           height="128"
-           transform="translate(-7.8571428,47.142857)" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(7.9999969,47.142857)"
-           id="use3340"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(15.999994,47.142857)"
-           id="use3342"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(23.999991,47.142857)"
-           id="use3344"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(31.999988,47.142857)"
-           id="use3346"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(39.999984,47.142857)"
-           id="use3348"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(47.999981,47.142857)"
-           id="use3350"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(55.999978,47.142857)"
-           id="use3352"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(63.999975,47.142857)"
-           id="use3354"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(71.999972,47.142857)"
-           id="use3356"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(79.999969,47.142857)"
-           id="use3358"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(87.999966,47.142857)"
-           id="use3360"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(95.999963,47.142857)"
-           id="use3362"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(103.99996,47.142857)"
-           id="use3364"
-           width="128"
-           height="128" />
-      </g>
-    </g>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3430"
-       y="1235.7959"
-       x="314.62488"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1235.7959"
-         x="314.62488"
-         id="tspan3432"
-         sodipodi:role="line">yoyo</tspan></text>
-    <g
-       inkscape:export-ydpi="22.851561"
-       inkscape:export-xdpi="22.851561"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_init.png"
-       style="stroke:none"
-       id="g3685">
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3063"
-         width="126.03078"
-         height="126.03077"
-         x="529.07312"
-         y="1262.6561" />
-      <path
-         style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.11111116000000010;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 641.36875,1270.4067 -17.61397,13.9947 c -9.26356,-7.7681 -21.16067,-12.4866 -34.08183,-12.4866 -29.20278,0 -53.20384,24.0011 -53.20384,53.2039 0,29.2028 24.00106,52.661 53.20384,52.661 22.89394,0 42.56656,-14.3897 50.00678,-34.685 l -19.06168,-4.6449 c -5.10121,12.0294 -16.92245,20.3284 -30.9451,20.3284 -18.77049,0 -33.65958,-14.889 -33.65958,-33.6595 0,-18.7705 14.88909,-34.2024 33.65958,-34.2024 6.96429,0 13.36337,2.1563 18.69976,5.7909 l -17.43301,13.874 50.42905,9.3498 0,-49.5243 z"
-         id="path3768"
-         inkscape:connector-curvature="0" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       x="315.67932"
-       y="1562.7893"
-       id="text3540"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3542"
-         x="315.67932"
-         y="1562.7893">custom</tspan></text>
-    <g
-       inkscape:export-ydpi="22.851564"
-       inkscape:export-xdpi="22.851564"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_custom.png"
-       style="stroke:none"
-       id="g3689">
-      <rect
-         y="1419.2297"
-         x="266.43347"
-         height="126.03077"
-         width="126.03078"
-         id="rect3538"
-         style="fill:none;stroke:none" />
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/config.png"
-         id="g3544"
-         inkscape:label="Layer 1"
-         style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
-         transform="matrix(0.71578752,0,0,0.71578752,43.77428,1081.9921)">
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           d="m 393.9375,475.8125 -2.75,6.5 -0.75,4.6875 0.125,1.75 -7,0.90625 -0.3125,-1.71875 -1.9375,-4.3125 -4.3125,-5.5625 -4.4375,1.15625 -0.9375,7 0.5,4.71875 0.5625,1.65625 -6.5,2.6875 -0.75,-1.59375 -3,-3.65625 -5.625,-4.25 -3.9375,2.25 0.875,7 1.6875,4.4375 1,1.4375 -5.625,4.3125 -1.125,-1.34375 -3.875,-2.75 -6.5,-2.6875 -3.25,3.21875 2.6875,6.53125 2.75,3.84375 1.375,1.125 -4.3125,5.625 -1.4375,-1 -4.4375,-1.6875 -7,-0.875 -2.25,3.9375 4.25,5.59375 3.6875,3 1.5625,0.78125 -2.6875,6.53125 -1.6875,-0.59375 L 323.875,534 l -7,0.9375 -1.1875,4.40625 5.5625,4.3125 4.3125,1.9375 1.75,0.3125 -0.9375,7.03125 -1.75,-0.15625 -4.6875,0.78125 -6.5,2.71875 0,4.53125 6.5,2.71875 4.6875,0.78125 1.75,-0.15625 0.9375,7.03125 -1.75,0.3125 -4.3125,1.96875 -5.5625,4.28125 1.1875,4.40625 7,0.9375 4.6875,-0.46875 1.6875,-0.59375 2.6875,6.5625 -1.5625,0.75 -3.6875,3 -4.25,5.59375 2.25,3.9375 7,-0.875 4.4375,-1.6875 1.4375,-1 4.3125,5.625 -1.375,1.125 -2.75,3.84375 -2.6875,6.53125 3.25,3.21875 6.5,-2.65625 3.875,-2.78125 1.125,-1.34375 5.625,4.3125 -1,1.4375 -1.6875,4.4375 -0.875,7 3.9375,2.28125 5.625,-4.28125 3,-3.65625 0.75,-1.59375 6.5,2.71875 -0.5625,1.65625 -0.5,4.6875 0.9375,7 4.4375,1.1875 4.3125,-5.59375 1.9375,-4.3125 0.3125,-1.71875 7,0.90625 -0.125,1.75 0.75,4.6875 2.75,6.5 4.5625,0 2.6875,-6.5 0.75,-4.6875 -0.125,-1.75 7,-0.90625 0.3125,1.71875 2,4.3125 4.3125,5.59375 4.375,-1.1875 0.9375,-7 -0.4375,-4.6875 -0.625,-1.65625 6.5625,-2.71875 0.75,1.59375 3,3.65625 5.5625,4.28125 4,-2.28125 -0.9375,-7 -1.6875,-4.4375 -1,-1.4375 5.625,-4.3125 1.1875,1.34375 3.8125,2.78125 6.5,2.65625 3.25,-3.21875 -2.6875,-6.53125 -2.75,-3.84375 -1.375,-1.125 4.3125,-5.625 1.5,1 4.375,1.6875 7,0.875 2.3125,-3.9375 -4.3125,-5.59375 -3.625,-3 -1.625,-0.75 2.75,-6.5625 1.625,0.59375 4.75,0.46875 6.9375,-0.9375 1.1875,-4.40625 -5.5625,-4.28125 -4.3125,-1.96875 -1.75,-0.3125 0.9375,-7.03125 1.75,0.15625 4.6875,-0.78125 6.5,-2.71875 0,-4.53125 -6.5,-2.71875 -4.6875,-0.78125 -1.75,0.15625 -0.9375,-7.03125 1.75,-0.3125 4.3125,-1.9375 5.5625,-4.3125 L 475.5,534.9375 468.5625,534 l -4.75,0.46875 -1.625,0.59375 -2.75,-6.53125 1.625,-0.78125 3.625,-3 4.3125,-5.59375 -2.3125,-3.9375 -7,0.875 -4.375,1.6875 -1.5,1 -4.3125,-5.625 1.375,-1.125 2.75,-3.84375 2.6875,-6.53125 -3.25,-3.21875 -6.5,2.6875 -3.8125,2.75 -1.1875,1.34375 -5.625,-4.3125 1,-1.4375 1.6875,-4.4375 0.9375,-7 -4,-2.25 -5.5625,4.25 -3,3.65625 -0.75,1.59375 -6.5625,-2.6875 0.625,-1.65625 0.4375,-4.71875 -0.9375,-7 -4.375,-1.15625 -4.3125,5.5625 -2,4.3125 -0.3125,1.71875 -7,-0.90625 0.125,-1.75 -0.75,-4.6875 -2.6875,-6.5 -4.5625,0 z m 2.25,30.53125 c 0.96651,0 1.95262,0.0421 2.90625,0.0937 -0.0995,4.40159 -1.1276,7.8826 -2.40625,7.875 -1.28164,-0.008 -2.2859,-3.51994 -2.375,-7.9375 0.6301,-0.0225 1.23944,-0.0312 1.875,-0.0312 z m -7.71875,0.5625 3.0625,3.53125 0,-0.0625 2.375,6.375 0,9.21875 0,0.25 0,9.21875 -2.375,6.375 0,2.84375 c -0.0219,0.007 -0.0407,0.024 -0.0625,0.0312 -0.3299,0.11206 -0.64999,0.2405 -0.96875,0.375 -0.009,0.004 -0.0223,-0.004 -0.0312,0 -0.31212,0.13068 -0.63695,0.28642 -0.9375,0.4375 -0.0291,0.0149 -0.0648,0.0162 -0.0937,0.0312 -0.25899,0.13459 -0.50042,0.28814 -0.75,0.4375 -0.0407,0.0239 -0.0846,0.0382 -0.125,0.0625 -0.0764,0.0467 -0.14326,0.10815 -0.21875,0.15625 -0.19238,0.12073 -0.37635,0.21449 -0.5625,0.34375 -0.0848,0.0595 -0.16656,0.12622 -0.25,0.1875 -0.30297,0.2199 -0.59039,0.47685 -0.875,0.71875 -0.1587,0.13488 -0.31606,0.26482 -0.46875,0.40625 -0.1196,0.11203 -0.22798,0.22779 -0.34375,0.34375 -0.26952,0.26655 -0.53322,0.52575 -0.78125,0.8125 -0.24184,0.27959 -0.4673,0.57741 -0.6875,0.875 -0.67919,0.9179 -1.26881,1.90268 -1.71875,2.96875 l -3.21875,0 -6.375,2.375 -9.21875,0 -0.25,0 -9.21875,0 -6.28125,-2.34375 -3.375,-2.96875 c 3.71343,-22.19248 21.42713,-39.6804 43.7499,-42.9999 z m 16.375,0.15625 c 22.1913,3.68786 39.6626,21.32274 42.96875,43.78125 l -3.53125,3.0625 0.0625,0 -6.375,2.375 -9.21875,0 -0.25,0 -9.21875,0 -6.375,-2.375 -2.84375,0 c -0.007,-0.0221 -0.0238,-0.0404 -0.0312,-0.0625 -0.11419,-0.34119 -0.23712,-0.67069 -0.375,-1 -0.27185,-0.64069 -0.58069,-1.25397 -0.9375,-1.84375 -0.0321,-0.054 -0.0609,-0.10268 -0.0937,-0.15625 -0.0121,-0.0195 -0.019,-0.0431 -0.0312,-0.0625 -0.18907,-0.3054 -0.38347,-0.58528 -0.59375,-0.875 -0.2199,-0.30297 -0.47685,-0.59039 -0.71875,-0.875 -0.23844,-0.28054 -0.49137,-0.55099 -0.75,-0.8125 -0.26655,-0.26952 -0.52575,-0.53322 -0.8125,-0.78125 -0.27959,-0.24184 -0.57741,-0.4673 -0.875,-0.6875 -0.91791,-0.67919 -1.90268,-1.26881 -2.96875,-1.71875 l 0,-3.21875 -2.375,-6.375 0,-9.21875 0,-0.25 0,-9.21875 2.34375,-6.28125 2.99985,-3.40625 z m -8.15625,31.65625 c 1.03299,-0.006 1.92692,2.25218 2.28125,5.4375 -0.89409,-0.17199 -1.83752,-0.2484 -2.78125,-0.25 -0.16624,-2.9e-4 -0.33505,0.0264 -0.5,0.0312 -0.33747,0.01 -0.66869,0.0297 -1,0.0625 -0.0313,0.003 -0.0625,-0.003 -0.0937,0 -0.0416,0.004 -0.0835,-0.005 -0.125,0 0.35765,-3.09526 1.20513,-5.27518 2.2187,-5.2812 z m -0.75,12.625 0.21875,0 c 0.49822,8.4e-4 0.99873,0.0596 1.46875,0.15625 0.01,0.002 0.0213,-0.002 0.0312,0 0.22451,0.0472 0.43989,0.0888 0.65625,0.15625 0.20816,0.065 0.42548,0.13578 0.625,0.21875 0.0125,0.005 0.0188,0.026 0.0312,0.0312 0.009,0.004 0.0225,-0.004 0.0312,0 0.20698,0.0885 0.39723,0.20578 0.59375,0.3125 0.008,0.004 0.0231,-0.004 0.0312,0 0.19657,0.10768 0.37757,0.25017 0.5625,0.375 0.007,0.005 0.024,-0.005 0.0312,0 0.18468,0.12561 0.35936,0.26456 0.53125,0.40625 0.007,0.005 0.0248,-0.005 0.0312,0 0.48268,0.40046 0.91685,0.86359 1.28125,1.375 0.0341,0.0479 0.0608,0.10754 0.0937,0.15625 0.12978,0.19189 0.23262,0.38932 0.34375,0.59375 0.11113,0.20443 0.22124,0.40923 0.3125,0.625 0.0635,0.1528 0.13431,0.31078 0.1875,0.46875 0.0107,0.0314 0.021,0.0622 0.0312,0.0937 0.0613,0.19048 0.11051,0.39661 0.15625,0.59375 0.0145,0.0626 0.0184,0.12429 0.0312,0.1875 0.0344,0.16823 0.0711,0.32764 0.0937,0.5 0.004,0.0304 -0.004,0.0632 0,0.0937 0.0245,0.20693 0.0556,0.41296 0.0625,0.625 0.003,0.0822 1.4e-4,0.16711 0,0.25 -0.001,0.23851 -0.007,0.48617 -0.0312,0.71875 -10e-4,0.0101 10e-4,0.0212 0,0.0312 -0.0249,0.23214 -0.0787,0.46241 -0.125,0.6875 -0.002,0.01 0.002,0.0213 0,0.0312 -0.0472,0.22451 -0.0888,0.43989 -0.15625,0.65625 -0.003,0.009 0.003,0.0225 0,0.0312 -0.0629,0.19863 -0.13944,0.40303 -0.21875,0.59375 -0.005,0.0124 -0.026,0.0188 -0.0312,0.0312 -0.004,0.009 0.004,0.0227 0,0.0312 -0.0885,0.20697 -0.20578,0.39723 -0.3125,0.59375 -0.004,0.008 0.004,0.0231 0,0.0312 -0.10768,0.19657 -0.25017,0.37757 -0.375,0.5625 -0.005,0.007 0.005,0.024 0,0.0312 -0.12561,0.18468 -0.26456,0.35936 -0.40625,0.53125 -0.005,0.006 0.005,0.0256 0,0.0312 -0.14271,0.172 -0.31098,0.31077 -0.46875,0.46875 -0.28498,0.28535 -0.57708,0.57796 -0.90625,0.8125 -0.0493,0.0349 -0.10604,0.06 -0.15625,0.0937 -0.38377,0.25956 -0.78722,0.47372 -1.21875,0.65625 -0.1528,0.0635 -0.31078,0.13431 -0.46875,0.1875 -0.0314,0.0106 -0.0622,0.021 -0.0937,0.0312 -0.0316,0.0103 -0.062,0.0214 -0.0937,0.0312 -0.1608,0.0494 -0.33455,0.0866 -0.5,0.125 -0.24437,0.0567 -0.49677,0.0939 -0.75,0.125 -0.1443,0.0177 -0.29063,0.0221 -0.4375,0.0312 -0.0718,0.004 -0.14638,0.0289 -0.21875,0.0312 -0.0822,0.003 -0.16711,1.4e-4 -0.25,0 -0.24902,-10e-4 -0.50748,-0.005 -0.75,-0.0312 -0.23243,-0.0239 -0.46207,-0.0796 -0.6875,-0.125 -0.0102,-0.002 -0.0211,0.002 -0.0312,0 -0.22485,-0.0462 -0.4395,-0.0897 -0.65625,-0.15625 -0.009,-0.003 -0.0218,0.003 -0.0312,0 -0.11777,-0.0367 -0.22864,-0.0825 -0.34375,-0.125 -0.0838,-0.0313 -0.16768,-0.0595 -0.25,-0.0937 -0.0124,-0.005 -0.0189,-0.0261 -0.0312,-0.0312 -0.009,-0.004 -0.0226,0.004 -0.0312,0 -0.20739,-0.0878 -0.39677,-0.20651 -0.59375,-0.3125 -0.008,-0.004 -0.0236,0.004 -0.0312,0 -0.197,-0.10699 -0.37709,-0.25082 -0.5625,-0.375 -0.007,-0.005 -0.0242,0.005 -0.0312,0 -0.18515,-0.12498 -0.35886,-0.26515 -0.53125,-0.40625 -0.006,-0.005 -0.0253,0.005 -0.0312,0 -0.17246,-0.14217 -0.31027,-0.31148 -0.46875,-0.46875 -0.23952,-0.23921 -0.48341,-0.47929 -0.6875,-0.75 -0.039,-0.0518 -0.0873,-0.10338 -0.125,-0.15625 -0.0337,-0.0482 -0.0612,-0.10716 -0.0937,-0.15625 -0.35285,-0.5217 -0.6365,-1.08073 -0.84375,-1.6875 -0.0102,-0.0304 -0.0214,-0.0631 -0.0312,-0.0937 -0.0371,-0.11363 -0.0623,-0.22772 -0.0937,-0.34375 -0.0385,-0.14298 -0.0638,-0.2911 -0.0937,-0.4375 -0.0334,-0.16374 -0.0717,-0.33241 -0.0937,-0.5 -10e-4,-0.0102 0.001,-0.021 0,-0.0312 -10e-4,-0.0102 0.001,-0.0211 0,-0.0312 -0.0175,-0.14283 -0.0222,-0.29219 -0.0312,-0.4375 -0.005,-0.0739 -0.0288,-0.14426 -0.0312,-0.21875 l 0,-0.21875 c -3e-5,-0.0104 -2e-5,-0.0209 0,-0.0312 10e-4,-0.24902 0.005,-0.50748 0.0312,-0.75 0.0239,-0.23221 0.0796,-0.46248 0.125,-0.6875 0.002,-0.0102 -0.002,-0.0211 0,-0.0312 0.0462,-0.22444 0.0897,-0.44006 0.15625,-0.65625 0.003,-0.009 -0.003,-0.0219 0,-0.0312 0.0635,-0.20311 0.13824,-0.39889 0.21875,-0.59375 0.005,-0.0125 0.026,-0.0188 0.0312,-0.0312 0.004,-0.009 -0.004,-0.0226 0,-0.0312 0.0878,-0.20668 0.20651,-0.39758 0.3125,-0.59375 0.004,-0.008 -0.004,-0.0236 0,-0.0312 0.10699,-0.1962 0.25082,-0.37797 0.375,-0.5625 0.005,-0.007 -0.005,-0.0243 0,-0.0312 0.12498,-0.18427 0.26515,-0.35978 0.40625,-0.53125 0.005,-0.006 -0.005,-0.0253 0,-0.0312 0.14217,-0.17154 0.31148,-0.31122 0.46875,-0.46875 0.28498,-0.28535 0.57708,-0.57796 0.90625,-0.8125 0.0482,-0.0337 0.10716,-0.0612 0.15625,-0.0937 0.5217,-0.35285 1.08073,-0.6365 1.6875,-0.84375 0.0304,-0.0103 0.0631,-0.0214 0.0937,-0.0312 0.11363,-0.0371 0.22772,-0.0623 0.34375,-0.0937 0.14298,-0.0385 0.2911,-0.0638 0.4375,-0.0937 0.23484,-0.0479 0.47617,-0.10067 0.71875,-0.125 0.16563,-0.0168 0.33067,-0.0259 0.49975,-0.0313 z m -51.84375,4.28125 c 4.38664,0.10376 7.85133,1.13065 7.84375,2.40625 -0.008,1.27857 -3.50356,2.28165 -7.90625,2.375 -0.0213,-0.6126 -0.0625,-1.22597 -0.0625,-1.84375 0,-0.98561 0.071,-1.96528 0.125,-2.9375 z m 37.6875,0.125 c -0.17196,0.89407 -0.2484,1.83752 -0.25,2.78125 -8.3e-4,0.49565 0.0471,0.98559 0.0937,1.46875 10e-4,0.0104 -0.001,0.0208 0,0.0312 0.003,0.0308 -0.003,0.063 0,0.0937 0.004,0.0416 -0.005,0.0835 0,0.125 -3.09528,-0.35772 -5.27523,-1.20518 -5.28125,-2.21875 -0.006,-1.03291 2.25223,-1.92682 5.43755,-2.28115 z m 66.5625,0.9375 c 10e-4,0.0314 -10e-4,0.0624 0,0.0937 l 0.0312,1.78125 c 0,0.97507 -0.0409,1.94435 -0.0937,2.90625 -4.40158,-0.0995 -7.8826,-1.1276 -7.875,-2.40625 0.008,-1.28159 3.51994,-2.28585 7.9375,-2.37495 z m -37.625,0.15625 c 3.09529,0.3577 5.27523,1.20518 5.28125,2.21875 0.006,1.03299 -2.25218,1.92692 -5.4375,2.28125 0.17197,-0.89409 0.2484,-1.83752 0.25,-2.78125 2.8e-4,-0.16624 -0.0264,-0.33505 -0.0312,-0.5 -0.009,-0.29508 -0.0364,-0.58458 -0.0625,-0.875 -0.007,-0.0731 0.008,-0.14599 0,-0.21875 -0.004,-0.0416 0.005,-0.0835 -5e-5,-0.125 z m -56.34375,3.96875 9.21875,0 0.25,0 9.21875,0 6.375,2.375 2.84375,0 c 0.11383,0.3455 0.26817,0.66657 0.40625,1 0.004,0.009 -0.004,0.0222 0,0.0312 0.004,0.009 -0.004,0.0223 0,0.0312 0.13068,0.31212 0.28642,0.63695 0.4375,0.9375 0.14778,0.28911 0.30267,0.56623 0.46875,0.84375 0.0239,0.0407 0.0382,0.0846 0.0625,0.125 0.0467,0.0764 0.10815,0.14326 0.15625,0.21875 0.12073,0.19238 0.21449,0.37635 0.34375,0.5625 0.0595,0.0848 0.12622,0.16656 0.1875,0.25 0.34252,0.4719 0.72993,0.91722 1.125,1.34375 0.10694,0.11417 0.23323,0.20182 0.34375,0.3125 0.005,0.005 -0.005,0.026 0,0.0312 1.32812,1.34288 2.89009,2.44208 4.65625,3.1875 l 0,3.21875 2.375,6.375 0,9.21875 0,0.25 0,9.21875 -2.34375,6.28125 -2.96875,3.40625 C 365.33101,606.31799 347.86932,588.58181 344.5625,566.25 l 3.5,-3.0625 -0.0625,0 6.375,-2.375 z m 64.90625,1.0625 9.21875,0 0.25,0 9.21875,0 6.28125,2.34375 3.40625,3 c -3.71228,22.20816 -21.43398,39.67617 -43.78125,42.96875 l -3.0625,-3.53125 0,0.0625 -2.375,-6.375 0,-9.21875 0,-0.25 0,-9.21875 2.375,-6.375 0,-2.84375 c 0.0221,-0.007 0.0404,-0.0237 0.0625,-0.0312 0.32296,-0.10809 0.62516,-0.24566 0.9375,-0.375 0.009,-0.004 0.0223,0.004 0.0312,0 0.35117,-0.14624 0.72599,-0.29678 1.0625,-0.46875 0.27979,-0.1454 0.54371,-0.30614 0.8125,-0.46875 0.054,-0.0321 0.10268,-0.061 0.15625,-0.0937 0.23019,-0.14323 0.46613,-0.28205 0.6875,-0.4375 0.39155,-0.27189 0.76289,-0.59848 1.125,-0.90625 0.1587,-0.13639 0.31609,-0.26326 0.46875,-0.40625 0.1119,-0.10364 0.20393,-0.23669 0.3125,-0.34375 0.005,-0.005 0.0258,0.005 0.0312,0 1.34288,-1.32812 2.44208,-2.89009 3.1875,-4.65625 l 3.21875,0 6.3751,-2.3751 z M 393.375,572.9375 c 0.8941,0.17197 1.83752,0.2484 2.78125,0.25 0.48503,8.2e-4 0.96444,-0.0491 1.4375,-0.0937 0.0208,-0.002 0.0417,0.002 0.0625,0 0.0313,-0.003 0.0625,0.003 0.0937,0 0.0416,-0.004 0.0835,0.005 0.125,0 -0.35769,3.09529 -1.20518,5.27523 -2.21875,5.28125 -1.03293,0.006 -1.92687,-2.25223 -2.2812,-5.43755 z m 2.28125,29.84375 c 1.28165,0.008 2.2859,3.51994 2.375,7.9375 -0.61253,0.0213 -1.22604,0.0312 -1.84375,0.0312 -0.9961,0 -1.95508,-0.0386 -2.9375,-0.0937 0.0995,-4.40158 1.1276,-7.8826 2.40625,-7.875 z"
-           id="path3546" />
-      </g>
-    </g>
-    <g
-       inkscape:export-ydpi="22.851559"
-       inkscape:export-xdpi="22.851559"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_repeat.png"
-       style="stroke:none"
-       id="g3628">
-      <rect
-         y="1092.9506"
-         x="133.09335"
-         height="126.03077"
-         width="126.03078"
-         id="rect3033"
-         style="fill:none;stroke:none" />
-      <rect
-         y="1124.4402"
-         x="137.14285"
-         height="62.987011"
-         width="114.28571"
-         id="rect3366"
-         style="fill:#ffffff;stroke:none" />
-      <rect
-         inkscape:tile-y0="204.42882"
-         inkscape:tile-x0="10.714288"
-         inkscape:tile-h="5.7142835"
-         inkscape:tile-w="5.7142835"
-         inkscape:tile-cy="207.28596"
-         inkscape:tile-cx="13.571429"
-         style="fill:#000000;stroke:none"
-         id="rect3368"
-         width="5.7142835"
-         height="5.7142835"
-         x="143.57143"
-         y="1128.791"
-         rx="0.5360356"
-         ry="0.5360356" />
-      <use
-         style="stroke:none"
-         transform="translate(123.57143,0)"
-         height="128"
-         width="128"
-         id="use3370"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3372"
-         transform="translate(139.42857,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3374"
-         transform="translate(147.42856,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3376"
-         transform="translate(155.42856,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3378"
-         transform="translate(163.42856,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3380"
-         transform="translate(171.42855,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3382"
-         transform="translate(179.42855,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3384"
-         transform="translate(187.42855,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3386"
-         transform="translate(195.42855,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3388"
-         transform="translate(203.42854,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3390"
-         transform="translate(211.42854,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3392"
-         transform="translate(219.42854,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3394"
-         transform="translate(227.42853,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <use
-         style="stroke:none"
-         height="128"
-         width="128"
-         id="use3396"
-         transform="translate(235.42853,0)"
-         xlink:href="#rect3160"
-         inkscape:tiled-clone-of="#rect3160"
-         y="0"
-         x="0" />
-      <rect
-         ry="0.5360356"
-         rx="0.5360356"
-         y="1175.9338"
-         x="143.57143"
-         height="5.7142835"
-         width="5.7142835"
-         id="rect3398"
-         style="fill:#000000;stroke:none"
-         inkscape:tile-cx="13.571429"
-         inkscape:tile-cy="207.28596"
-         inkscape:tile-w="5.7142835"
-         inkscape:tile-h="5.7142835"
-         inkscape:tile-x0="10.714288"
-         inkscape:tile-y0="204.42882" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         id="use3400"
-         width="128"
-         height="128"
-         transform="translate(123.57143,47.142857)" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(139.42857,47.142857)"
-         id="use3402"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(147.42856,47.142857)"
-         id="use3404"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(155.42856,47.142857)"
-         id="use3406"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(163.42856,47.142857)"
-         id="use3408"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(171.42855,47.142857)"
-         id="use3410"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(179.42855,47.142857)"
-         id="use3412"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(187.42855,47.142857)"
-         id="use3414"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(195.42855,47.142857)"
-         id="use3416"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(203.42854,47.142857)"
-         id="use3418"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(211.42854,47.142857)"
-         id="use3420"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(219.42854,47.142857)"
-         id="use3422"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(227.42853,47.142857)"
-         id="use3424"
-         width="128"
-         height="128" />
-      <use
-         style="stroke:none"
-         x="0"
-         y="0"
-         inkscape:tiled-clone-of="#rect3160"
-         xlink:href="#rect3160"
-         transform="translate(235.42853,47.142857)"
-         id="use3426"
-         width="128"
-         height="128" />
-      <path
-         style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.11111116000000010;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 206.81038,1138.0564 -5.68284,4.5152 c -2.98872,-2.5063 -6.82711,-4.0286 -10.9959,-4.0286 -9.42176,0 -17.16528,7.7435 -17.16528,17.1653 0,9.4218 7.74352,16.9901 17.16528,16.9901 7.38633,0 13.73336,-4.6426 16.13381,-11.1905 l -6.14992,-1.4986 c -1.64581,3.8811 -5.45972,6.5586 -9.98389,6.5586 -6.05596,0 -10.85967,-4.8037 -10.85967,-10.8596 0,-6.0561 4.80371,-11.0349 10.85967,-11.0349 2.2469,0 4.31146,0.6958 6.03315,1.8683 l -5.62445,4.4762 16.27004,3.0166 0,-15.9781 z"
-         id="path3550"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       inkscape:export-ydpi="22.851559"
-       inkscape:export-xdpi="22.851559"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_yoyo.png"
-       id="g3737">
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3428"
-         width="126.03078"
-         height="126.03077"
-         x="268.09335"
-         y="1092.9506" />
-      <g
-         style="stroke:none"
-         id="g3467"
-         transform="matrix(0,-1,1,0,-825.71942,1219.0051)">
-        <rect
-           style="fill:#ffffff;stroke:none"
-           id="rect3469"
-           width="114.28571"
-           height="62.987011"
-           x="5.7142863"
-           y="1124.4402" />
-        <rect
-           ry="0.5360356"
-           rx="0.5360356"
-           y="1128.791"
-           x="12.142859"
-           height="5.7142835"
-           width="5.7142835"
-           id="rect3471"
-           style="fill:#000000;stroke:none"
-           inkscape:tile-cx="13.571429"
-           inkscape:tile-cy="207.28596"
-           inkscape:tile-w="5.7142835"
-           inkscape:tile-h="5.7142835"
-           inkscape:tile-x0="10.714288"
-           inkscape:tile-y0="204.42882" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           id="use3473"
-           width="128"
-           height="128"
-           transform="translate(-7.8571428,0)" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(7.9999969,0)"
-           id="use3475"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(15.999994,0)"
-           id="use3477"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(23.999991,0)"
-           id="use3479"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(31.999988,0)"
-           id="use3481"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(39.999984,0)"
-           id="use3483"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(47.999981,0)"
-           id="use3485"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(55.999978,0)"
-           id="use3487"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(63.999975,0)"
-           id="use3489"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(71.999972,0)"
-           id="use3491"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(79.999969,0)"
-           id="use3493"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(87.999966,0)"
-           id="use3495"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(95.999963,0)"
-           id="use3497"
-           width="128"
-           height="128" />
-        <use
-           style="stroke:none"
-           x="0"
-           y="0"
-           inkscape:tiled-clone-of="#rect3160"
-           xlink:href="#rect3160"
-           transform="translate(103.99996,0)"
-           id="use3499"
-           width="128"
-           height="128" />
-        <rect
-           inkscape:tile-y0="204.42882"
-           inkscape:tile-x0="10.714288"
-           inkscape:tile-h="5.7142835"
-           inkscape:tile-w="5.7142835"
-           inkscape:tile-cy="207.28596"
-           inkscape:tile-cx="13.571429"
-           style="fill:#000000;stroke:none"
-           id="rect3501"
-           width="5.7142835"
-           height="5.7142835"
-           x="12.142859"
-           y="1175.9338"
-           rx="0.5360356"
-           ry="0.5360356" />
-        <use
-           style="stroke:none"
-           transform="translate(-7.8571428,47.142857)"
-           height="128"
-           width="128"
-           id="use3503"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3505"
-           transform="translate(7.9999969,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3507"
-           transform="translate(15.999994,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3509"
-           transform="translate(23.999991,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3511"
-           transform="translate(31.999988,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3513"
-           transform="translate(39.999984,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3515"
-           transform="translate(47.999981,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3517"
-           transform="translate(55.999978,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3519"
-           transform="translate(63.999975,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3521"
-           transform="translate(71.999972,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3523"
-           transform="translate(79.999969,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3525"
-           transform="translate(87.999966,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3527"
-           transform="translate(95.999963,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-        <use
-           style="stroke:none"
-           height="128"
-           width="128"
-           id="use3529"
-           transform="translate(103.99996,47.142857)"
-           xlink:href="#rect3160"
-           inkscape:tiled-clone-of="#rect3160"
-           y="0"
-           x="0" />
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="fill:#000000;stroke:none"
-         id="path3552"
-         sodipodi:cx="321.22852"
-         sodipodi:cy="230.02541"
-         sodipodi:rx="11.111678"
-         sodipodi:ry="11.111678"
-         d="m 332.34019,230.02541 a 11.111678,11.111678 0 0 1 -11.11167,11.11167 11.111678,11.111678 0 0 1 -11.11168,-11.11167 11.111678,11.111678 0 0 1 11.11168,-11.11168 11.111678,11.111678 0 0 1 11.11167,11.11168 z"
-         transform="matrix(0,-1.5454545,1.5454545,0,-26.184071,1685.1769)" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:2.15597081px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 331.25712,1180.5787 -0.35925,-85.7172"
-         id="path3554"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-    </g>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3173"
-       y="1071.0903"
-       x="594.53717"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1071.0903"
-         x="594.53717"
-         id="tspan3175"
-         sodipodi:role="line">Player</tspan></text>
-    <path
-       sodipodi:nodetypes="ccccscccccccsscccccccccccccccccccccccccccccsccccc"
-       inkscape:connector-curvature="0"
-       id="path3017-2"
-       d="m 756.53969,1038.0468 14.64721,1.5152 -0.50507,-5.0508 5.05076,-25.2538 c 0,0 8.08122,-17.17245 8.08122,-15.15215 0,2.0203 2.77792,15.15215 2.77792,15.15215 l 20.96066,17.6777 -6.81853,7.3236 -0.75761,2.7779 12.62691,-8.5863 -4.54569,-4.0406 -18.68782,-17.1725 c 0,0 2.14126,-15.74195 1.10474,-28.26039 -1.03517,-12.502 0.88337,-20.79641 2.43079,-17.70157 3.03046,6.06092 3.03046,9.09138 3.03046,9.09138 l 3.53553,16.66751 -3.03046,3.53552 3.03046,-1.0101 1.01016,4.0406 3.53553,-3.5356 -3.53553,-4.54565 -3.03046,-19.69797 -4.54569,-10.6066 -3.53553,-10.6066 -4.04061,-5.3033 1.01015,-2.02031 0.26734,-7.83309 -2.79272,-4.28874 -7.57615,2.02031 c -1.0778,1.68358 -0.34562,3.36717 1.2627,5.05076 l -1.2627,6.81853 1.51523,0 2.27285,2.77792 1.76776,-1.01015 2.90113,2.13652 -1.13336,3.67185 -0.75761,6.06092 -2.02031,13.63706 -8.08122,15.15228 -3.53553,1.01016 1.51523,3.53553 3.53553,-3.53553 0.50508,-2.02031 c 0,0 8.58629,-14.14213 7.07106,-11.61675 -1.51523,2.52538 -1.76776,11.11168 -1.76776,11.11168 l -8.83884,28.78923 c 0.90467,9.3807 -1.08568,18.0376 -2.77792,26.7691 l -11.16964,0.9902 z"
-       style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <g
-       inkscape:export-ydpi="22.851562"
-       inkscape:export-xdpi="22.851562"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_player.png"
-       id="g3991">
-      <rect
-         style="fill:none;stroke:none"
-         id="rect3179"
-         width="126.03078"
-         height="126.03077"
-         x="544.41321"
-         y="926.27539" />
-      <g
-         id="g3986"
-         transform="matrix(1.496623,0,0,1.496623,-293.67843,-733.71816)">
-        <path
-           sodipodi:nodetypes="cccccc"
-           transform="translate(0,924.3622)"
-           inkscape:connector-curvature="0"
-           id="path3212"
-           d="m 585.71429,195.14286 -14.28572,24.28571 31.42857,41.42857 31.42857,-40 -12.14286,-25 z"
-           style="fill:none;stroke:#ffffff;stroke-width:6.19999980999999956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <text
-           sodipodi:linespacing="125%"
-           id="text3214"
-           y="1162.3622"
-           x="590.71429"
-           style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Paytone One;-inkscape-font-specification:Paytone One"
-           xml:space="preserve"><tspan
-             y="1162.3622"
-             x="590.71429"
-             id="tspan3216"
-             sodipodi:role="line">P</tspan></text>
-      </g>
-    </g>
-    <g
-       inkscape:export-ydpi="46.72699"
-       inkscape:export-xdpi="46.72699"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/gfx/on.png"
-       id="g3199">
-      <rect
-         style="fill:#00ff00;stroke:#ffffff;stroke-width:4.64423036999999983;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect3191"
-         width="95.499977"
-         height="48.022785"
-         x="-55.326122"
-         y="1640.5033"
-         rx="24"
-         ry="24" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#ffffff;stroke:none"
-         id="path3193"
-         sodipodi:cx="-20.203051"
-         sodipodi:cy="743.18292"
-         sodipodi:rx="15.152288"
-         sodipodi:ry="15.152288"
-         d="m -5.0507622,743.18292 a 15.152288,15.152288 0 0 1 -15.1522888,15.15229 15.152288,15.152288 0 0 1 -15.152288,-15.15229 15.152288,15.152288 0 0 1 15.152288,-15.15229 15.152288,15.152288 0 0 1 15.1522888,15.15229 z"
-         transform="matrix(1.2440211,0,0,1.2440211,-3.1106396,739.97943)" />
-      <text
-         xml:space="preserve"
-         style="font-size:18.05382918999999831px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         x="-38.695808"
-         y="1669.6108"
-         id="text3195"
-         sodipodi:linespacing="125%"><tspan
-           style="font-size:14px;fill:#000000"
-           sodipodi:role="line"
-           id="tspan3197"
-           x="-38.695808"
-           y="1669.6108">ON</tspan></text>
-    </g>
-    <g
-       inkscape:export-ydpi="46.72699"
-       inkscape:export-xdpi="46.72699"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/gfx/off.png"
-       transform="translate(122.22846,0)"
-       id="g3205">
-      <rect
-         ry="24"
-         rx="24"
-         y="1640.5033"
-         x="-55.326122"
-         height="48.022785"
-         width="95.499977"
-         id="rect3207"
-         style="fill:#ff0000;stroke:#ffffff;stroke-width:4.64423036999999983;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         transform="matrix(1.2440211,0,0,1.2440211,38.88936,739.97943)"
-         d="m -5.0507622,743.18292 a 15.152288,15.152288 0 0 1 -15.1522888,15.15229 15.152288,15.152288 0 0 1 -15.152288,-15.15229 15.152288,15.152288 0 0 1 15.152288,-15.15229 15.152288,15.152288 0 0 1 15.1522888,15.15229 z"
-         sodipodi:ry="15.152288"
-         sodipodi:rx="15.152288"
-         sodipodi:cy="743.18292"
-         sodipodi:cx="-20.203051"
-         id="path3209"
-         style="fill:#ffffff;stroke:none"
-         sodipodi:type="arc" />
-      <text
-         sodipodi:linespacing="125%"
-         id="text3211"
-         y="1669.6108"
-         x="0.20067596"
-         style="font-size:18.05382918999999831px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-size:14px;fill:#000000"
-           y="1669.6108"
-           x="0.20067596"
-           id="tspan3213"
-           sodipodi:role="line">OFF</tspan></text>
-    </g>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3053-8"
-       y="1919.7854"
-       x="21.944715"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1919.7854"
-         x="21.944715"
-         id="tspan3055-7"
-         sodipodi:role="line">new</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3053-5"
-       y="1922.6426"
-       x="167.659"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1922.6426"
-         x="167.659"
-         id="tspan3055-9"
-         sodipodi:role="line">edit</tspan></text>
-    <text
-       sodipodi:linespacing="125%"
-       id="text3053-50"
-       y="1929.7854"
-       x="314.80185"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       xml:space="preserve"><tspan
-         y="1929.7854"
-         x="314.80185"
-         id="tspan3055-94"
-         sodipodi:role="line">delete</tspan></text>
-    <g
-       id="g4607"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-       inkscape:export-xdpi="11.425782"
-       inkscape:export-ydpi="11.425782">
-      <g
-         id="g3674-5"
-         style="stroke:none"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-         inkscape:export-xdpi="22.851559"
-         inkscape:export-ydpi="22.851559"
-         transform="translate(-288.68382,513.5698)">
-        <rect
-           y="1262.6561"
-           x="261.38272"
-           height="126.03077"
-           width="126.03078"
-           id="rect3051-3"
-           style="fill:none;stroke:none" />
-        <g
-           style="fill:#000000;stroke:none"
-           inkscape:export-ydpi="84"
-           inkscape:export-xdpi="84"
-           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-           transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-           id="g1013-6" />
-      </g>
-      <g
-         transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
-         id="g4563">
-        <rect
-           style="fill:#ffffff;stroke:none"
-           id="rect4559"
-           width="82.85714"
-           height="17.857143"
-           x="-2.8571429"
-           y="903.71429"
-           transform="translate(0,924.3622)" />
-        <rect
-           transform="matrix(0,-1,1,0,0,0)"
-           y="29.642855"
-           x="-1878.4336"
-           height="17.857143"
-           width="82.85714"
-           id="rect4561"
-           style="fill:#ffffff;stroke:none" />
-      </g>
-    </g>
-    <g
-       id="g4615"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_delete.png"
-       inkscape:export-xdpi="11.425779"
-       inkscape:export-ydpi="11.425779">
-      <g
-         id="g3674-4"
-         style="stroke:none"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-         inkscape:export-xdpi="22.851559"
-         inkscape:export-ydpi="22.851559"
-         transform="translate(4.1733203,523.5698)">
-        <rect
-           y="1262.6561"
-           x="261.38272"
-           height="126.03077"
-           width="126.03078"
-           id="rect3051-37"
-           style="fill:none;stroke:none" />
-        <g
-           style="fill:#000000;stroke:none"
-           inkscape:export-ydpi="84"
-           inkscape:export-xdpi="84"
-           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-           transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-           id="g1013-0" />
-      </g>
-      <g
-         transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
-         id="g4563-2">
-        <rect
-           style="fill:#ffffff;stroke:none"
-           id="rect4559-8"
-           width="82.85714"
-           height="17.857143"
-           x="-2.8571429"
-           y="903.71429"
-           transform="translate(0,924.3622)" />
-        <rect
-           transform="matrix(0,-1,1,0,0,0)"
-           y="29.642855"
-           x="-1878.4336"
-           height="17.857143"
-           width="82.85714"
-           id="rect4561-6"
-           style="fill:#ffffff;stroke:none" />
-      </g>
-    </g>
-    <g
-       id="g4599"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_edit.png"
-       inkscape:export-xdpi="11.425782"
-       inkscape:export-ydpi="11.425782">
-      <g
-         id="g3674-3"
-         style="stroke:none;fill:none"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-         inkscape:export-xdpi="22.851559"
-         inkscape:export-ydpi="22.851559"
-         transform="translate(-142.96954,516.42694)">
-        <rect
-           y="1262.6561"
-           x="261.38272"
-           height="126.03077"
-           width="126.03078"
-           id="rect3051-4"
-           style="fill:none;stroke:none" />
-        <g
-           style="fill:none;stroke:none"
-           inkscape:export-ydpi="84"
-           inkscape:export-xdpi="84"
-           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-           transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-           id="g1013-9" />
-      </g>
-      <g
-         transform="matrix(0.58089536,0.64433569,-0.6672057,0.60151362,1531.3474,550.78291)"
-         id="g4595">
-        <rect
-           style="fill:#ffffff;stroke:none"
-           id="rect4591"
-           width="40.406101"
-           height="123.23861"
-           x="43.436558"
-           y="1079.5637"
-           transform="translate(0,924.3622)" />
-        <path
-           style="fill:#ffffff;stroke:none"
-           d="m 43.43656,2130.195 40.911177,0 -21.718279,38.8908 z"
-           id="path4593"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       x="19.92441"
-       y="2125.8564"
-       id="text4623"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan4625"
-         x="19.92441"
-         y="2125.8564">create</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       x="163.63869"
-       y="2128.7136"
-       id="text4627"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan4629"
-         x="163.63869"
-         y="2128.7136">load</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       x="312.78156"
-       y="2135.8564"
-       id="text4631"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan4633"
-         x="312.78156"
-         y="2135.8564">save</tspan></text>
-    <g
-       id="g5565"
-       inkscape:export-filename="ic_new.png"
-       inkscape:export-xdpi="31.632902"
-       inkscape:export-ydpi="31.632902"
-       style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none">
-      <g
-         style="stroke:#ffffff;fill:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="translate(-2.0203051,206.07112)"
-         id="g4635"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-ydpi="11.425782">
-        <g
-           id="g4637"
-           style="stroke:#ffffff;fill:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-ydpi="22.851559"
-           transform="translate(-288.68382,513.5698)">
-          <rect
-             y="1262.6561"
-             x="261.38272"
-             height="126.03077"
-             width="126.03078"
-             id="rect4639"
-             style="fill:none;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
-          <g
-             style="fill:#000000;stroke:#ffffff;stroke-width:5.1259011;stroke-miterlimit:4;stroke-dasharray:none"
-             inkscape:export-ydpi="84"
-             inkscape:export-xdpi="84"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             id="g4641" />
-        </g>
-        <g
-           style="stroke:#ffffff;fill:#000000;stroke-width:3.53658537;stroke-miterlimit:4;stroke-dasharray:none"
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
-           id="g4643" />
-      </g>
-      <path
-         id="rect4677"
-         d="m 7.1985045,2086.4601 0,-83.3942 43.6849975,0 13.781141,12.4884 0,70.9058 -57.4661385,0 z"
-         style="fill:none;stroke:#ffffff;stroke-width:3.90262389;stroke-miterlimit:4;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-      <g
-         transform="matrix(0.90862148,0,0,0.90862148,16.144977,178.2984)"
-         id="g5474"
-         style="stroke-width:5.50284151;stroke-miterlimit:4;stroke-dasharray:none">
-        <g
-           id="g5470"
-           transform="translate(1.3242213e-6,8.5864751)"
-           style="stroke-width:5.50284151;stroke-miterlimit:4;stroke-dasharray:none">
-          <rect
-             y="2039.0024"
-             x="5.2726517"
-             height="6.9985328"
-             width="32.473194"
-             id="rect4559-6"
-             style="fill:#ffffff;stroke:none" />
-          <rect
-             style="fill:#ffffff;stroke:none"
-             id="rect4561-7"
-             width="32.473194"
-             height="6.9985328"
-             x="-2058.738"
-             y="18.009981"
-             transform="matrix(0,-1,1,0,0,0)" />
-        </g>
-      </g>
-      <path
-         inkscape:connector-curvature="0"
-         id="path5484"
-         d="m 50.242774,2002.9543 0,13.4036 14.586308,-0.7885"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:3.90262389;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    </g>
-    <g
-       id="g5579"
-       inkscape:export-filename="ic_load.png"
-       inkscape:export-xdpi="31.632902"
-       inkscape:export-ydpi="31.632902"
-       style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none">
-      <use
-         height="128"
-         width="128"
-         transform="translate(140.91628,0)"
-         id="use5513"
-         xlink:href="#g4635"
-         y="0"
-         x="0"
-         style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 190.55279,2026.0212 -5.93099,-8.8652 17.40328,-10.5317 -3.88673,-6.4226 17.62571,-1.3169 c 0,0 -7.08684,19.0975 -7.40098,19.104 -0.31419,0.01 -3.26576,-5.8642 -3.26576,-5.8642 z"
-         id="path5563"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         inkscape:export-xdpi="100"
-         inkscape:export-ydpi="100" />
-      <path
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="rect5517"
-         d="m 134.37709,2021.7775 -0.61508,11.8608 c 0.0414,13.531 0,38.2634 0,38.2634 l 0.61508,9.8836 77.9892,0 0.59083,-9.8836 0,-31.0401 -0.0256,-7.8837 -34.11349,0.184 -3.82121,-11.3844 z"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-    <g
-       id="g5584"
-       inkscape:export-filename="ic_save.png"
-       inkscape:export-xdpi="31.632902"
-       inkscape:export-ydpi="31.632902"
-       style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none">
-      <use
-         height="128"
-         width="128"
-         transform="translate(294.96454,0)"
-         id="use5515"
-         xlink:href="#g4635"
-         y="0"
-         x="0"
-         style="stroke:none;fill:none;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cccc"
-         transform="translate(0,924.3622)"
-         inkscape:connector-curvature="0"
-         id="path5524"
-         d="m 294.10714,1134.1985 10.53572,-20.1271 48.92857,-0.1786 12.76476,21.0331"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:3.878;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         y="2060.4944"
-         x="293.95438"
-         height="18.244036"
-         width="72.077965"
-         id="rect5522"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:3.878;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1;fill-rule:nonzero" />
-      <path
-         inkscape:export-ydpi="100"
-         inkscape:export-xdpi="100"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path936-1-3"
-         d="m 321.5193,1995.8714 17.89877,-0.9709 -3.65706,33.6189 12.61562,-0.1106 -18.34905,21.7577 c 0,0 -16.3866,-21.7713 -16.12662,-22.2309 0.25998,-0.4597 11.27603,0.3081 11.27603,0.3081 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-    <g
-       id="g3313"
-       style="stroke:none"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_closed.png"
-       inkscape:export-xdpi="11.42578"
-       inkscape:export-ydpi="11.42578">
-      <g
-         style="stroke:none"
-         inkscape:export-ydpi="11.425782"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         id="g4607-4"
-         transform="translate(-27.142861,404.54946)">
-        <g
-           transform="translate(-288.68382,513.5698)"
-           inkscape:export-ydpi="22.851559"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           style="stroke:none"
-           id="g3674-5-2">
-          <rect
-             style="fill:none;stroke:none"
-             id="rect3051-3-4"
-             width="126.03078"
-             height="126.03077"
-             x="261.38272"
-             y="1262.6561" />
-          <g
-             id="g1013-6-8"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             inkscape:export-xdpi="84"
-             inkscape:export-ydpi="84"
-             style="fill:#000000;stroke:none" />
-        </g>
-        <g
-           style="stroke:none"
-           id="g4563-24"
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3311"
-         d="m -14.049142,2200.2193 0,82.1429 79.526853,-41.8563 z"
-         style="fill:#ffffff;stroke:none" />
-    </g>
-    <g
-       style="stroke:none"
-       id="g3321"
-       transform="translate(160,0)"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_open.png"
-       inkscape:export-xdpi="11.42578"
-       inkscape:export-ydpi="11.42578">
-      <g
-         transform="translate(-27.142861,404.54946)"
-         id="g3323"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-ydpi="11.425782"
-         style="stroke:none">
-        <g
-           id="g3325"
-           style="stroke:none"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-ydpi="22.851559"
-           transform="translate(-288.68382,513.5698)">
-          <rect
-             y="1262.6561"
-             x="261.38272"
-             height="126.03077"
-             width="126.03078"
-             id="rect3327"
-             style="fill:none;stroke:none" />
-          <g
-             style="fill:#000000;stroke:none"
-             inkscape:export-ydpi="84"
-             inkscape:export-xdpi="84"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             id="g3329" />
-        </g>
-        <g
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
-           id="g3331"
-           style="stroke:none" />
-      </g>
-      <path
-         style="fill:#ffffff;stroke:none"
-         d="m 63.388183,2202.7194 -78.20494,0 39.849666,75.7143 z"
-         id="path3333"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <g
-       id="g1815"
-       transform="matrix(0.24964649,0,0,0.24964645,530.59606,1588.5497)"
-       inkscape:export-filename="ic_exit.png"
-       inkscape:export-xdpi="32.970726"
-       inkscape:export-ydpi="32.970726">
-      <rect
-         y="1582.7637"
-         x="-477.78488"
-         height="504.44907"
-         width="504.4491"
-         id="rect1803"
-         style="color:#000000;fill:none;stroke:none;stroke-width:8.01132898;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssc"
-         inkscape:connector-curvature="0"
-         id="path1805"
-         d="m -280.35079,1721.6125 c -46.76834,20.9939 -79.34593,68.0326 -79.34593,122.6945 0,74.2148 60.04826,134.3675 134.13422,134.3675 74.08596,0 134.134218,-60.1527 134.134218,-134.3675 0,-54.6692 -32.570828,-101.7074 -79.345918,-122.6945"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:40;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         ry="25.204872"
-         rx="46.820614"
-         y="1681.4468"
-         x="-237.85724"
-         height="89.585251"
-         width="24.593159"
-         id="rect1813"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-    <g
-       id="g4110"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_copy.png"
-       inkscape:export-xdpi="11.425776"
-       inkscape:export-ydpi="11.425776">
-      <path
-         inkscape:connector-curvature="0"
-         id="rect3277"
-         d="m 446.91084,1790.0521 0,94.4841 19.91422,0 0,-76.3951 47.19477,0 0,-18.089 z"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:nodetypes="ccccccc" />
-      <rect
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect4049"
-         width="67.111794"
-         height="94.486343"
-         x="466.81018"
-         y="1808.1482"
-         ry="0" />
-      <g
-         style="fill:none;stroke:#ffffff"
-         transform="translate(160.67447,-2.3981265)"
-         id="g4086"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_delete.png"
-         inkscape:export-xdpi="11.425779"
-         inkscape:export-ydpi="11.425779">
-        <g
-           id="g4088"
-           style="stroke:#ffffff;fill:none"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-ydpi="22.851559"
-           transform="translate(4.1733203,523.5698)">
-          <rect
-             y="1262.6561"
-             x="261.38272"
-             height="126.03077"
-             width="126.03078"
-             id="rect4090"
-             style="fill:none;stroke:none" />
-          <g
-             style="fill:none;stroke:#ffffff"
-             inkscape:export-ydpi="84"
-             inkscape:export-xdpi="84"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             id="g4092" />
-        </g>
-        <g
-           style="fill:none;stroke:#ffffff"
-           transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
-           id="g4094" />
-      </g>
-    </g>
-    <g
-       id="g4125"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_paste.png"
-       inkscape:export-xdpi="11.42576"
-       inkscape:export-ydpi="11.42576"
-       transform="matrix(1,0,0,0.99518639,0,9.1933229)">
-      <rect
-         ry="0"
-         y="1800.9037"
-         x="596.2774"
-         height="99.198151"
-         width="70.458496"
-         id="rect4068"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path4082"
-         d="m 600.33342,1816.2191 63.73704,-1.0293 -12.48455,-11.8391 -7.88501,-11.3242 c -11.82619,-15.378 -21.41765,-7.8304 -28.25456,1.5442 l -3.28541,10.2948 z"
-         style="color:#000000;fill:#ffffff;stroke:none;stroke-width:4.19739103;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         transform="matrix(2.246881,0,0,2.246881,-721.16059,-148.64363)"
-         d="m 605.12725,865.42389 a 3.9968774,3.9968774 0 0 1 -3.99688,3.99688 3.9968774,3.9968774 0 0 1 -3.99688,-3.99688 3.9968774,3.9968774 0 0 1 3.99688,-3.99688 3.9968774,3.9968774 0 0 1 3.99688,3.99688 z"
-         sodipodi:ry="3.9968774"
-         sodipodi:rx="3.9968774"
-         sodipodi:cy="865.42389"
-         sodipodi:cx="601.13037"
-         id="path4084"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <g
-         inkscape:export-ydpi="11.425779"
-         inkscape:export-xdpi="11.425779"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_delete.png"
-         id="g4100"
-         transform="translate(302.96331,-2.3981265)"
-         style="fill:none;stroke:#ffffff">
-        <g
-           transform="translate(4.1733203,523.5698)"
-           inkscape:export-ydpi="22.851559"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           style="fill:none;stroke:#ffffff"
-           id="g4102">
-          <rect
-             style="fill:none;stroke:none"
-             id="rect4104"
-             width="126.03078"
-             height="126.03077"
-             x="261.38272"
-             y="1262.6561" />
-          <g
-             id="g4106"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             inkscape:export-xdpi="84"
-             inkscape:export-ydpi="84"
-             style="fill:none;stroke:#ffffff" />
-        </g>
-        <g
-           id="g4108"
-           transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
-           style="fill:none;stroke:#ffffff" />
-      </g>
-    </g>
-    <g
-       style="stroke:none"
-       id="g4154"
-       transform="translate(348.65262,0)"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_down.png"
-       inkscape:export-xdpi="11.425779"
-       inkscape:export-ydpi="11.425779">
-      <g
-         transform="translate(-27.142861,404.54946)"
-         id="g4156"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-ydpi="11.425782"
-         style="stroke:none">
-        <g
-           id="g4158"
-           style="stroke:none"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-ydpi="22.851559"
-           transform="translate(-288.68382,513.5698)">
-          <rect
-             y="1262.6561"
-             x="261.38272"
-             height="126.03077"
-             width="126.03078"
-             id="rect4160"
-             style="fill:none;stroke:none" />
-          <g
-             style="fill:#000000;stroke:none"
-             inkscape:export-ydpi="84"
-             inkscape:export-xdpi="84"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             id="g4162" />
-        </g>
-        <g
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
-           id="g4164"
-           style="stroke:none" />
-      </g>
-      <path
-         style="fill:#ffffff;stroke:none;stroke-width:1.50016773000000003"
-         d="m 66.95847,2187.3801 -117.320534,0 59.7811862,113.5841 z"
-         id="path4166"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <g
-       inkscape:export-ydpi="11.425779"
-       inkscape:export-xdpi="11.425779"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_up.png"
-       transform="matrix(-1,0,0,-1,512.88056,4487.5815)"
-       id="g4168"
-       style="stroke:none">
-      <g
-         style="stroke:none"
-         inkscape:export-ydpi="11.425782"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         id="g4170"
-         transform="translate(-27.142861,404.54946)">
-        <g
-           transform="translate(-288.68382,513.5698)"
-           inkscape:export-ydpi="22.851559"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           style="stroke:none"
-           id="g4172">
-          <rect
-             style="fill:none;stroke:none"
-             id="rect4174"
-             width="126.03078"
-             height="126.03077"
-             x="261.38272"
-             y="1262.6561" />
-          <g
-             id="g4176"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             inkscape:export-xdpi="84"
-             inkscape:export-ydpi="84"
-             style="fill:#000000;stroke:none" />
-        </g>
-        <g
-           style="stroke:none"
-           id="g4178"
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path4180"
-         d="m 66.95847,2187.3801 -117.320534,0 59.7811862,113.5841 z"
-         style="fill:#ffffff;stroke:none;stroke-width:1.50016773000000003" />
-    </g>
-    <g
-       inkscape:export-ydpi="11.425782"
-       inkscape:export-xdpi="11.425782"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_right.png"
-       transform="matrix(0,-1,1,0,-1418.8353,2247.2069)"
-       id="g4168-9"
-       style="stroke:none">
-      <g
-         style="stroke:none"
-         inkscape:export-ydpi="11.425782"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         id="g4170-6"
-         transform="translate(-27.142861,404.54946)">
-        <g
-           transform="translate(-288.68382,513.5698)"
-           inkscape:export-ydpi="22.851559"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           style="stroke:none"
-           id="g4172-1">
-          <rect
-             style="fill:none;stroke:none"
-             id="rect4174-1"
-             width="126.03078"
-             height="126.03077"
-             x="261.38272"
-             y="1262.6561" />
-          <g
-             id="g4176-8"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             inkscape:export-xdpi="84"
-             inkscape:export-ydpi="84"
-             style="fill:#000000;stroke:none" />
-        </g>
-        <g
-           style="stroke:none"
-           id="g4178-2"
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path4180-8"
-         d="m 66.95847,2187.3801 -117.320534,0 59.7811862,113.5841 z"
-         style="fill:#ffffff;stroke:none" />
-    </g>
-    <g
-       inkscape:export-ydpi="11.425782"
-       inkscape:export-xdpi="11.425782"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_left.png"
-       transform="matrix(0,1,-1,0,2908.8712,2233.2614)"
-       id="g4168-3"
-       style="stroke:none">
-      <g
-         style="stroke:none"
-         inkscape:export-ydpi="11.425782"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         id="g4170-4"
-         transform="translate(-27.142861,404.54946)">
-        <g
-           transform="translate(-288.68382,513.5698)"
-           inkscape:export-ydpi="22.851559"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           style="stroke:none"
-           id="g4172-7">
-          <rect
-             style="fill:none;stroke:none"
-             id="rect4174-3"
-             width="126.03078"
-             height="126.03077"
-             x="261.38272"
-             y="1262.6561" />
-          <g
-             id="g4176-6"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             inkscape:export-xdpi="84"
-             inkscape:export-ydpi="84"
-             style="fill:#000000;stroke:none" />
-        </g>
-        <g
-           style="stroke:none"
-           id="g4178-4"
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path4180-2"
-         d="m 66.95847,2187.3801 -117.320534,0 59.7811862,113.5841 z"
-         style="fill:#ffffff;stroke:none" />
-    </g>
-    <g
-       style="stroke:none"
-       id="g4486"
-       transform="matrix(0,-1,1,0,-1415.6378,2400.687)"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_right_disabled.png"
-       inkscape:export-xdpi="11.425782"
-       inkscape:export-ydpi="11.425782">
-      <g
-         transform="translate(-27.142861,404.54946)"
-         id="g4488"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-ydpi="11.425782"
-         style="stroke:none">
-        <g
-           id="g4490"
-           style="stroke:none"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-ydpi="22.851559"
-           transform="translate(-288.68382,513.5698)">
-          <rect
-             y="1262.6561"
-             x="261.38272"
-             height="126.03077"
-             width="126.03078"
-             id="rect4492"
-             style="fill:none;stroke:none" />
-          <g
-             style="fill:#000000;stroke:none"
-             inkscape:export-ydpi="84"
-             inkscape:export-xdpi="84"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             id="g4494" />
-        </g>
-        <g
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
-           id="g4496"
-           style="stroke:none" />
-      </g>
-      <path
-         style="fill:#404040;fill-opacity:1;stroke:none"
-         d="m 66.95847,2187.3801 -117.320534,0 59.7811862,113.5841 z"
-         id="path4498"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <g
-       style="stroke:none"
-       id="g4500"
-       transform="matrix(0,1,-1,0,2908.8712,2386.7415)"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_left_disabled.png"
-       inkscape:export-xdpi="11.425782"
-       inkscape:export-ydpi="11.425782">
-      <g
-         transform="translate(-27.142861,404.54946)"
-         id="g4502"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-ydpi="11.425782"
-         style="stroke:none">
-        <g
-           id="g4504"
-           style="stroke:none"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-ydpi="22.851559"
-           transform="translate(-288.68382,513.5698)">
-          <rect
-             y="1262.6561"
-             x="261.38272"
-             height="126.03077"
-             width="126.03078"
-             id="rect4506"
-             style="fill:none;stroke:none" />
-          <g
-             style="fill:#000000;stroke:none"
-             inkscape:export-ydpi="84"
-             inkscape:export-xdpi="84"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             id="g4508" />
-        </g>
-        <g
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
-           id="g4510"
-           style="stroke:none" />
-      </g>
-      <path
-         style="fill:#404040;stroke:none;fill-opacity:1"
-         d="m 66.95847,2187.3801 -117.320534,0 59.7811862,113.5841 z"
-         id="path4512"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <g
-       style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
-       inkscape:export-ydpi="31.632902"
-       inkscape:export-xdpi="31.632902"
-       inkscape:export-filename="ic_save_disabled.png"
-       id="g4514"
-       transform="translate(292.57142,0)">
-      <g
-         inkscape:export-ydpi="11.425782"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         id="use4516"
-         transform="translate(292.94423,206.07112)"
-         style="fill:#000000;stroke:#404040;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-        <g
-           transform="translate(-288.68382,513.5698)"
-           inkscape:export-ydpi="22.851559"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           style="fill:#000000;stroke:#404040;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="g4526">
-          <rect
-             style="fill:none;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect4528"
-             width="126.03078"
-             height="126.03077"
-             x="261.38272"
-             y="1262.6561" />
-          <g
-             id="g4530"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             inkscape:export-xdpi="84"
-             inkscape:export-ydpi="84"
-             style="fill:#000000;stroke:#404040;stroke-width:5.12590122000000026;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-        <g
-           id="g4532"
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
-           style="fill:#000000;stroke:#404040;stroke-width:3.53658532999999986;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-      <path
-         style="color:#000000;fill:none;stroke:#404040;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 294.10714,1134.1985 10.53572,-20.1271 48.92857,-0.1786 12.76476,21.0331"
-         id="path4518"
-         inkscape:connector-curvature="0"
-         transform="translate(0,924.3622)"
-         sodipodi:nodetypes="cccc" />
-      <rect
-         style="color:#000000;fill:none;stroke:#404040;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect4520"
-         width="72.077965"
-         height="18.244036"
-         x="293.95438"
-         y="2060.4944" />
-      <path
-         style="color:#000000;fill:#404040;fill-opacity:1;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 321.5193,1995.8714 17.89877,-0.9709 -3.65706,33.6189 12.61562,-0.1106 -18.34905,21.7577 c 0,0 -16.3866,-21.7713 -16.12662,-22.2309 0.25998,-0.4597 11.27603,0.3081 11.27603,0.3081 z"
-         id="path4522"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         inkscape:export-xdpi="100"
-         inkscape:export-ydpi="100" />
-    </g>
-    <g
-       id="g4887"
-       inkscape:export-filename="ic_package.png"
-       inkscape:export-xdpi="32.359936"
-       inkscape:export-ydpi="32.359936">
-      <g
-         id="g4534"
-         transform="matrix(0.24964649,0,0,0.24964645,823.16748,1588.5497)"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_exit.png"
-         inkscape:export-xdpi="32.970726"
-         inkscape:export-ydpi="32.970726">
-        <rect
-           y="1582.7637"
-           x="-477.78488"
-           height="504.44907"
-           width="504.4491"
-           id="rect4536"
-           style="color:#000000;fill:none;stroke:none;stroke-width:8.0113287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-      <path
-         inkscape:connector-curvature="0"
-         id="path4855"
-         d="m 757.41873,2100.9683 2.66081,-46.1208 49.66859,-9.7563 -3.54776,46.1208 z"
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4857"
-         d="m 728.14973,2038.4391 -4.43468,48.3382 31.92981,14.191 2.21734,-45.2338 z"
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4859"
-         d="m 727.70627,2036.6652 43.01655,-16.4083 36.36449,23.0604 -48.78165,11.5302 z"
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4861"
-         d="m 758.30567,2056.6214 11.08674,17.2953 52.77287,-21.73 -17.73879,-8.8694 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4863"
-         d="m 725.04545,2037.1086 -11.97367,17.7389 36.3645,22.1734 9.75634,-20.3995 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4865"
-         d="m 726.81934,2035.3348 -16.40837,-16.8517 53.21633,-14.1911 7.09552,14.191 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path4867"
-         d="m 782.25303,2005.1788 -7.98246,15.965 31.9298,20.3995 16.85185,-20.8429 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         inkscape:export-ydpi="100"
-         inkscape:export-xdpi="100"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path4522-4"
-         d="m 759.75945,1993.3214 15.21574,-0.9018 -3.10888,31.2226 10.72453,-0.1022 -15.5985,20.2067 c 0,0 -13.93025,-20.2194 -13.70924,-20.6462 0.22102,-0.427 9.58574,0.286 9.58574,0.286 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#979797;stroke-width:2.21230483;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    </g>
-    <g
-       id="g3882"
-       inkscape:export-filename="ic_play.png"
-       inkscape:export-xdpi="32.359921"
-       inkscape:export-ydpi="32.359921">
-      <g
-         inkscape:export-ydpi="32.970726"
-         inkscape:export-xdpi="32.970726"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_exit.png"
-         transform="matrix(0.24964649,0,0,0.24964645,973.99338,1591.8845)"
-         id="g1815-0">
-        <rect
-           style="color:#000000;fill:none;stroke:none;stroke-width:8.0113287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect1803-1"
-           width="504.4491"
-           height="504.44907"
-           x="-477.78488"
-           y="1582.7637" />
-      </g>
-      <g
-         style="stroke:none"
-         id="g4168-9-0"
-         transform="matrix(0,-0.74629197,0.74629197,0,-756.84,2056.3796)"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_right.png"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-ydpi="11.425782">
-        <g
-           transform="translate(-27.142861,404.54946)"
-           id="g4170-6-1"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-           inkscape:export-xdpi="11.425782"
-           inkscape:export-ydpi="11.425782"
-           style="stroke:none">
-          <g
-             id="g4172-1-1"
-             style="stroke:none"
-             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-             inkscape:export-xdpi="22.851559"
-             inkscape:export-ydpi="22.851559"
-             transform="translate(-288.68382,513.5698)">
-            <rect
-               y="1262.6561"
-               x="261.38272"
-               height="126.03077"
-               width="126.03078"
-               id="rect4174-1-8"
-               style="fill:none;stroke:none" />
-            <g
-               style="fill:#000000;stroke:none"
-               inkscape:export-ydpi="84"
-               inkscape:export-xdpi="84"
-               inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-               transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-               id="g4176-8-9" />
-          </g>
-          <g
-             transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
-             id="g4178-2-2"
-             style="stroke:none" />
-        </g>
-        <path
-           style="fill:#ffffff;stroke:none"
-           d="m 66.95847,2187.3801 -117.320534,0 59.7811862,113.5841 z"
-           id="path4180-8-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-      </g>
-    </g>
-    <g
-       id="g3893"
-       transform="translate(147.08509,0)"
-       inkscape:export-filename="ic_play_disabled.png"
-       inkscape:export-xdpi="32.359921"
-       inkscape:export-ydpi="32.359921">
-      <g
-         id="g3895"
-         transform="matrix(0.24964649,0,0,0.24964645,973.99338,1591.8845)"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_exit.png"
-         inkscape:export-xdpi="32.970726"
-         inkscape:export-ydpi="32.970726">
-        <rect
-           y="1582.7637"
-           x="-477.78488"
-           height="504.44907"
-           width="504.4491"
-           id="rect3897"
-           style="color:#000000;fill:none;stroke:none;stroke-width:8.01132898;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-      <g
-         inkscape:export-ydpi="11.425782"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_right.png"
-         transform="matrix(0,-0.74629197,0.74629197,0,-756.84,2056.3796)"
-         id="g3899"
-         style="stroke:none">
-        <g
-           style="stroke:none"
-           inkscape:export-ydpi="11.425782"
-           inkscape:export-xdpi="11.425782"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-           id="g3901"
-           transform="translate(-27.142861,404.54946)">
-          <g
-             transform="translate(-288.68382,513.5698)"
-             inkscape:export-ydpi="22.851559"
-             inkscape:export-xdpi="22.851559"
-             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-             style="stroke:none"
-             id="g3903">
-            <rect
-               style="fill:none;stroke:none"
-               id="rect3905"
-               width="126.03078"
-               height="126.03077"
-               x="261.38272"
-               y="1262.6561" />
-            <g
-               id="g3907"
-               transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-               inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-               inkscape:export-xdpi="84"
-               inkscape:export-ydpi="84"
-               style="fill:#000000;stroke:none" />
-          </g>
-          <g
-             style="stroke:none"
-             id="g3909"
-             transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
-        </g>
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           id="path3911"
-           d="m 66.95847,2187.3801 -117.320534,0 59.7811862,113.5841 z"
-           style="fill:#404040;stroke:none;color:#000000;fill-opacity:1;fill-rule:nonzero;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
-    </g>
-    <g
-       inkscape:export-ydpi="32.359936"
-       inkscape:export-xdpi="32.359936"
-       inkscape:export-filename="ic_package_disabled.png"
-       id="g3383"
-       transform="translate(454.19163,0)">
-      <g
-         inkscape:export-ydpi="32.970726"
-         inkscape:export-xdpi="32.970726"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_exit.png"
-         transform="matrix(0.24964649,0,0,0.24964645,823.16748,1588.5497)"
-         id="g3385">
-        <rect
-           style="color:#000000;fill:none;stroke:none;stroke-width:8.0113285;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect3387"
-           width="504.4491"
-           height="504.44907"
-           x="-477.78488"
-           y="1582.7637" />
-      </g>
-      <path
-         style="color:#000000;fill:none;stroke:#404040;stroke-width:1.99999988000000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 757.41873,2100.9683 2.66081,-46.1208 49.66859,-9.7563 -3.54776,46.1208 z"
-         id="path3389"
-         inkscape:connector-curvature="0" />
-      <path
-         style="color:#000000;fill:none;stroke:#404040;stroke-width:1.99999988000000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 728.14973,2038.4391 -4.43468,48.3382 31.92981,14.191 2.21734,-45.2338 z"
-         id="path3391"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="color:#000000;fill:none;stroke:#404040;stroke-width:1.99999988000000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 727.70627,2036.6652 43.01655,-16.4083 36.36449,23.0604 -48.78165,11.5302 z"
-         id="path3393"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="color:#000000;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 758.30567,2056.6214 11.08674,17.2953 52.77287,-21.73 -17.73879,-8.8694 z"
-         id="path3395"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="color:#000000;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;opacity:1;isolation:auto;blend_mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-         d="m 725.04545,2037.1086 -11.97367,17.7389 36.3645,22.1734 9.75634,-20.3995 z"
-         id="path3397"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="color:#000000;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;opacity:1;isolation:auto;blend_mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-         d="m 726.81934,2035.3348 -16.40837,-16.8517 53.21633,-14.1911 7.09552,14.191 z"
-         id="path3399"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="color:#000000;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;opacity:1;isolation:auto;blend_mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;filter-blend-mode:normal;filter-gaussianBlur-deviation:0;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto"
-         d="m 782.25303,2005.1788 -7.98246,15.965 31.9298,20.3995 16.85185,-20.8429 z"
-         id="path3401"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#a6a6a6;stroke-width:0.77825594;stroke-opacity:1;marker:none;enable-background:accumulate"
-         d="m 759.73524,1993.3064 15.2566,-0.9029 -3.11722,31.262 10.75332,-0.1024 -15.64039,20.2323 c 0,0 -13.96764,-20.2449 -13.74604,-20.6723 0.22161,-0.4276 9.61148,0.2863 9.61148,0.2863 z"
-         id="path3403"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         inkscape:export-xdpi="100"
-         inkscape:export-ydpi="100" />
-    </g>
-    <g
-       id="g4343"
-       inkscape:export-filename="ic_assets.png"
-       inkscape:export-xdpi="32.335857"
-       inkscape:export-ydpi="32.335857">
-      <g
-         id="g4203">
-        <g
-           style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
-           inkscape:export-ydpi="31.632902"
-           inkscape:export-xdpi="31.632902"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_load.png"
-           id="g3402"
-           transform="translate(1046.6839,161.02829)">
-          <use
-             style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
-             x="0"
-             y="0"
-             xlink:href="#g4635"
-             id="use3405"
-             transform="translate(140.91628,0)"
-             width="128"
-             height="128" />
-          <path
-             style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             d="m 122.20452,2006.8797 0,77.1518 104.03566,0 0.75404,-62.7515 -45.50655,0.2365 -5.0974,-14.6368 z"
-             id="path3409"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc" />
-        </g>
-        <text
-           xml:space="preserve"
-           style="font-size:28.29096222px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
-           x="1175.0742"
-           y="2221.5337"
-           id="text4199"
-           sodipodi:linespacing="125%"><tspan
-             style="-inkscape-font-specification:Bitstream Vera Sans;font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-             sodipodi:role="line"
-             id="tspan4201"
-             x="1175.0742"
-             y="2221.5337">Assets</tspan></text>
-      </g>
-    </g>
-    <g
-       id="g4351"
-       inkscape:export-filename="ic_assets_disabled.png"
-       inkscape:export-xdpi="32.335857"
-       inkscape:export-ydpi="32.335857">
-      <g
-         style="color:#000000;fill:none;stroke:#404040;stroke-width:1.99999988000000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         transform="translate(1184.9473,512.59255)"
-         id="use4214"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-ydpi="11.425782">
-        <g
-           id="g4312"
-           style="fill:none;stroke:#404040;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-dasharray:none;color:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-ydpi="22.851559"
-           transform="translate(-288.68382,513.5698)">
-          <rect
-             y="1262.6561"
-             x="261.38272"
-             height="126.03077"
-             width="126.03078"
-             id="rect4314"
-             style="fill:none;stroke:none;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;color:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <g
-             style="fill:none;stroke:#404040;stroke-width:2.05036032;stroke-miterlimit:4;stroke-dasharray:none;color:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             inkscape:export-ydpi="84"
-             inkscape:export-xdpi="84"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             id="g4316" />
-        </g>
-        <g
-           style="fill:none;stroke:#404040;stroke-width:1.41463406;stroke-miterlimit:4;stroke-dasharray:none;color:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
-           id="g4318" />
-      </g>
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path4216"
-         d="m 1168.2558,2313.4011 0,77.1518 104.0357,0 0.754,-62.7515 -45.5065,0.2365 -5.0974,-14.6368 z"
-         style="color:#000000;fill:none;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <text
-         xml:space="preserve"
-         style="font-size:28.29096222000000083px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;color:#000000;fill:#404040;stroke:none;stroke-width:0.74629199999999996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;fill-opacity:1;fill-rule:nonzero"
-         x="1174.4417"
-         y="2367.0269"
-         id="text4218"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan4220"
-           x="1174.4417"
-           y="2367.0269">Assets</tspan></text>
-    </g>
-    <g
-       id="g4202"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_check_disabled.png"
-       inkscape:export-xdpi="11.425782"
-       inkscape:export-ydpi="11.425782">
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         id="path3418"
-         d="m 476.85411,2386.043 12.88931,46.2645 79.68786,-80.2865"
-         style="color:#000000;fill:none;stroke:#4d4d4d;stroke-width:24.68952751000000134;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         style="stroke:#ffffff"
-         id="g4188"
-         transform="matrix(0,1,-1,0,2764.6432,2386.7415)"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_left_disabled.png"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-ydpi="11.425782">
-        <g
-           transform="translate(-27.142861,404.54946)"
-           id="g4190"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-           inkscape:export-xdpi="11.425782"
-           inkscape:export-ydpi="11.425782"
-           style="stroke:#ffffff">
-          <g
-             id="g4192"
-             style="stroke:#ffffff"
-             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-             inkscape:export-xdpi="22.851559"
-             inkscape:export-ydpi="22.851559"
-             transform="translate(-288.68382,513.5698)">
-            <rect
-               y="1262.6561"
-               x="261.38272"
-               height="126.03077"
-               width="126.03078"
-               id="rect4194"
-               style="fill:none;stroke:none" />
-            <g
-               style="fill:#000000;stroke:#ffffff"
-               inkscape:export-ydpi="84"
-               inkscape:export-xdpi="84"
-               inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-               transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-               id="g4196" />
-          </g>
-          <g
-             transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
-             id="g4198"
-             style="stroke:#ffffff" />
-        </g>
-      </g>
-    </g>
-    <g
-       id="g4211"
-       transform="translate(-160.67503,0)"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_check.png"
-       inkscape:export-xdpi="11.425782"
-       inkscape:export-ydpi="11.425782">
-      <path
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:24.68952751;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 476.85411,2386.043 12.88931,46.2645 79.68786,-80.2865"
-         id="path4213"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <g
-         inkscape:export-ydpi="11.425782"
-         inkscape:export-xdpi="11.425782"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_left_disabled.png"
-         transform="matrix(0,1,-1,0,2764.6432,2386.7415)"
-         id="g4215"
-         style="stroke:#ffffff">
-        <g
-           style="stroke:#ffffff"
-           inkscape:export-ydpi="11.425782"
-           inkscape:export-xdpi="11.425782"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
-           id="g4217"
-           transform="translate(-27.142861,404.54946)">
-          <g
-             transform="translate(-288.68382,513.5698)"
-             inkscape:export-ydpi="22.851559"
-             inkscape:export-xdpi="22.851559"
-             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-             style="stroke:#ffffff"
-             id="g4219">
-            <rect
-               style="fill:none;stroke:none"
-               id="rect4221"
-               width="126.03078"
-               height="126.03077"
-               x="261.38272"
-               y="1262.6561" />
-            <g
-               id="g4223"
-               transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-               inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-               inkscape:export-xdpi="84"
-               inkscape:export-ydpi="84"
-               style="fill:#000000;stroke:#ffffff" />
-          </g>
-          <g
-             style="stroke:#ffffff"
-             id="g4225"
-             transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
-        </g>
-      </g>
-    </g>
-    <g
-       id="g3470"
-       inkscape:export-filename="ic_atlases.png"
-       inkscape:export-xdpi="32"
-       inkscape:export-ydpi="32">
-      <g
-         transform="translate(155.66068,0)"
-         id="g3426"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_assets.png"
-         inkscape:export-xdpi="32.335857"
-         inkscape:export-ydpi="32.335857">
-        <g
-           id="g3428">
-          <g
-             style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
-             inkscape:export-ydpi="31.632902"
-             inkscape:export-xdpi="31.632902"
-             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_load.png"
-             id="g3430"
-             transform="translate(1046.6839,161.02829)">
-            <use
-               style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
-               x="0"
-               y="0"
-               xlink:href="#g4635"
-               id="use3432"
-               transform="translate(140.91628,0)"
-               width="128"
-               height="128" />
-            <path
-               style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-               d="m 122.20452,2006.8797 0,77.1518 104.03566,0 0.75404,-62.7515 -45.50655,0.2365 -5.0974,-14.6368 z"
-               id="path3434"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="ccccccc" />
-          </g>
-          <text
-             xml:space="preserve"
-             style="font-size:28.29096222px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
-             x="1184.0203"
-             y="2223.323"
-             id="text3436"
-             sodipodi:linespacing="125%"><tspan
-               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-               sodipodi:role="line"
-               id="tspan3438"
-               x="1184.0203"
-               y="2223.323">Atlas</tspan></text>
-        </g>
-      </g>
-      <g
-         style="stroke-width:5.50284147;stroke-miterlimit:4;stroke-dasharray:none"
-         id="g5474-7"
-         transform="matrix(1.1073456,0,0,1.1073456,1282.52,-66.947737)">
-        <path
-           transform="matrix(0.61022848,0,0,0.61022848,29.665312,1378.3415)"
-           d="m 67.68022,1052.7947 a 27.779196,27.779196 0 0 1 -27.779196,27.7792 27.779196,27.779196 0 0 1 -27.779196,-27.7792 27.779196,27.779196 0 0 1 27.779196,-27.7792 27.779196,27.779196 0 0 1 27.779196,27.7792 z"
-           sodipodi:ry="27.779196"
-           sodipodi:rx="27.779196"
-           sodipodi:cy="1052.7947"
-           sodipodi:cx="39.901024"
-           id="path5468-5"
-           style="fill:#ffffff;stroke:#ffffff;stroke-width:7.03851795;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1"
-           sodipodi:type="arc" />
-        <g
-           style="stroke-width:5.50284147;stroke-miterlimit:4;stroke-dasharray:none"
-           transform="translate(1.3242213e-6,8.5864751)"
-           id="g5470-3">
-          <rect
-             style="fill:#404040;stroke:none;stroke-width:1.80612087;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
-             id="rect4559-6-4"
-             width="25.203176"
-             height="5.4317188"
-             x="41.412464"
-             y="2009.4846" />
-          <rect
-             transform="matrix(0,-1,1,0,0,0)"
-             y="51.298191"
-             x="-2024.8019"
-             height="5.4317188"
-             width="25.203176"
-             id="rect4561-7-1"
-             style="fill:#404040;stroke:none;stroke-opacity:1;stroke-width:1.80612087;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1" />
-        </g>
-      </g>
-    </g>
-    <g
-       id="g3478"
-       style="stroke:none"
-       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_create_all.png"
-       inkscape:export-xdpi="11.425776"
-       inkscape:export-ydpi="11.425776">
-      <g
-         inkscape:export-ydpi="11.425779"
-         inkscape:export-xdpi="11.425779"
-         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_delete.png"
-         id="g3953"
-         transform="translate(431.41822,-2.3981265)"
-         style="fill:none;stroke:none">
-        <g
-           transform="translate(4.1733203,523.5698)"
-           inkscape:export-ydpi="22.851559"
-           inkscape:export-xdpi="22.851559"
-           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
-           style="fill:none;stroke:none"
-           id="g3955">
-          <rect
-             style="fill:none;stroke:none"
-             id="rect3957"
-             width="126.03078"
-             height="126.03077"
-             x="261.38272"
-             y="1262.6561" />
-          <g
-             id="g3959"
-             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
-             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-             inkscape:export-xdpi="84"
-             inkscape:export-ydpi="84"
-             style="fill:none;stroke:none" />
-        </g>
-        <g
-           id="g3961"
-           transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
-           style="fill:none;stroke:none" />
-      </g>
-      <g
-         transform="matrix(1.4852893,0,0,1.4852893,-357.97764,-884.73489)"
-         style="stroke:none"
-         id="g3468">
-        <rect
-           style="fill:#ffffff;stroke:none"
-           id="rect4559-1"
-           width="43.763706"
-           height="9.4318333"
-           x="748.59918"
-           y="1849.7565" />
-        <rect
-           transform="matrix(0,-1,1,0,0,0)"
-           y="765.76508"
-           x="-1876.3541"
-           height="9.4318333"
-           width="43.763706"
-           id="rect4561-60"
-           style="fill:#ffffff;stroke:none" />
-      </g>
-      <g
-         id="g3472"
-         style="stroke:none"
-         transform="matrix(1.4852893,0,0,1.4852893,-406.82517,-931.10465)">
-        <rect
-           y="1849.7565"
-           x="748.59918"
-           height="9.4318333"
-           width="43.763706"
-           id="rect3474"
-           style="fill:#ffffff;stroke:none" />
-        <rect
-           style="fill:#ffffff;stroke:none"
-           id="rect3476"
-           width="43.763706"
-           height="9.4318333"
-           x="-1876.3541"
-           y="765.76508"
-           transform="matrix(0,-1,1,0,0,0)" />
-      </g>
-    </g>
-    <g
-       id="g4625"
-       inkscape:export-filename="ic_3d.png"
-       inkscape:export-xdpi="22"
-       inkscape:export-ydpi="22">
-      <rect
-         y="926.27539"
-         x="860.49463"
-         height="126.03077"
-         width="126.03078"
-         id="rect4579"
-         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <g
-         transform="matrix(1.1993051,0,0,1.1993051,-151.82396,-10.851952)"
-         id="g4601">
-        <path
-           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.09797573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           d="m 909.64972,820.26643 -0.69229,55.76191 29.0762,-27.88096 0,-52.57552 z"
-           id="path4589"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.09797573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           d="m 937.30586,796.36742 -51.19402,0 -29.76894,23.89848 53.28556,-0.0255 z"
-           id="path4591"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.09797573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           d="m 855.99675,819.07101 1.38458,52.97434 51.5761,3.98299 0.70151,-55.8658 z"
-           id="path4594"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-      </g>
-    </g>
-    <g
-       id="g4632"
-       inkscape:export-filename="ic_spine.png"
-       inkscape:export-xdpi="22"
-       inkscape:export-ydpi="22">
-      <rect
-         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="rect4567"
-         width="126.03078"
-         height="126.03077"
-         x="1007.7452"
-         y="926.27539" />
-      <g
-         transform="matrix(0.44811792,0,0,0.44811792,654.42016,641.62884)"
-         id="g4619">
-        <path
-           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           d="m 872.17621,658.75021 c 30.20495,-1.78176 54.88455,34.83403 107.60615,18.40631 20.94644,-6.52676 18.18813,58.11134 -21.2381,62.2983 -27.6061,2.93169 -68.61882,-2.72369 -86.36805,-24.06979 -11.86441,-14.26874 -18.52476,-55.54207 0,-56.63482 z"
-           id="path4611"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssss" />
-        <path
-           sodipodi:nodetypes="sssss"
-           inkscape:connector-curvature="0"
-           id="path4613"
-           d="m 931.09131,861.61288 c 9.65963,-5.54488 22.60422,4.98677 37.69749,-9.96049 5.99662,-5.93857 13.67016,20.07609 1.30855,28.05013 -8.65556,5.5834 -22.84302,9.91775 -31.49077,4.31671 -5.78056,-3.74399 -13.43953,-19.00566 -7.51527,-22.40635 z"
-           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        <path
-           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           d="m 903.60357,811.19117 c 16.65797,-5.80267 36.32304,10.8097 63.28108,-6.78828 10.71052,-6.99171 19.44248,29.70107 -2.00507,38.31919 -15.01746,6.03436 -38.91998,9.38441 -52.2697,0.23438 -8.92358,-6.11631 -19.22269,-28.2065 -9.00631,-31.76529 z"
-           id="path4615"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssss" />
-        <path
-           sodipodi:nodetypes="sssss"
-           inkscape:connector-curvature="0"
-           id="path4617"
-           d="m 884.51721,740.80676 c 21.5599,-3.52165 42.00187,20.94262 78.6453,5.23137 14.55855,-6.24211 17.3756,40.38349 -10.62817,46.31696 -19.60814,4.15459 -49.48186,3.1374 -63.81322,-10.87514 -9.57976,-9.36665 -17.42664,-38.51335 -4.20391,-40.67319 z"
-           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_add.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_add.png
deleted file mode 100644
index a43285a92..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_add.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_add_disabled.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_add_disabled.png
deleted file mode 100644
index 1f36f1bc7..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_add_disabled.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_check.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_check.png
deleted file mode 100644
index 7a87b4781..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_check.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_check_disabled.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_check_disabled.png
deleted file mode 100644
index 9abe3fce3..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_check_disabled.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_closed.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_closed.png
deleted file mode 100644
index a293e6152..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_closed.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_copy.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_copy.png
deleted file mode 100644
index 3ef428b55..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_copy.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_copy_disabled.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_copy_disabled.png
deleted file mode 100644
index 86c0bf16d..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_copy_disabled.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_create_all.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_create_all.png
deleted file mode 100644
index 35427870a..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_create_all.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_delete.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_delete.png
deleted file mode 100644
index ed60c8cd5..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_delete.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_delete_disabled.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_delete_disabled.png
deleted file mode 100644
index 17175c09f..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_delete_disabled.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_down.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_down.png
deleted file mode 100644
index 6a32c6ffa..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_down.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_down_disabled.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_down_disabled.png
deleted file mode 100644
index 0a8b2fe64..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_down_disabled.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_edit.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_edit.png
deleted file mode 100644
index 175d38e88..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_edit.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_edit_disabled.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_edit_disabled.png
deleted file mode 100644
index 80fd164b7..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_edit_disabled.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_left.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_left.png
deleted file mode 100644
index 95695e571..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_left.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_left_disabled.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_left_disabled.png
deleted file mode 100644
index 8711b527c..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_left_disabled.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_open.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_open.png
deleted file mode 100644
index 53bf6e0ec..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_open.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_paste.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_paste.png
deleted file mode 100644
index 1339276c7..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_paste.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_paste_disabled.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_paste_disabled.png
deleted file mode 100644
index 62cc1ecb9..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_paste_disabled.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_right.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_right.png
deleted file mode 100644
index d5498582f..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_right.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_right_disabled.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_right_disabled.png
deleted file mode 100644
index c5be53067..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_right_disabled.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_up.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_up.png
deleted file mode 100644
index 993e32e7c..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_up.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_up_disabled.png b/adventure-composer/assets-raw/editor/icons-atlas/images/ic_up_disabled.png
deleted file mode 100644
index 7cc69133e..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_up_disabled.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/title.png b/adventure-composer/assets-raw/editor/icons-atlas/images/title.png
deleted file mode 100644
index d19ed80c4..000000000
Binary files a/adventure-composer/assets-raw/editor/icons-atlas/images/title.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/title.svg b/adventure-composer/assets-raw/editor/icons-atlas/title.svg
deleted file mode 100644
index dce115f8c..000000000
--- a/adventure-composer/assets-raw/editor/icons-atlas/title.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="207.11"
-   height="53.66"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48+devel r"
-   sodipodi:docname="title.svg"
-   inkscape:export-filename="title.png"
-   inkscape:export-xdpi="108.63792"
-   inkscape:export-ydpi="108.63792">
-  <defs
-     id="defs4">
-    <filter
-       inkscape:collect="always"
-       id="filter864"
-       x="-0.23042651"
-       width="1.460853"
-       y="-0.13367997"
-       height="1.2673599"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.2232277"
-         id="feGaussianBlur866" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#51c577"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="14.626759"
-     inkscape:cy="-71.40974"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="true"
-     borderlayer="true"
-     inkscape:window-width="1215"
-     inkscape:window-height="1000"
-     inkscape:window-x="1431"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="bg"
-     sodipodi:insensitive="true">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.12300014000000026;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2989"
-       width="430.71429"
-       height="300"
-       x="-141.42857"
-       y="-139.91142"
-       rx="5.2145171"
-       ry="7.74085" />
-  </g>
-  <g
-     inkscape:label="Capa 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0.66431808,-999.6792)">
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:20.5458107px;line-height:100%;font-family:Andale Mono;-inkscape-font-specification:Andale Mono;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none"
-       x="43.610382"
-       y="1022.0645"
-       id="text810"
-       sodipodi:linespacing="100%"><tspan
-         sodipodi:role="line"
-         id="tspan812"
-         x="43.610382"
-         y="1022.0645"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46589661px;line-height:100%;font-family:Josefin Sans;-inkscape-font-specification:Josefin Sans;text-align:start;text-anchor:start">Adventure</tspan><tspan
-         sodipodi:role="line"
-         x="43.610382"
-         y="1050.3795"
-         id="tspan814"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.15907669px;line-height:100%;font-family:Paytone One;-inkscape-font-specification:Paytone One;text-align:start;text-anchor:start">COMPOSER</tspan></text>
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:0.36942677;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter864);enable-background:accumulate"
-       d="m 11.357143,993.07648 c 0,1.78572 -7.857143,51.78572 -7.857143,51.78572 6.747884,7.3737 23.941702,9.3174 33.571428,-1.4285 L 26.714286,994.14791 z"
-       id="path846"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       transform="matrix(0.88357343,0,0,0.88357343,-31.209633,25.417721)" />
-    <image
-       sodipodi:absref="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/player/walk.left_18.png"
-       y="909.67657"
-       x="-27.681541"
-       id="image824"
-       xlink:href="file:///home/rgarcia/Dropbox/art/2013.Proyecto%20Indiana/diosa/assets/sprites/player/walk.left_18.png"
-       height="48.651417"
-       width="31.888103" />
-    <path
-       style="fill:#ffffff"
-       d="m 25.898014,1051.628 c -0.282985,0 -0.522463,-0.1464 -0.721591,-0.2267 -0.374987,-0.3379 -0.153711,-0.1662 0.249091,-0.3194 -0.22906,0.039 0.05321,0.022 0.29488,-0.1334 0.08414,0 0.248295,-0.041 0.364811,-0.091 0.116512,-0.05 0.25066,-0.1005 0.298112,-0.1116 0.04745,-0.011 0.261073,-0.087 0.474721,-0.1677 0.213644,-0.081 0.488334,-0.1843 0.610414,-0.2295 0.208491,-0.077 0.58733,-0.2702 1.021905,-0.5209 0.18785,-0.1084 0.295669,-0.1879 0.517306,-0.3811 0.06314,-0.055 0.140117,-0.1002 0.171052,-0.1002 0.03094,0 0.04264,-0.014 0.02602,-0.031 -0.01664,-0.017 0.0666,-0.135 0.184975,-0.2621 0.118369,-0.127 0.214389,-0.2611 0.213371,-0.2979 -0.0055,-0.2004 -0.395497,-0.4641 -1.773913,-1.1995 -0.350992,-0.1872 -0.687422,-0.3759 -0.747625,-0.4193 -0.0602,-0.044 -0.151765,-0.079 -0.203472,-0.079 -0.05171,0 -0.102339,-0.021 -0.112511,-0.045 -2.070039,-0.9916 -3.395082,-1.6949 -5.405571,-2.5308 -0.02141,0 -0.157863,-0.075 -0.303238,-0.1677 -0.376758,-0.2151 -0.578571,-0.2624 -0.913298,-0.5325 -0.03052,-0.025 -0.150658,-0.1205 -0.266968,-0.2126 -0.467542,-0.3704 -0.63933,-0.7331 -0.576385,-1.217 0.01791,-0.1377 0.342048,-0.8781 0.786859,-1.7973 0.416024,-0.8597 0.752866,-1.5804 0.748539,-1.6014 -0.0043,-0.021 0.0152,-0.054 0.04341,-0.073 0.09794,-0.067 1.011814,-2.0215 0.975646,-2.0867 -0.02001,-0.036 -0.01615,-0.046 0.0086,-0.024 0.04489,0.042 0.539351,-0.8937 0.543882,-1.0291 0.0015,-0.039 0.02737,-0.071 0.05789,-0.071 0.03052,0 0.04116,-0.015 0.02365,-0.033 -0.04012,-0.041 -0.375108,0.134 -0.375108,0.1964 0,0.026 -0.03492,0.046 -0.0776,0.046 -1.767277,0.7112 -3.753698,1.8065 -5.309941,2.5356 -0.414656,0.1949 -0.816965,0.4101 -0.89402,0.4783 -0.08266,0.073 -0.202373,0.3057 -0.291975,0.567 -0.08354,0.2435 -0.198566,0.504 -0.255633,0.5789 -0.05707,0.074 -0.09164,0.1485 -0.07683,0.1637 0.01483,0.015 -0.245429,0.5789 -0.578319,1.2524 -0.812599,1.644 -0.858709,1.733 -0.922805,1.7815 -0.03052,0.023 -0.03289,0.043 -0.0053,0.043 0.02763,0 0.01384,0.046 -0.03063,0.101 -0.04446,0.055 -0.151155,0.2546 -0.237093,0.4434 -0.08594,0.1889 -0.220276,0.4315 -0.298528,0.5392 -0.07825,0.1076 -0.106529,0.1735 -0.06284,0.1464 0.06809,-0.042 0.06848,-0.036 0.0026,0.048 -0.841707,1.6961 -1.899721,3.2744 -2.622598,5.0012 -0.218085,0.4009 -0.348209,0.7779 -0.5413351,1.2752 l 0.2607561,0 c 0.878036,0.1076 -0.140681,0.2154 -0.4328991,0.2483 -1.05987,0.1179 -5.123415,0.038 -5.260809,-0.1042 -0.139263,-0.1437 0.53987,-0.208 2.333447,-0.2211 0.724799,-0.01 1.317874,-0.012 1.317946,-0.016 5.8e-5,0 -0.152129,-0.1292 -0.338232,-0.28 -0.1861,-0.1508 -0.392115,-0.3291 -0.457813,-0.3961 -0.0657,-0.067 -0.198127,-0.1729 -0.294294,-0.2351 -0.09617,-0.062 -0.333395,-0.2488 -0.527178,-0.4148 -0.193783,-0.1661 -0.384473,-0.3289 -0.423756,-0.3619 -0.03928,-0.033 -0.226572,-0.1906 -0.416193,-0.3501 -0.400096,-0.3366 -0.784733,-0.7511 -0.900879,-0.971 -0.07619,-0.1442 -0.07354,-0.1563 0.04324,-0.1969 0.199618,-0.069 0.435494,-0.01 1.176981,0.3128 0.121095,0.052 0.233468,0.097 0.249715,0.1 0.03696,0.01 0.201338,0.072 0.417992,0.1656 0.09156,0.039 0.291335,0.1188 0.44394,0.1755 0.152606,0.057 0.302436,0.1206 0.332957,0.1424 0.06756,0.048 0.372647,0.1348 0.429452,0.1221 0.02256,-0.01 0.134928,0.028 0.249718,0.073 0.380449,0.1501 1.007771,0.2049 1.555852,0.1361 0.4853561,-0.3835 0.8276681,-0.9888 1.0390371,-1.4777 0.05524,-0.063 0.07784,-0.1148 0.05022,-0.1153 -0.02763,0 -0.02244,-0.02 0.01151,-0.043 0.325779,-0.65 0.682061,-1.3717 0.9619,-1.9877 0.345945,-0.7467 0.51962,-1.1442 0.535094,-1.2245 0.0085,-0.045 0.0483,-0.1017 0.08848,-0.1279 0.04018,-0.027 0.05382,-0.048 0.03031,-0.048 -0.02351,0 0.0049,-0.097 0.06318,-0.2155 0.05826,-0.118 0.137636,-0.3241 0.176389,-0.4578 0.03875,-0.1338 0.08732,-0.2432 0.10792,-0.2432 0.02059,0 0.03777,-0.032 0.03815,-0.071 2.9e-4,-0.039 0.119544,-0.3806 0.264812,-0.7582 0.299433,-0.7785 0.595272,-1.5682 0.761049,-2.0316 0.06194,-0.173 0.133818,-0.3662 0.159731,-0.4291 0.0259,-0.063 0.100648,-0.2561 0.166085,-0.4291 0.06544,-0.1732 0.168007,-0.4307 0.227931,-0.5723 0.05993,-0.1417 0.112456,-0.2833 0.116736,-0.3149 0.0043,-0.031 0.02826,-0.083 0.05329,-0.1144 0.952922,-1.4376 2.637354,-2.423 3.808719,-3.4959 0.02573,0.016 0.194288,-0.1045 0.374573,-0.2684 0.180286,-0.1641 0.352766,-0.3179 0.383288,-0.3419 0.160225,-0.1256 0.838135,-0.6858 1.193828,-0.9866 0.223373,-0.1888 0.533088,-0.4437 0.688254,-0.5664 0.15517,-0.1227 0.294612,-0.2399 0.309872,-0.2603 0.01526,-0.021 0.190049,-0.1645 0.388421,-0.3204 0.198373,-0.1559 0.40157,-0.3256 0.451552,-0.3772 0.422696,-0.4779 1.082718,-0.8486 1.906911,-1.5561 0.06104,-0.059 0.166956,-0.1463 0.235364,-0.1937 0.06841,-0.047 0.110254,-0.1097 0.09299,-0.1385 -0.01728,-0.029 -0.0076,-0.045 0.02154,-0.037 0.08301,0.025 0.406232,-0.2411 0.368927,-0.3034 0.182585,-0.095 0.351145,-0.2502 0.552761,-0.4237 0.109443,-0.1097 0.198987,-0.1851 0.198987,-0.1677 0,0.018 0.03218,0 0.07151,-0.044 0.09147,-0.097 0.297516,-0.5961 0.338109,-0.8196 0.01717,-0.094 0.0685,-0.3258 0.11408,-0.5144 0.148766,-0.6151 0.245195,-1.6912 0.27953,-3.1193 0.01854,-0.7711 0.04658,-1.5307 0.06229,-1.6881 l 0.02858,-0.2862 -0.368182,0.4006 c -0.346198,0.3767 -0.562398,0.692 -0.538009,0.7848 0.0059,0.022 -0.02449,0.027 -0.06757,0.01 -0.135795,0.034 -0.174159,0.1415 -0.247742,0.2642 -0.01831,0.015 -0.07077,0.079 -0.116549,0.1396 -0.06565,0.088 -0.06677,0.101 -0.0053,0.063 0.0529,-0.033 0.06522,-0.027 0.03835,0.018 -0.02177,0.037 -0.06533,0.066 -0.0968,0.066 -0.07601,0 -0.379739,0.2979 -0.351606,0.3447 0.01211,0.021 -0.01324,0.037 -0.05633,0.037 -0.04309,0 -0.06268,-0.028 -0.04352,-0.063 0.01919,-0.034 -0.01315,-0.02 -0.0718,0.031 -0.05865,0.051 -0.168861,0.113 -0.244899,0.1369 -0.07604,0.024 -0.28829,0.1147 -0.471685,0.2014 -0.183392,0.087 -0.695529,0.3166 -1.138081,0.5107 -0.442552,0.1941 -0.941986,0.4137 -1.109851,0.488 -0.167865,0.075 -0.441188,0.1901 -0.607387,0.2573 -0.166198,0.067 -0.653145,0.2834 -1.082104,0.4808 -0.428959,0.1974 -0.885376,0.4053 -1.014258,0.4622 -0.128882,0.057 -0.220668,0.1262 -0.203971,0.154 0.0167,0.028 0.0098,0.047 -0.01537,0.043 -0.129113,-0.023 -0.191799,0.024 -0.291441,0.2199 -0.155299,0.3051 -0.50666,0.6599 -0.893302,0.9021 -0.192376,0.1206 -0.317142,0.2345 -0.295807,0.2701 0.02077,0.034 0.0111,0.045 -0.02212,0.024 -0.03246,-0.021 -0.19239,0 -0.355402,0.041 -0.261508,0.07 -0.302193,0.069 -0.345766,-0.01 -0.03067,-0.055 -0.02524,-0.1279 0.01433,-0.1932 0.07645,-0.1263 0.05839,-0.1288 -0.181217,-0.026 -0.214799,0.092 -0.281877,0.063 -0.362777,-0.1557 -0.03721,-0.1009 -0.03849,-0.1464 -0.0035,-0.1242 0.03043,0.02 0.05532,0.01 0.05532,-0.021 0,-0.031 -0.05618,-0.064 -0.124856,-0.075 -0.163238,-0.024 -0.211126,-0.3094 -0.05872,-0.3501 0.09203,-0.025 0.0923,-0.028 0.0033,-0.034 -0.06984,-0.01 -0.09711,-0.056 -0.09711,-0.181 0,-0.137 0.03363,-0.1893 0.156539,-0.2432 0.0861,-0.038 0.238444,-0.1653 0.338546,-0.2832 0.100104,-0.1179 0.200882,-0.2023 0.22395,-0.1877 0.02307,0.014 0.214086,-0.026 0.424477,-0.089 0.243075,-0.074 0.514027,-0.112 0.743232,-0.1048 0.732525,0.022 0.801799,0.013 1.220836,-0.1873 0.228907,-0.1089 0.57851,-0.2691 0.776897,-0.356 1.052137,-0.4607 1.418839,-0.6341 1.454353,-0.6881 0.0216,-0.033 0.0718,-0.06 0.11153,-0.061 0.153531,0 0.870695,-0.3346 0.837723,-0.3897 -0.01901,-0.032 -0.0076,-0.04 0.02532,-0.02 0.535739,-0.1846 0.888631,-0.3613 1.390031,-0.5888 0.713838,-0.2901 0.989223,-0.4542 1.129587,-0.6729 0.07699,-0.1201 0.146499,-0.2439 0.154472,-0.2754 0.008,-0.031 0.05877,-0.1216 0.112885,-0.2003 0.445204,-0.8138 0.871915,-1.5229 1.280636,-2.2874 0.682152,-1.239 0.777595,-1.4758 0.884724,-2.1955 0.129987,-0.8732 0.18616,-1.1416 0.37128,-1.7743 l 0.148097,-0.5061 -0.224997,-0.2092 c -0.737422,-0.6856 -0.918005,-0.8086 -1.219339,-0.8301 -0.06576,-0.01 -0.107983,-0.028 -0.09384,-0.051 0.04528,-0.076 -0.387599,-0.045 -0.674483,0.048 -0.382177,0.1234 -0.572735,0.1528 -0.729439,0.1123 -0.147238,-0.038 -0.500736,-0.3967 -0.550525,-0.5585 -0.01736,-0.056 -0.05488,-0.1026 -0.08335,-0.1026 -0.02847,0 -0.05175,-0.046 -0.05175,-0.1022 0,-0.056 -0.07641,-0.1486 -0.169787,-0.2054 -0.211008,-0.1286 -0.290375,-0.3336 -0.245484,-0.6341 0.03406,-0.2279 0.213896,-1.2697 0.277023,-1.6049 0.140703,-0.7467 0.152724,-0.8858 0.08393,-0.9713 -0.03864,-0.048 -0.09323,-0.087 -0.121295,-0.087 -0.02807,0 -0.08121,-0.026 -0.118063,-0.057 -0.03687,-0.032 -0.124443,-0.1024 -0.194619,-0.1575 -0.07018,-0.056 -0.151701,-0.2031 -0.181156,-0.3289 -0.11315,-0.4837 -0.146601,-0.7117 -0.100035,-0.682 0.02645,0.017 0.04808,0 0.04808,-0.029 0,-0.1081 0.3585,-0.5644 0.471689,-0.6005 0.266651,-0.085 1.371627,-0.2052 1.884742,-0.2052 0.571845,0 0.716905,0.045 0.903893,0.2835 0.06022,0.077 0.06522,0.073 0.03743,-0.026 -0.03208,-0.1145 -0.03208,-0.1145 0.03721,0 0.03811,0.063 0.119633,0.1515 0.181171,0.1968 0.144625,0.1064 0.246801,0.2178 0.451586,0.492 0.09156,0.1227 0.214135,0.2731 0.272382,0.3342 0.100709,0.1055 0.102726,0.1519 0.04107,0.946 -0.07894,1.0166 -0.07858,1.6661 0.0011,2.0081 0.03298,0.1416 0.06311,0.3991 0.06695,0.5723 0.0064,0.29 0.02552,0.3338 0.243142,0.5579 0.129892,0.1338 0.249377,0.2432 0.265523,0.2432 0.753037,0.7563 1.983813,1.624 2.356991,2.5056 0.252945,0.4735 0.533646,1.0375 0.691644,1.5147 0.06648,0.2127 0.131411,0.3762 0.144281,0.3635 0.01286,-0.012 0.03013,0.1572 0.03835,0.3775 0.0082,0.2203 0.03698,0.4431 0.0639,0.495 0.115052,0.2216 0.604035,0.8019 0.644194,0.7645 0.02414,-0.022 0.02685,-0.01 0.006,0.028 -0.02097,0.038 0.04305,0.1653 0.143615,0.286 0.572218,0.5542 0.434023,0.5612 0.884614,0.9561 0.03999,-0.026 0.04808,-0.015 0.02191,0.029 -0.02619,0.044 0.139107,0.2582 0.449238,0.5829 0.269864,0.2827 0.50831,0.5581 0.529881,0.6121 0.05103,0.1278 0.247491,1.1066 0.599819,2.9882 0.156179,0.834 0.372878,1.9284 0.481551,2.432 0.108672,0.5036 0.209689,0.973 0.224479,1.0429 0.02772,0.1311 0.104751,0.2235 0.514236,0.6166 0.131143,0.1259 0.28573,0.3319 0.343527,0.4578 0.05779,0.1259 0.157771,0.319 0.222165,0.4292 0.09458,0.1618 0.118094,0.2993 0.122369,0.7153 0.0051,0.4995 0.0015,0.5149 -0.119569,0.5082 -0.111156,-0.01 -0.124859,0.02 -0.124859,0.2392 0,0.2847 -0.194903,0.6485 -0.349478,0.6522 -0.145997,0 -0.357459,-0.258 -0.575031,-0.7113 -0.228625,-0.4763 -0.21841,-0.464 -0.315698,-0.3807 -0.10348,0.089 -0.238836,0.029 -0.282704,-0.1256 -0.01956,-0.068 -0.05067,-0.3768 -0.06915,-0.6847 -0.0272,-0.4537 -0.01401,-0.6267 0.06935,-0.9107 l 0.102942,-0.3506 -0.147895,-0.7501 c -0.08134,-0.4126 -0.299534,-1.3935 -0.48487,-2.1796 -0.185335,-0.7861 -0.391118,-1.661 -0.457291,-1.9443 -0.06617,-0.2833 -0.140494,-0.5237 -0.16516,-0.5343 -0.02466,-0.01 -0.0338,-0.037 -0.0203,-0.06 0.04829,-0.081 -0.185471,-1.0059 -0.270273,-1.0697 -0.0476,-0.036 -0.0871,-0.088 -0.08779,-0.1162 -5.78e-4,-0.028 -0.139627,-0.2055 -0.308738,-0.3943 -0.169112,-0.1889 -0.376484,-0.4206 -0.460828,-0.5151 -0.345119,-0.3863 -0.794293,-0.7721 -0.856293,-0.7356 -0.03597,0.021 -0.04732,0.018 -0.0252,-0.01 0.03744,-0.043 -0.273855,-0.3703 -0.353818,-0.3722 -0.05126,0 -0.08957,0.4221 -0.214761,2.3739 -0.14855,2.316 -0.246239,3.2858 -0.466889,4.6351 -0.108021,0.6607 -0.426819,1.8494 -0.588553,2.1947 -0.05968,0.1274 -0.115955,0.2819 -0.125058,0.3434 -0.0091,0.062 -0.04364,0.1465 -0.07675,0.189 -0.193428,0.7649 -0.548695,0.9109 -0.818442,1.6004 0.02503,0.042 0.01719,0.053 -0.02033,0.029 -0.03671,-0.023 -0.178784,0.1502 -0.355402,0.4344 -0.161838,0.2604 -0.375212,0.5894 -0.474164,0.7311 -0.09895,0.1417 -0.270669,0.3993 -0.381591,0.5724 -0.110925,0.1732 -0.360839,0.5392 -0.555363,0.8135 -0.194528,0.2742 -0.353684,0.5268 -0.353684,0.5613 0,0.034 -0.02094,0.049 -0.04654,0.033 -0.02561,-0.016 -0.09943,0.066 -0.164082,0.1827 -0.06465,0.1167 -0.205234,0.3126 -0.312415,0.4352 -0.107182,0.1226 -0.179173,0.2514 -0.159978,0.2861 0.0192,0.035 0.01474,0.044 -0.0099,0.02 -0.02463,-0.022 -0.172215,0.1338 -0.327978,0.3482 -0.440047,0.6058 -1.218889,1.5922 -1.746245,2.2117 -0.08043,0.095 -0.344617,0.4098 -0.587076,0.7009 -0.242457,0.2911 -0.460959,0.5293 -0.485559,0.5293 -0.0246,0 -0.04472,0.029 -0.04472,0.064 0,0.036 -0.05627,0.1194 -0.125035,0.1859 -0.06876,0.066 -0.196166,0.2111 -0.283103,0.3213 -0.08694,0.1101 -0.139185,0.1641 -0.116108,0.12 0.02777,-0.053 0.0203,-0.067 -0.02212,-0.039 -0.03524,0.022 -0.06407,0.072 -0.06407,0.1111 0,0.039 -0.236464,0.3269 -0.525477,0.6404 -0.289013,0.3135 -0.526244,0.6004 -0.527179,0.6375 -8.29e-4,0.038 -0.08024,0.1308 -0.176219,0.2082 l -0.174514,0.1409 0.188388,0.041 c 0.319285,0.07 0.852109,0.271 0.89507,0.3375 0.02241,0.035 0.04115,0.04 0.04162,0.013 5.77e-4,-0.027 0.03575,-0.021 0.07843,0.016 0.04267,0.037 0.124824,0.075 0.182573,0.087 0.05775,0.012 0.236784,0.1011 0.397861,0.199 0.161076,0.098 0.278101,0.1534 0.260054,0.1233 -0.04043,-0.068 0.483671,0.2266 0.530946,0.2979 0.01866,0.028 0.05056,0.047 0.07085,0.043 2.093964,0.9231 3.377822,2.0524 5.222486,3.0043 0.122084,0.063 0.234453,0.1291 0.249714,0.1486 0.01526,0.02 0.157284,0.1051 0.315609,0.1901 0.158321,0.085 0.317451,0.1913 0.353622,0.2362 0.03616,0.045 0.09711,0.081 0.135412,0.081 0.03831,0 0.100507,0.038 0.138225,0.085 0.03772,0.046 0.0881,0.072 0.111963,0.057 0.02388,-0.015 0.05832,0.013 0.07656,0.062 0.01825,0.049 0.05662,0.074 0.08527,0.056 0.06129,-0.039 0.9008,0.8235 0.862957,0.8865 -0.01416,0.024 0.0054,0.056 0.04329,0.072 0.03798,0.015 0.117754,0.1277 0.177283,0.2491 0.05953,0.1215 0.144558,0.266 0.188953,0.3211 0.0444,0.055 0.06265,0.1001 0.04059,0.1001 -0.02207,0 0.0065,0.071 0.06347,0.1574 0.283405,0.4305 0.305848,0.6998 0.07259,0.8711 -0.17946,0.1318 -0.631355,0.305 -0.959394,0.3676 -0.114453,0.021 -0.208095,0.069 -0.208095,0.1039 0,0.035 0.01644,0.047 0.03651,0.026 0.02007,-0.021 0.07144,-0.01 0.114118,0.029 0.04268,0.037 0.07324,0.043 0.0679,0.014 -0.02423,-0.1314 0.01021,-0.1512 0.08563,-0.049 0.06628,0.09 0.09178,0.096 0.131792,0.033 0.02957,-0.046 0.06318,-0.055 0.08321,-0.021 0.01849,0.031 0.142207,0.058 0.274961,0.061 0.266568,0.01 0.537703,0.093 0.537703,0.1728 0,0.1921 -0.365848,0.2418 -1.927591,0.2619 -0.670667,0.01 -1.24626,0.033 -1.279095,0.054 -0.03284,0.021 -0.07614,0.011 -0.09622,-0.022 -0.02519,-0.042 -0.06216,-0.039 -0.11905,0.01 -0.04917,0.042 -0.09764,0.049 -0.119919,0.017 -0.839669,0.069 -1.411788,-0.041 -2.273703,-0.089 z"
-       id="path3004"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccscscscccccsccccccscccccscsccccccsccccccccccccccccccccccccccccccccccccccsscsccsccccsccscscccccccsccssscsccccccscsccccsccsccccsccccccccscccscsccscccccccccccsscccccccssccscsccscscsscccscscscccccsscccccscsscsccscscscccccsssccccsccccsscccccccccscccccccsssccccscccccccccscccccscscccccccsscccsccccsccssccccc" />
-  </g>
-</svg>
diff --git a/adventure-composer/assets-raw/engine/gen-default-icons.sh b/adventure-composer/assets-raw/engine/gen-default-icons.sh
deleted file mode 100755
index 937a9eb71..000000000
--- a/adventure-composer/assets-raw/engine/gen-default-icons.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-#ANDROID ICONS
-inkscape -w 144 -h 144 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/res/drawable-xxhdpi/ic_launcher.png  engine-default-icon.svg;
-inkscape -w 96 -h 96 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/res/drawable-xhdpi/ic_launcher.png  engine-default-icon.svg;
-inkscape -w 72 -h 72 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/res/drawable-hdpi/ic_launcher.png  engine-default-icon.svg;
-inkscape -w 48 -h 48 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/res/drawable-mdpi/ic_launcher.png  engine-default-icon.svg;
-#inkscape -w 36 -h 36 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/res/drawable-ldpi/ic_launcher.png  engine-default-icon.svg;
-
-inkscape -w 512 -h 512 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/ic_launcher-web.png  engine-default-icon.svg;
-
-
-#DESKTOP
-inkscape -w 16 -h 16 --export-area-page --export-png=../../src/main/resources/projectTmpl/desktop/src/icons/icon16.png  engine-default-icon.svg;
-inkscape -w 32 -h 32 --export-area-page --export-png=../../src/main/resources/projectTmpl/desktop/src/icons/icon32.png  engine-default-icon.svg;
-inkscape -w 128 -h 128 --export-area-page --export-png=../../src/main/resources/projectTmpl/desktop/src/icons/icon128.png  engine-default-icon.svg;
-
-#IOS
-inkscape -w 57 -h 57 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Icon.png  engine-default-icon.svg;
-inkscape -w 114 -h 114 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Icon@2x.png  engine-default-icon.svg;
-inkscape -w 72 -h 72 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Icon-72.png  engine-default-icon.svg;
-inkscape -w 144 -h 144 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Icon-72@2x.png  engine-default-icon.svg;
-
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/back.png b/adventure-composer/assets-raw/engine/ui-atlas/images/back.png
deleted file mode 100644
index 8da79590c..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/back.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/border_rect2.9.png b/adventure-composer/assets-raw/engine/ui-atlas/images/border_rect2.9.png
deleted file mode 100644
index c9814d1db..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/border_rect2.9.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/border_rect4.9.png b/adventure-composer/assets-raw/engine/ui-atlas/images/border_rect4.9.png
deleted file mode 100644
index 4f9ba7708..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/border_rect4.9.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/bubblepointer.png b/adventure-composer/assets-raw/engine/ui-atlas/images/bubblepointer.png
deleted file mode 100644
index c3c3e0bfe..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/bubblepointer.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/circle.png b/adventure-composer/assets-raw/engine/ui-atlas/images/circle.png
deleted file mode 100644
index c8529e378..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/circle.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/circle_border.png b/adventure-composer/assets-raw/engine/ui-atlas/images/circle_border.png
deleted file mode 100644
index 498c373a7..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/circle_border.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/circle_button.png b/adventure-composer/assets-raw/engine/ui-atlas/images/circle_button.png
deleted file mode 100644
index 0e58041c9..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/circle_button.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/config.png b/adventure-composer/assets-raw/engine/ui-atlas/images/config.png
deleted file mode 100644
index b7df82a44..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/config.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/credits.png b/adventure-composer/assets-raw/engine/ui-atlas/images/credits.png
deleted file mode 100644
index 277777e95..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/credits.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/help.png b/adventure-composer/assets-raw/engine/ui-atlas/images/help.png
deleted file mode 100644
index b736d8a22..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/help.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/hotspotpointer.png b/adventure-composer/assets-raw/engine/ui-atlas/images/hotspotpointer.png
deleted file mode 100644
index 3ad0841d7..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/hotspotpointer.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/inventory.png b/adventure-composer/assets-raw/engine/ui-atlas/images/inventory.png
deleted file mode 100644
index b22bf4313..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/inventory.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/inventory_plain.png b/adventure-composer/assets-raw/engine/ui-atlas/images/inventory_plain.png
deleted file mode 100644
index 3dec40438..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/inventory_plain.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/leave.png b/adventure-composer/assets-raw/engine/ui-atlas/images/leave.png
deleted file mode 100644
index 8e9b0e853..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/leave.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/left.png b/adventure-composer/assets-raw/engine/ui-atlas/images/left.png
deleted file mode 100644
index ff7332f5e..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/left.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/lookat.png b/adventure-composer/assets-raw/engine/ui-atlas/images/lookat.png
deleted file mode 100644
index 36bebe2f6..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/lookat.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/menu.png b/adventure-composer/assets-raw/engine/ui-atlas/images/menu.png
deleted file mode 100644
index 9dc526233..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/menu.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/pack.json b/adventure-composer/assets-raw/engine/ui-atlas/images/pack.json
deleted file mode 100644
index 8f1f6afb6..000000000
--- a/adventure-composer/assets-raw/engine/ui-atlas/images/pack.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    pot: false,
-    paddingX: 4,
-    paddingY: 4,
-    bleed: true,
-    edgePadding: true,
-    duplicatePadding: false,
-    rotation: false,
-    minWidth: 16,
-    minHeight: 16,
-    maxWidth: 1024,
-    maxHeight: 1024,
-    square: false,
-    stripWhitespaceX: false,
-    stripWhitespaceY: false,
-    alphaThreshold: 0,
-    filterMin: MipMapLinearNearest,
-    filterMag: Nearest,
-    wrapX: ClampToEdge,
-    wrapY: ClampToEdge,
-    format: RGBA8888,
-    alias: true,
-    outputFormat: png,
-    jpegQuality: 0.9,
-    ignoreBlankImages: true,
-    fast: false,
-    debug: false,
-    combineSubdirectories: false,
-    flattenPaths: false,
-    premultiplyAlpha: false,
-    useIndexes: true,
-    limitMemory: true,
-    grid: false,
-    scale: [1],
-    scaleSuffix: [""],
-}
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/pickup.png b/adventure-composer/assets-raw/engine/ui-atlas/images/pickup.png
deleted file mode 100644
index 834394ce2..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/pickup.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/pie.png b/adventure-composer/assets-raw/engine/ui-atlas/images/pie.png
deleted file mode 100644
index a68658504..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/pie.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/pointer.png b/adventure-composer/assets-raw/engine/ui-atlas/images/pointer.png
deleted file mode 100644
index 56c185d0b..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/pointer.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/quit.png b/adventure-composer/assets-raw/engine/ui-atlas/images/quit.png
deleted file mode 100644
index eed4ec27b..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/quit.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/reload.png b/adventure-composer/assets-raw/engine/ui-atlas/images/reload.png
deleted file mode 100644
index 149bdfa8a..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/reload.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/right.png b/adventure-composer/assets-raw/engine/ui-atlas/images/right.png
deleted file mode 100644
index cd952186c..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/right.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/talkto.png b/adventure-composer/assets-raw/engine/ui-atlas/images/talkto.png
deleted file mode 100644
index 45dbe85e6..000000000
Binary files a/adventure-composer/assets-raw/engine/ui-atlas/images/talkto.png and /dev/null differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/ui.svg b/adventure-composer/assets-raw/engine/ui-atlas/ui.svg
deleted file mode 100644
index 984c76ff0..000000000
--- a/adventure-composer/assets-raw/engine/ui-atlas/ui.svg
+++ /dev/null
@@ -1,2591 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1920"
-   height="1080"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91pre2 r"
-   sodipodi:docname="ui.svg"
-   inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/bubblepointer.png"
-   inkscape:export-xdpi="84"
-   inkscape:export-ydpi="84">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#6b6b6b"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.2520266"
-     inkscape:cx="1645.3959"
-     inkscape:cy="1370.7217"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1301"
-     inkscape:window-height="744"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-global="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     borderlayer="false"
-     inkscape:showpageshadow="false"
-     showborder="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <defs
-     id="defs4">
-    <inkscape:path-effect
-       cusp_linecap_type="round"
-       end_linecap_type="zerowidth"
-       miter_limit="4"
-       linejoin_type="round"
-       start_linecap_type="zerowidth"
-       interpolator_beta="0.2"
-       interpolator_type="CubicBezierJohan"
-       sort_points="true"
-       offset_points="0,5"
-       is_visible="true"
-       id="path-effect4179"
-       effect="powerstroke" />
-    <inkscape:path-effect
-       cusp_linecap_type="round"
-       end_linecap_type="zerowidth"
-       miter_limit="4"
-       linejoin_type="round"
-       start_linecap_type="zerowidth"
-       interpolator_beta="0.2"
-       interpolator_type="CubicBezierJohan"
-       sort_points="true"
-       offset_points="0.013444712,6.2466648"
-       is_visible="true"
-       id="path-effect4176"
-       effect="powerstroke" />
-    <inkscape:path-effect
-       effect="powerstroke"
-       id="path-effect4172"
-       is_visible="true"
-       offset_points="0.0074719083,5.4253621"
-       sort_points="true"
-       interpolator_type="CubicBezierJohan"
-       interpolator_beta="0.2"
-       start_linecap_type="zerowidth"
-       linejoin_type="round"
-       miter_limit="4"
-       end_linecap_type="zerowidth"
-       cusp_linecap_type="round" />
-    <inkscape:path-effect
-       cusp_linecap_type="round"
-       end_linecap_type="zerowidth"
-       miter_limit="4"
-       linejoin_type="round"
-       start_linecap_type="zerowidth"
-       interpolator_beta="0.2"
-       interpolator_type="CubicBezierJohan"
-       sort_points="true"
-       offset_points="0,6.1695344"
-       is_visible="true"
-       id="path-effect4168"
-       effect="powerstroke" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect5640"
-       is_visible="true"
-       pattern="m 0,0 2.38769,0 0,167.93407 -2.38769,0 z"
-       copytype="repeated"
-       prop_scale="2"
-       scale_y_rel="true"
-       spacing="400"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       fuse_tolerance="0"
-       vertical_pattern="true"
-       prop_units="false"
-       tang_offset="0"
-       normal_offset="0"
-       spacing="300"
-       scale_y_rel="false"
-       prop_scale="15"
-       copytype="repeated"
-       pattern="m 0,0 2.38769,0 0,167.93407 -2.38769,0 z"
-       is_visible="true"
-       id="path-effect5528"
-       effect="skeletal" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect4016"
-       is_visible="true"
-       pattern="m 0,0 2.38769,0 0,27.06046 -2.38769,0 z"
-       copytype="repeated"
-       prop_scale="0.5"
-       scale_y_rel="false"
-       spacing="9.5"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5598">
-      <g
-         id="g5600"
-         style="fill:#ffffff"
-         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
-        <path
-           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
-           inkscape:connector-curvature="0"
-           id="path5602"
-           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path5604"
-           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
-      </g>
-    </clipPath>
-    <inkscape:path-effect
-       fuse_tolerance="0"
-       vertical_pattern="true"
-       prop_units="false"
-       tang_offset="0"
-       normal_offset="0"
-       spacing="300"
-       scale_y_rel="false"
-       prop_scale="15"
-       copytype="repeated"
-       pattern="m 0,0 2.38769,0 0,167.93407 -2.38769,0 z"
-       is_visible="true"
-       id="path-effect5528-7"
-       effect="skeletal" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5598-8">
-      <g
-         id="g5600-9"
-         style="fill:#ffffff"
-         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
-        <path
-           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
-           inkscape:connector-curvature="0"
-           id="path5602-1"
-           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path5604-6"
-           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
-      </g>
-    </clipPath>
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect5640-7"
-       is_visible="true"
-       pattern="m 0,0 2.38769,0 0,167.93407 -2.38769,0 z"
-       copytype="repeated"
-       prop_scale="2"
-       scale_y_rel="true"
-       spacing="400"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect4016-8"
-       is_visible="true"
-       pattern="m 0,0 2.38769,0 0,27.06046 -2.38769,0 z"
-       copytype="repeated"
-       prop_scale="0.5"
-       scale_y_rel="false"
-       spacing="9.5"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       fuse_tolerance="0"
-       vertical_pattern="true"
-       prop_units="false"
-       tang_offset="0"
-       normal_offset="0"
-       spacing="200"
-       scale_y_rel="false"
-       prop_scale="15"
-       copytype="repeated"
-       pattern="m 0,0 2.38769,0 0,136.09823 -2.38769,0 z"
-       is_visible="true"
-       id="path-effect5528-8"
-       effect="skeletal" />
-    <inkscape:path-effect
-       fuse_tolerance="0"
-       vertical_pattern="true"
-       prop_units="false"
-       tang_offset="0"
-       normal_offset="0"
-       spacing="350"
-       scale_y_rel="false"
-       prop_scale="15"
-       copytype="repeated"
-       pattern="m 0,0 2.38769,0 0,167.93407 -2.38769,0 z"
-       is_visible="true"
-       id="path-effect5528-8-5"
-       effect="skeletal" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5598-8-0">
-      <g
-         id="g5600-9-9"
-         style="fill:#ffffff"
-         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
-        <path
-           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
-           inkscape:connector-curvature="0"
-           id="path5602-1-7"
-           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path5604-6-6"
-           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
-      </g>
-    </clipPath>
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect5640-7-0"
-       is_visible="true"
-       pattern="m 0,0 2.38769,0 0,167.93407 -2.38769,0 z"
-       copytype="repeated"
-       prop_scale="2"
-       scale_y_rel="true"
-       spacing="400"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect4016-8-7"
-       is_visible="true"
-       pattern="m 0,0 2.38769,0 0,27.06046 -2.38769,0 z"
-       copytype="repeated"
-       prop_scale="0.5"
-       scale_y_rel="false"
-       spacing="10"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       fuse_tolerance="0"
-       vertical_pattern="true"
-       prop_units="false"
-       tang_offset="0"
-       normal_offset="0"
-       spacing="200"
-       scale_y_rel="false"
-       prop_scale="15"
-       copytype="repeated"
-       pattern="m 0,0 2.38769,0 0,136.09823 -2.38769,0 z"
-       is_visible="true"
-       id="path-effect5528-8-6"
-       effect="skeletal" />
-    <inkscape:path-effect
-       fuse_tolerance="0"
-       vertical_pattern="true"
-       prop_units="false"
-       tang_offset="0"
-       normal_offset="0"
-       spacing="200"
-       scale_y_rel="false"
-       prop_scale="15"
-       copytype="repeated"
-       pattern="m 0,0 2.38769,0 0,136.09823 -2.38769,0 z"
-       is_visible="true"
-       id="path-effect5528-8-59"
-       effect="skeletal" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect5640-7-0-3"
-       is_visible="true"
-       pattern="m 0,0 2.38769,0 0,167.93407 -2.38769,0 z"
-       copytype="repeated"
-       prop_scale="2"
-       scale_y_rel="true"
-       spacing="400"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect4016-8-7-2"
-       is_visible="true"
-       pattern="m 0,0 2.38769,0 0,27.06046 -2.38769,0 z"
-       copytype="repeated"
-       prop_scale="0.5"
-       scale_y_rel="false"
-       spacing="10"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       fuse_tolerance="0"
-       vertical_pattern="true"
-       prop_units="false"
-       tang_offset="0"
-       normal_offset="0"
-       spacing="200"
-       scale_y_rel="false"
-       prop_scale="15"
-       copytype="repeated"
-       pattern="m 0,0 2.38769,0 0,136.09823 -2.38769,0 z"
-       is_visible="true"
-       id="path-effect5528-8-6-9"
-       effect="skeletal" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5598-8-0-5">
-      <g
-         id="g5600-9-9-5"
-         style="fill:#ffffff"
-         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
-        <path
-           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
-           inkscape:connector-curvature="0"
-           id="path5602-1-7-3"
-           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path5604-6-6-2"
-           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
-      </g>
-    </clipPath>
-    <linearGradient
-       id="linearGradient7679">
-      <stop
-         id="stop7681"
-         offset="0"
-         style="stop-color: rgb(36, 0, 0); stop-opacity: 1;" />
-      <stop
-         style="stop-color: rgb(60, 0, 0); stop-opacity: 0.498039;"
-         offset="0"
-         id="stop7687" />
-      <stop
-         id="stop7689"
-         offset="0.62932223"
-         style="stop-color: rgb(72, 0, 0); stop-opacity: 0.247059;" />
-      <stop
-         id="stop7683"
-         offset="1"
-         style="stop-color: rgb(85, 0, 0); stop-opacity: 0;" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective6083" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect3796"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3792"
-       is_visible="true" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect3788"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect3784"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect3772"
-       effect="spiro" />
-    <filter
-       inkscape:collect="always"
-       id="filter4025"
-       x="-0.11973446"
-       width="1.2394689"
-       y="-0.20150433"
-       height="1.4030087">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.2776072"
-         id="feGaussianBlur4027" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter4029"
-       x="-0.33718547"
-       width="1.674371"
-       y="-0.56743228"
-       height="2.1348646">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.2776072"
-         id="feGaussianBlur4031" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4518"
-       x="-0.092381716"
-       width="1.1847634"
-       y="-0.09483435"
-       height="1.1896687">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="6.9527644"
-         id="feGaussianBlur4520" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter5123"
-       x="-0.04920011"
-       width="1.0984002"
-       y="-0.04919989"
-       height="1.0983998">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.0087853"
-         id="feGaussianBlur5125" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter5310"
-       x="-0.061172366"
-       width="1.1223447"
-       y="-0.098933734"
-       height="1.1978675">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.260818"
-         id="feGaussianBlur5312" />
-    </filter>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4578">
-      <g
-         style="stroke:#ff0000"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
-         inkscape:export-ydpi="180"
-         inkscape:export-xdpi="180"
-         transform="matrix(0.98719379,0,0,0.98719379,47.995218,-1001.3914)"
-         id="g4580">
-        <rect
-           y="2036.7069"
-           x="434.91745"
-           height="101.29723"
-           width="101.29723"
-           id="rect4582"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#ff0000;stroke-width:2;marker:none;enable-background:accumulate" />
-        <g
-           style="stroke:#ff0000"
-           id="g4584"
-           transform="matrix(-1,0,0,-1,973.18233,4018.141)"
-           inkscape:export-xdpi="59"
-           inkscape:export-ydpi="59" />
-      </g>
-    </clipPath>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter5028"
-       x="-0.0348"
-       width="1.0696"
-       y="-0.0348"
-       height="1.0696">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.35"
-         id="feGaussianBlur5030" />
-    </filter>
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="bg"
-     transform="translate(0,27.637791)"
-     sodipodi:insensitive="true">
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="rect3271"
-       width="1920"
-       height="1080"
-       x="0"
-       y="-27.637791" />
-    <rect
-       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d35f5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect5199"
-       width="666.75824"
-       height="1198.4353"
-       x="33.22084"
-       y="-122.91204" />
-    <rect
-       y="1105.639"
-       x="0"
-       height="1080"
-       width="1920"
-       id="rect4915"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="rect4917"
-       width="1920"
-       height="1080"
-       x="0"
-       y="-1246.215" />
-    <rect
-       y="11.345305"
-       x="1230.4729"
-       height="683.15863"
-       width="654.57251"
-       id="rect4919"
-       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d35f5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-  </g>
-  <g
-     inkscape:label="Capa 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,27.637791)">
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-       d="m 226.09252,-486.50661 c 67.20714,1.6823 121.32534,56.0393 122.67434,123.3291 l -67.81364,0 c -1.30468,-30.0671 -25.45314,-54.2098 -55.51551,-55.5155 l 0,-67.8136 c 0.21767,0 0.43742,-0.01 0.65481,0 z"
-       id="path1017" />
-    <g
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/pie.png"
-       id="g4106"
-       transform="matrix(0.65480881,0,0,0.65480881,43.01207,-1220.5064)">
-      <rect
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-         id="rect4104"
-         width="197.01918"
-         height="197.01918"
-         x="78.256035"
-         y="1116.5984" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-         d="m 269.9375,1120.9375 c -102.63627,2.5691 -185.283609,85.5811 -187.34375,188.3437 l 103.5625,0 c 1.99246,-45.9174 38.8711,-82.7872 84.78125,-84.7812 l 0,-103.5625 c -0.33242,0.01 -0.668,-0.01 -1,0 z"
-         id="path1009"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/pie.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="matrix(0.65480881,0,0,0.65480881,315.28078,-1390.5781)"
-       id="g5642-7"
-       inkscape:export-xdpi="45.208038"
-       inkscape:export-ydpi="45.208038">
-      <path
-         inkscape:path-effect="#path-effect5640-7"
-         transform="matrix(0.36631189,-0.13312953,0.139157,0.3830188,115.48088,337.73263)"
-         d="m 695.61322,549.35583 c -0.006,1.55888 -0.0211,3.11612 -0.0466,4.67165 L 359.75918,549.4592 c -0.004,-0.036 -0.009,-0.0705 -0.0141,-0.10337 111.95605,0 223.9121,0 335.86814,0 z m -568.47907,259.084 c -1.18001,-1.05354 -2.35399,-2.11604 -3.52189,-3.18746 L 350.98777,558.19785 c 0.003,0.006 0.007,0.013 0.0133,0.0204 z M 303.45782,207.23272 c 1.56681,-0.23966 3.13677,-0.46897 4.70982,-0.68792 l 46.03975,332.19797 c -0.001,-7.5e-4 -0.004,-7e-4 -0.009,1.2e-4 z"
-         sodipodi:ry="178.28075"
-         sodipodi:rx="173.90331"
-         sodipodi:cy="549.35583"
-         sodipodi:cx="353.77585"
-         id="path5638-8"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#2b2b2b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.98727798;marker:none;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         inkscape:export-ydpi="47.531654"
-         inkscape:export-xdpi="47.531654"
-         inkscape:path-effect="#path-effect4016-8"
-         transform="matrix(0.01312352,-0.62980725,0.61434419,0.01284836,-20.853297,717.2346)"
-         d="m 534.44427,549.35583 c -2.2e-4,0.82664 -0.006,1.65317 -0.0175,2.47953 l -13.52779,-0.18403 c 0.0102,-0.76515 0.0153,-1.53033 0.015,-2.2955 4.51008,0 9.02015,0 13.53023,0 z m -0.41757,12.33103 c -0.0555,0.82398 -0.1165,1.64754 -0.18297,2.47061 l -13.48272,-1.08875 c 0.0616,-0.76313 0.11813,-1.52663 0.16952,-2.29043 z m -1.23481,12.26743 c -0.10965,0.81812 -0.22469,1.63549 -0.34508,2.45204 l -13.38287,-1.97428 c 0.11187,-0.7579 0.21876,-1.51649 0.32063,-2.27571 z m -2.03518,12.15572 c -0.16268,0.80903 -0.33062,1.61698 -0.50381,2.4238 l -13.22824,-2.84062 c 0.161,-0.74945 0.31712,-1.49992 0.46835,-2.25133 z m -2.8187,11.99588 c -0.21457,0.79671 -0.43429,1.59203 -0.65914,2.38588 L 514.26003,596.804 c 0.209,-0.73778 0.41323,-1.47689 0.61268,-2.21727 z m -3.58535,11.78789 c -0.26534,0.78118 -0.53571,1.56064 -0.8111,2.33831 l -12.75466,-4.51574 c 0.25587,-0.72288 0.50709,-1.44742 0.75364,-2.17355 z m -4.33516,11.53179 c -0.31497,0.76242 -0.63487,1.5228 -0.95967,2.28106 l -12.43568,-5.32451 c 0.30161,-0.70476 0.59868,-1.4115 0.8912,-2.12016 z m -5.0681,11.22756 c -0.36348,0.74044 -0.73177,1.47851 -1.10485,2.21415 l -12.06194,-6.11411 c 0.34623,-0.68342 0.68803,-1.36914 1.02538,-2.0571 z m -5.78418,10.87518 c -0.41086,0.71524 -0.82641,1.42778 -1.24665,2.13757 l -11.63341,-6.88451 c 0.38971,-0.65885 0.77511,-1.32033 1.15618,-1.98437 z m -6.48341,10.47469 c -0.45711,0.68681 -0.9188,1.37061 -1.38506,2.05132 l -11.1501,-7.63573 c 0.43206,-0.63106 0.85993,-1.26507 1.28358,-1.90198 z m -7.16578,10.02606 c -0.50223,0.65517 -1.00893,1.30699 -1.52008,1.95541 l -10.61201,-8.36776 c 0.47329,-0.60005 0.9425,-1.20338 1.4076,-1.80992 z m -7.83129,9.5293 c -0.54622,0.6203 -1.0968,1.23693 -1.65171,1.84984 l -10.01915,-9.08061 c 0.51339,-0.56582 1.02281,-1.13524 1.52824,-1.70819 z m -8.48325,8.98161 c -0.58965,0.58113 -1.18334,1.15801 -1.781,1.7306 l -9.35992,-9.76591 c 0.55127,-0.52858 1.09874,-1.06106 1.64236,-1.5974 z m -9.09942,8.35954 c -0.62823,0.53796 -1.26017,1.07151 -1.89574,1.60061 l -8.65313,-10.39467 c 0.58733,-0.48892 1.17121,-0.98191 1.75157,-1.47892 z m -9.65057,7.70263 c -0.66344,0.49317 -1.33025,0.98177 -2.00036,1.46574 l -7.91875,-10.96608 c 0.62002,-0.44764 1.23693,-0.89951 1.85065,-1.35557 z m -10.15133,7.02149 c -0.69529,0.44676 -1.3936,0.88877 -2.09487,1.326 l -7.15678,-11.48015 c 0.64933,-0.40474 1.29589,-0.81387 1.93961,-1.22736 z m -10.60172,6.3161 c -0.72376,0.39872 -1.4502,0.79253 -2.17926,1.1814 l -6.36723,-11.93689 c 0.67528,-0.36021 1.34812,-0.72498 2.01846,-1.09427 z m -11.00174,5.58649 c -0.74884,0.34905 -1.50004,0.69304 -2.25352,1.03193 l -5.5501,-12.33629 c 0.69785,-0.31407 1.3936,-0.63285 2.08719,-0.95632 z m -11.35136,4.83263 c -0.77057,0.29777 -1.54315,0.59031 -2.31768,0.87759 l -4.70538,-12.67835 c 0.71705,-0.26629 1.43234,-0.53747 2.1458,-0.81349 z m -11.65062,4.05453 c -0.78892,0.24487 -1.57951,0.48435 -2.37171,0.71839 l -3.83307,-12.96306 c 0.73287,-0.2169 1.46432,-0.43885 2.19428,-0.66581 z m -11.89949,3.25222 c -0.8039,0.19034 -1.60913,0.37512 -2.41562,0.55431 l -2.9332,-13.19044 c 0.74533,-0.16589 1.48957,-0.33698 2.23266,-0.51325 z m -12.098,2.42565 c -0.81549,0.13419 -1.63199,0.26266 -2.44941,0.38537 l -2.00572,-13.36048 c 0.7544,-0.11325 1.50806,-0.23187 2.26091,-0.35582 z m -12.2461,1.57485 c -0.82373,0.0764 -1.64812,0.14695 -2.47309,0.21157 l -1.05067,-13.47318 c 0.76011,-0.059 1.51981,-0.12352 2.27905,-0.19354 z m -12.34385,0.69982 c -0.82859,0.017 -1.65749,0.028 -2.48665,0.0329 l -0.068,-13.52854 c 0.76244,-0.003 1.52481,-0.0119 2.28706,-0.0264 z m -12.37315,-0.21294 c -0.82676,-0.0447 -1.65305,-0.0953 -2.47879,-0.15185 l 0.91824,-13.48411 c 0.76063,0.0515 1.52161,0.0974 2.28288,0.1377 z m -12.30497,-1.10699 c -0.82035,-0.1033 -1.63988,-0.21241 -2.45853,-0.3273 l 1.87707,-13.37923 c 0.75538,0.10594 1.51145,0.2065 2.26815,0.30163 z m -12.18396,-1.97083 c -0.81056,-0.16033 -1.61996,-0.3263 -2.42814,-0.49788 l 2.80829,-13.21702 c 0.74676,0.15881 1.49456,0.31238 2.24332,0.4607 z m -12.01257,-2.81043 c -0.79739,-0.21573 -1.5933,-0.43694 -2.38765,-0.6636 l 3.71195,-12.99746 c 0.73477,0.21004 1.47091,0.41502 2.20836,0.6149 z m -11.7908,-3.6258 c -0.78087,-0.26951 -1.5599,-0.54434 -2.33703,-0.82445 l 4.58801,-12.72056 c 0.7194,0.25965 1.44052,0.51441 2.16328,0.76422 z m -11.51867,-4.41694 c -0.76095,-0.32166 -1.51974,-0.64848 -2.27629,-0.98042 l 5.43649,-12.38633 c 0.70067,0.30765 1.40339,0.61055 2.10809,0.90869 z m -11.19613,-5.18383 c -0.73768,-0.37219 -1.47285,-0.74938 -2.20544,-1.13153 l 6.25739,-11.99475 c 0.67855,0.35401 1.3595,0.70345 2.04277,1.04828 z m -10.82324,-5.92648 c -0.71102,-0.42111 -1.4192,-0.84705 -2.12446,-1.27778 l 7.05069,-11.54584 c 0.65308,0.39876 1.30888,0.7931 1.96734,1.18301 z m -10.39996,-6.64492 c -0.681,-0.46839 -1.35881,-0.94146 -2.03337,-1.41915 l 7.81643,-11.03959 c 0.62421,0.44188 1.2515,0.87952 1.88178,1.31287 z m -9.9263,-7.3391 c -0.6476,-0.51406 -1.29167,-1.03263 -1.93216,-1.55566 l 8.55457,-10.476 c 0.59199,0.48338 1.18738,0.96268 1.78611,1.43786 z m -9.40226,-8.00906 c -0.61083,-0.5581 -1.2178,-1.12055 -1.82083,-1.6873 l 9.26512,-9.85506 c 0.55639,0.52326 1.11652,1.0426 1.68033,1.55798 z m -8.82461,-8.65473 c -0.56942,-0.6002 -1.13455,-1.20424 -1.69535,-1.81205 l 9.93403,-9.17635 c 0.51877,0.5609 1.0415,1.11815 1.56816,1.6717 z m -8.18244,-9.24207 c -0.52603,-0.6368 -1.04766,-1.27712 -1.56485,-1.92088 l 10.53437,-8.46614 c 0.47883,0.59558 0.96172,1.18783 1.44867,1.7767 z m -7.52599,-9.76473 c -0.48153,-0.67018 -0.95853,-1.34355 -1.43097,-2.02005 l 11.07992,-7.73673 c 0.43776,0.62703 0.87969,1.25105 1.32579,1.87202 z m -6.85271,-10.23925 c -0.43588,-0.70034 -0.86712,-1.40355 -1.2937,-2.10956 l 11.57071,-6.98813 c 0.39555,0.65525 0.7954,1.30783 1.19952,1.95767 z m -6.16255,-10.66565 c -0.38911,-0.72728 -0.77346,-1.4571 -1.15305,-2.1894 l 12.00671,-6.22034 c 0.35223,0.68026 0.70886,1.35816 1.06988,2.03365 z m -5.45553,-11.04392 c -0.34121,-0.75099 -0.67756,-1.5042 -1.00901,-2.25957 l 12.38793,-5.43336 c 0.30776,0.70203 0.62005,1.40205 0.93683,2.09997 z m -4.73167,-11.37405 c -0.29218,-0.77149 -0.57938,-1.54487 -0.86158,-2.32008 l 12.71437,-4.6272 c 0.26217,0.7206 0.52899,1.43949 0.80041,2.15662 z m -3.99093,-11.65606 c -0.24203,-0.78876 -0.47896,-1.57908 -0.71078,-2.37092 l 12.98603,-3.80185 c 0.21546,0.73594 0.43567,1.47049 0.66061,2.2036 z M 178.2155,592.5882 c -0.19074,-0.8028 -0.37628,-1.60685 -0.55658,-2.41209 l 13.20291,-2.95731 c 0.16762,0.74805 0.34009,1.49505 0.51741,2.24092 z m -2.45891,-12.07568 c -0.13832,-0.81363 -0.27133,-1.62818 -0.39899,-2.44359 l 13.36501,-2.09359 c 0.11864,0.75694 0.24226,1.51315 0.37083,2.26857 z m -1.6676,-12.2133 c -0.0848,-0.82123 -0.16413,-1.64306 -0.23802,-2.46543 l 13.47232,-1.21068 c 0.0686,0.76262 0.14217,1.52482 0.22087,2.28655 z m -0.85944,-12.30279 c -0.0301,-0.82561 -0.0547,-1.6515 -0.0737,-2.4776 l 13.52487,-0.30857 c 0.0173,0.76506 0.0398,1.53004 0.0675,2.29486 z m -0.0319,-12.34084 c 0.0259,-0.82582 0.0573,-1.65137 0.0943,-2.47661 l 13.51378,0.60428 c -0.0341,0.76462 -0.0631,1.52943 -0.0868,2.29436 z m 0.79713,-12.30764 c 0.0806,-0.82168 0.16675,-1.64278 0.25827,-2.46323 l 13.44341,1.50013 c -0.085,0.76112 -0.16489,1.52276 -0.23974,2.28484 z m 1.60657,-12.22182 c 0.13429,-0.81432 0.2739,-1.62774 0.41882,-2.44019 l 13.31826,2.3768 c -0.1347,0.75441 -0.26447,1.50964 -0.38928,2.26565 z m 2.39917,-12.08787 c 0.18678,-0.80374 0.37878,-1.60626 0.57597,-2.40748 l 13.13834,3.23428 c -0.18331,0.74446 -0.3618,1.49008 -0.53544,2.2368 z m 3.17489,-11.90579 c 0.23816,-0.78994 0.48142,-1.57833 0.72975,-2.36511 l 12.90363,4.07257 c -0.23079,0.7313 -0.45687,1.46408 -0.67821,2.19828 z m 3.93377,-11.67559 c 0.2884,-0.77292 0.58179,-1.54396 0.88014,-2.31307 l 12.61414,4.89168 c -0.27714,0.71491 -0.54968,1.43163 -0.8176,2.15009 z m 4.67578,-11.39725 c 0.33751,-0.75267 0.6799,-1.50315 1.02714,-2.25136 l 12.26987,5.6916 c -0.32235,0.6953 -0.64023,1.39273 -0.95359,2.09223 z m 5.40094,-11.07079 c 0.3855,-0.7292 0.77576,-1.45588 1.17076,-2.17998 l 11.87082,6.47233 c -0.36645,0.67247 -0.72853,1.34739 -1.08621,2.02471 z m 6.10923,-10.69618 c 0.43236,-0.70251 0.86936,-1.40218 1.311,-2.09894 l 11.41699,7.23387 c -0.40942,0.64641 -0.81457,1.29561 -1.21545,1.94752 z m 6.80068,-10.27346 c 0.47808,-0.6726 0.9607,-1.34203 1.44784,-2.00823 l 10.90838,7.97622 c -0.45125,0.61714 -0.89835,1.23739 -1.34129,1.86067 z m 7.47525,-9.8026 c 0.52269,-0.63946 1.0498,-1.27544 1.5813,-1.90785 l 10.34499,8.69939 c -0.49195,0.58464 -0.97987,1.17271 -1.46374,1.76414 z m 8.13298,-9.28362 c 0.56616,-0.6031 1.13662,-1.20239 1.71137,-1.7978 l 9.72682,9.40337 c -0.53152,0.54892 -1.05914,1.10159 -1.58281,1.65794 z m 8.77727,-8.70245 c 0.60788,-0.5614 1.21966,-1.11846 1.83525,-1.67116 l 9.0369,10.06344 c -0.56835,0.51046 -1.13306,1.0249 -1.69406,1.54328 z m 9.36024,-8.05914 c 0.64491,-0.51748 1.29338,-1.03046 1.94532,-1.53892 l 8.31736,10.66572 c -0.60285,0.47005 -1.2024,0.94425 -1.79858,1.42255 z m 9.88812,-7.39104 c 0.67857,-0.47194 1.36035,-0.93921 2.04527,-1.40181 l 7.57024,11.21065 c -0.63398,0.42803 -1.265,0.86036 -1.893,1.29696 z m 10.36562,-6.6987 c 0.70885,-0.42477 1.42057,-0.84472 2.1351,-1.25982 l 6.79554,11.69824 c -0.66174,0.38437 -1.32086,0.77321 -1.97729,1.16649 z m 10.79274,-5.98212 c 0.73576,-0.37598 1.47405,-0.74698 2.21481,-1.11297 l 5.99325,12.12849 c -0.68612,0.3391 -1.36997,0.68283 -2.05146,1.03116 z m 11.16948,-5.24131 c 0.7593,-0.32557 1.52079,-0.646 2.28441,-0.96125 l 5.16337,12.5014 c -0.70714,0.29221 -1.41233,0.5892 -2.11552,0.89096 z m 11.49584,-4.47626 c 0.77946,-0.27354 1.56078,-0.54177 2.34389,-0.80466 l 4.30591,12.81697 c -0.72477,0.24369 -1.44795,0.49233 -2.16945,0.74589 z m 11.77183,-3.68697 c 0.79625,-0.21989 1.59403,-0.4343 2.39325,-0.64321 l 3.42087,13.07521 c -0.73905,0.19354 -1.47682,0.3922 -2.21327,0.59594 z m 11.99744,-2.87346 c 0.80967,-0.1646 1.62052,-0.32358 2.43248,-0.47689 l 2.50824,13.27611 c -0.74993,0.14178 -1.49894,0.28883 -2.24696,0.44114 z m 12.17266,-2.0357 c 0.81972,-0.1077 1.64028,-0.20962 2.4616,-0.3057 l 1.56804,13.41966 c -0.75746,0.0884 -1.51433,0.18223 -2.27055,0.28147 z m 12.29751,-1.1737 c 0.82639,-0.0492 1.65329,-0.0924 2.48061,-0.12965 l 0.60024,13.50588 c -0.76161,0.0334 -1.52297,0.0724 -2.28401,0.11693 z m 12.37073,-0.28315 c 0.82882,0.0124 1.65734,0.0309 2.48551,0.0554 l -0.39087,13.51682 c -0.76205,-0.0215 -1.52428,-0.0373 -2.28661,-0.0475 z m 12.34924,0.63211 c 0.82421,0.0719 1.6478,0.14978 2.47069,0.23349 l -1.36453,13.44279 c -0.75862,-0.0768 -1.51776,-0.14818 -2.27734,-0.21402 z m 12.25533,1.50899 c 0.81625,0.12984 1.63152,0.26541 2.44576,0.40669 l -2.31061,13.31143 c -0.75182,-0.13056 -1.50449,-0.2558 -2.25794,-0.3757 z m 12.11106,2.36163 c 0.8049,0.18612 1.60849,0.3778 2.4107,0.57503 l -3.2291,13.12273 c -0.74164,-0.18267 -1.48447,-0.36019 -2.22843,-0.53252 z m 11.91641,3.19005 c 0.79017,0.24076 1.57871,0.48694 2.36552,0.73849 l -4.12001,12.87669 c -0.72809,-0.23315 -1.45771,-0.46132 -2.18879,-0.68447 z m 11.67136,3.99421 c 0.77209,0.2938 1.54219,0.59284 2.31024,0.8971 l -4.98333,12.57331 c -0.71117,-0.28202 -1.42421,-0.55922 -2.13905,-0.83156 z m 11.37596,4.77416 c 0.75062,0.3452 1.49892,0.69549 2.24482,1.05082 l -5.81907,12.2126 c -0.69087,-0.32926 -1.38395,-0.65387 -2.07917,-0.97377 z m 11.03017,5.52986 c 0.72578,0.39499 1.4489,0.79489 2.16929,1.19968 l -6.62723,11.79454 c -0.6672,-0.37488 -1.33695,-0.74526 -2.00918,-1.11111 z m 10.63399,6.26132 c 0.69758,0.44315 1.39215,0.89106 2.08365,1.34368 l -7.4078,11.31914 c -0.64016,-0.41887 -1.28321,-0.83342 -1.92908,-1.24359 z m 10.18745,6.96856 c 0.66599,0.48969 1.32864,0.98397 1.98788,1.48281 l -8.16079,10.7864 c -0.60975,-0.46125 -1.22272,-0.91833 -1.83885,-1.3712 z m 9.69052,7.65155 c 0.63103,0.53461 1.25839,1.07364 1.88199,1.61707 l -8.88618,10.19633 c -0.57596,-0.50201 -1.15549,-1 -1.73851,-1.49395 z m 9.14322,8.31031 c 0.5927,0.5779 1.18139,1.16006 1.76599,1.74646 l -9.58401,9.54891 c -0.5388,-0.54113 -1.0815,-1.07842 -1.62804,-1.61182 z m 8.53257,8.93675 c 0.54952,0.61751 1.09469,1.2387 1.63549,1.86352 l -10.21811,8.8507 c -0.50047,-0.57731 -1.00494,-1.15113 -1.51339,-1.7214 z m 7.88134,9.48945 c 0.50561,0.65262 1.00677,1.30861 1.50343,1.96789 l -10.79315,8.13162 c -0.46,-0.61049 -0.92412,-1.21782 -1.39234,-1.82192 z m 7.21711,9.98988 c 0.46058,0.68452 0.91659,1.37207 1.36799,2.0626 l -11.31341,7.39335 c -0.41841,-0.64046 -0.84105,-1.27807 -1.2679,-1.91278 z m 6.53603,10.44218 c 0.41442,0.71319 0.82415,1.42909 1.22916,2.14764 l -11.77889,6.63589 c -0.37569,-0.6672 -0.75571,-1.33188 -1.14007,-1.99397 z m 5.83809,10.84635 c 0.36713,0.73863 0.72945,1.47965 1.08694,2.22301 l -12.18959,5.85923 c -0.33183,-0.69071 -0.66812,-1.37923 -1.00885,-2.06548 z m 5.12329,11.20238 c 0.31871,0.76086 0.6325,1.52378 0.94134,2.28872 l -12.54551,5.0634 c -0.28685,-0.71101 -0.57827,-1.42015 -0.87425,-2.12734 z m 4.39164,11.51028 c 0.26916,0.77987 0.53328,1.56148 0.79235,2.34477 l -12.84665,4.24837 c -0.24074,-0.72808 -0.48617,-1.45461 -0.73626,-2.17952 z m 3.64312,11.77007 c 0.21848,0.79564 0.43181,1.59271 0.63997,2.39113 l -13.09301,3.41417 c -0.1935,-0.74194 -0.3918,-1.48264 -0.59488,-2.22204 z m 2.87774,11.98171 c 0.16668,0.8082 0.32809,1.6175 0.48422,2.42784 l -13.28459,2.56076 c -0.14514,-0.75256 -0.29519,-1.50421 -0.45013,-2.25489 z m 2.09552,12.14523 c 0.11373,0.81753 0.2221,1.63585 0.32506,2.45487 l -13.42138,1.68818 c -0.0956,-0.75996 -0.19631,-1.51934 -0.30198,-2.27808 z m 1.29642,12.26061 c 0.0597,0.82365 0.11386,1.64776 0.16254,2.47225 l -13.5034,0.7964 c -0.045,-0.76414 -0.0952,-1.52803 -0.15046,-2.29159 z"
-         sodipodi:ry="178.28075"
-         sodipodi:rx="173.90331"
-         sodipodi:cy="549.35583"
-         sodipodi:cx="353.77585"
-         id="path3969-8"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27404177;marker:none;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#2e2e2e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.28082967;marker:none;enable-background:accumulate"
-         id="path5526-1"
-         sodipodi:cx="353.77585"
-         sodipodi:cy="549.35583"
-         sodipodi:rx="173.90331"
-         sodipodi:ry="178.28075"
-         d="m 545.58683,549.35583 c -11.93845,0 -23.8769,0 -35.81535,0 0.0337,40.72854 -15.9714,81.88377 -43.79907,111.42835 l 26.10997,24.49667 c 34.23052,-36.6006 53.47075,-85.92139 53.50445,-135.92502 z m -256.14574,184.61318 12.30876,-33.61353 c -21.83559,-8.01125 -41.99243,-20.8678 -58.12317,-37.4404 -12.1794,-12.42584 -22.20316,-27.0409 -29.7387,-42.8957 l -32.32595,15.38743 c 9.18222,19.26592 21.43526,37.08802 36.42657,52.51683 20.05354,20.5225 44.65348,36.24737 71.45249,46.04537 z m -86.17792,-306.13523 28.37742,21.77921 c 3.72158,-4.84667 7.7217,-9.46573 11.98609,-13.8164 24.00231,-24.65979 56.9188,-41.09186 91.01602,-45.57586 l -4.67083,-35.4566 c -42.23833,5.57198 -82.1439,25.48672 -111.98327,56.0239 -5.24892,5.4021 -10.16215,11.09761 -14.72543,17.04575 z"
-         transform="matrix(0.01215346,-0.63095934,0.60863222,0.01377002,-17.494816,715.66888)"
-         inkscape:path-effect="#path-effect5528-8" />
-    </g>
-    <g
-       id="g5606-5"
-       transform="matrix(0.65480881,0,0,0.65480881,294.95554,-1544.3203)"
-       inkscape:export-xdpi="75"
-       inkscape:export-ydpi="75">
-      <ellipse
-         transform="matrix(0.33921452,0,0,0.33088548,479.30166,474.23186)"
-         id="path3973-1"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d0d0d0;fill-opacity:1;fill-rule:nonzero;stroke:#4f4f4f;stroke-width:2.3640089;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         cx="353.77585"
-         cy="549.35583"
-         rx="173.90331"
-         ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-      <ellipse
-         clip-path="url(#clipPath5598-8)"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d9d;stroke-width:2.3640089;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path5596-2"
-         transform="matrix(0.33921452,0,0,0.33088548,479.30166,474.23186)"
-         cx="353.77585"
-         cy="549.35583"
-         rx="173.90331"
-         ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-    </g>
-    <g
-       id="g5581-0"
-       transform="matrix(0.65480881,0,0,0.65480881,316.32311,-1320.7427)"
-       inkscape:export-xdpi="75"
-       inkscape:export-ydpi="75">
-      <ellipse
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d0d0d0;fill-opacity:1;fill-rule:nonzero;stroke:#4f4f4f;stroke-width:2.3640089;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3971-8"
-         transform="matrix(0.33921452,0,0,0.33088548,470.54681,306.29777)"
-         cx="353.77585"
-         cy="549.35583"
-         rx="173.90331"
-         ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-      <g
-         transform="matrix(0.44296145,0,0,0.44296145,436.74425,249.99309)"
-         id="g886-4">
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-           d="m 255.48266,481.90361 c 24.34285,-4.60872 51.09939,-8.0106 71.63066,-14.52511 39.31591,10.19156 78.7274,14.12716 118.7875,22.08612 l -1.79076,12.73434 c -31.48805,-8.3315 -69.68441,-15.87379 -119.18546,-22.08612 -32.823,5.17718 -61.44948,12.45263 -90.13523,19.69843 z"
-           id="path821-2"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-           d="m 315.6875,486.75 c -27.82863,12.0828 -53.61434,22.86105 -80.90625,22.15625 L 233.0625,521 c 18.12902,1.14086 33.88984,7.1688 43.0625,26.96875 0,0 -6.31445,18.11427 -7.90625,22.09375 -0.92006,2.30014 22.59993,11.07516 40.46875,20.9375 13.04606,7.20051 21.90625,16.5625 21.90625,16.5625 L 296.875,547.25 c 68.28885,37.17415 140.61123,61.91402 158.65285,21.25 9.99125,-22.51929 -15.5529,-41.2788 -24.1841,-22.9375 0,0 11.66019,-5.38058 13.5625,3.25 C 454.93395,594.30718 377.77954,575.57571 347,549.34375 343.62965,546.47136 451.84375,522.70619 451.84375,526.5 L 455.5,513.40625 C 414.57038,523.11585 363.03225,489.78739 315.6875,486.75 Z m 6.6875,21.34375 c 25.28005,-0.15037 54.83213,3.1577 83.40625,13.5625 2.11527,0.77024 -62.46875,14.90625 -62.46875,14.90625 L 269,514.0625 c 12.06565,-3.00608 31.06907,-5.83607 53.375,-5.96875 z"
-           id="path823-8"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccssccscsscccssccs" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate"
-           d="m 318.40625,499.1875 c -1.88714,3.10061 -2.9375,6.55234 -2.9375,10.21875 0,13.12159 13.52276,23.78125 30.21875,23.78125 16.69599,0 30.21875,-10.65966 30.21875,-23.78125 0,-0.78808 -0.0609,-1.54411 -0.15625,-2.3125 -16.96282,-2.23813 -43.85462,-5.84753 -57.34375,-7.90625 z"
-           id="path827-0"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <circle
-       id="path4471"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#888888;stroke-width:8.8820858;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       cx="687.09045"
-       cy="-1114.3284"
-       r="51.270027"
-       d="m 738.36048,-1114.3284 a 51.270027,51.270027 0 0 1 -51.27003,51.2701 51.270027,51.270027 0 0 1 -51.27002,-51.2701 51.270027,51.270027 0 0 1 51.27002,-51.27 51.270027,51.270027 0 0 1 51.27003,51.27 z" />
-    <g
-       transform="matrix(0.65480881,0,0,0.65480881,-16.577436,-1409.0495)"
-       id="g5642-7-0"
-       inkscape:export-xdpi="45.208038"
-       inkscape:export-ydpi="45.208038">
-      <path
-         inkscape:path-effect="#path-effect5640-7-0"
-         transform="matrix(0.36631189,-0.13312953,0.139157,0.3830188,115.48088,337.73263)"
-         d="m 695.61322,549.35583 c -0.006,1.55888 -0.0211,3.11612 -0.0466,4.67165 L 359.75918,549.4592 c -0.004,-0.036 -0.009,-0.0705 -0.0141,-0.10337 111.95605,0 223.9121,0 335.86814,0 z m -568.47907,259.084 c -1.18001,-1.05354 -2.35399,-2.11604 -3.52189,-3.18746 L 350.98777,558.19785 c 0.003,0.006 0.007,0.013 0.0133,0.0204 z M 303.45782,207.23272 c 1.56681,-0.23966 3.13677,-0.46897 4.70982,-0.68792 l 46.03975,332.19797 c -0.001,-7.5e-4 -0.004,-7e-4 -0.009,1.2e-4 z"
-         sodipodi:ry="178.28075"
-         sodipodi:rx="173.90331"
-         sodipodi:cy="549.35583"
-         sodipodi:cx="353.77585"
-         id="path5638-8-1"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#2b2b2b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.98727798;marker:none;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         inkscape:export-ydpi="47.531654"
-         inkscape:export-xdpi="47.531654"
-         inkscape:path-effect="#path-effect4016-8-7"
-         transform="matrix(0.01312352,-0.62980725,0.61434419,0.01284836,-20.853297,717.2346)"
-         d="m 534.44427,549.35583 c -2.2e-4,0.82664 -0.006,1.65317 -0.0175,2.47953 l -13.52779,-0.18403 c 0.0102,-0.76515 0.0153,-1.53033 0.015,-2.2955 4.51008,0 9.02015,0 13.53023,0 z m -0.45316,12.84862 c -0.0578,0.8238 -0.1211,1.64717 -0.18986,2.47002 l -13.47962,-1.12638 c 0.0638,-0.76298 0.12241,-1.52634 0.17594,-2.29001 z m -1.33982,12.77736 c -0.11416,0.81748 -0.23369,1.63418 -0.35857,2.45004 l -13.37197,-2.0479 c 0.11605,-0.75731 0.22712,-1.51535 0.33318,-2.27403 z m -2.2074,12.65166 c -0.16928,0.80765 -0.34382,1.61419 -0.52359,2.41955 l -13.20485,-2.94858 c 0.16712,-0.74815 0.32938,-1.49736 0.48675,-2.24756 z m -3.0559,12.47149 c -0.22319,0.79433 -0.45151,1.5872 -0.68495,2.37856 l -12.97822,-3.82842 c 0.21696,-0.73549 0.42918,-1.47238 0.63664,-2.21059 z m -3.88533,12.23686 c -0.27586,0.7775 -0.55674,1.55321 -0.84262,2.32707 l -12.69213,-4.68742 c 0.26559,-0.71934 0.52655,-1.4404 0.78286,-2.16312 z m -4.69568,11.94776 c -0.32731,0.75717 -0.65953,1.51222 -0.99662,2.26508 l -12.34654,-5.52559 c 0.31298,-0.69967 0.62145,-1.40141 0.92539,-2.10515 z m -5.48695,11.6042 c -0.37754,0.73335 -0.75986,1.46424 -1.14695,2.19261 l -11.94146,-6.34293 c 0.35915,-0.67652 0.7139,-1.35544 1.06424,-2.03669 z m -6.25915,11.20618 c -0.42654,0.70604 -0.85775,1.40927 -1.2936,2.10963 l -11.4769,-7.13943 c 0.40409,-0.64986 0.80391,-1.30245 1.19943,-1.95772 z m -7.01228,10.7537 c -0.47431,0.67522 -0.95318,1.34729 -1.43656,2.01616 l -10.95286,-7.91509 c 0.44781,-0.61971 0.89146,-1.24248 1.33093,-1.86827 z m -7.74632,10.24676 c -0.52086,0.64089 -1.04616,1.27831 -1.57585,1.91219 l -10.36933,-8.66993 c 0.49029,-0.58604 0.97655,-1.1755 1.45875,-1.76831 z m -8.46129,9.68535 c -0.56619,0.60308 -1.13669,1.20234 -1.71147,1.79772 l -9.72631,-9.40392 c 0.53156,-0.54889 1.0592,-1.10153 1.5829,-1.65786 z m -9.16017,9.05406 c -0.60954,0.55954 -1.22296,1.11475 -1.84018,1.66559 l -9.00663,-10.09043 c 0.56989,-0.50876 1.13616,-1.02151 1.69875,-1.5382 z m -9.79046,8.3543 c -0.6479,0.51367 -1.29932,1.02284 -1.9542,1.52747 l -8.25499,-10.71422 c 0.60562,-0.46655 1.20797,-0.93725 1.80699,-1.41207 z m -10.35902,7.62659 c -0.68261,0.46603 -1.36837,0.92739 -2.05724,1.38404 l -7.47341,-11.27573 c 0.63769,-0.42258 1.27247,-0.84947 1.90426,-1.28066 z m -10.8706,6.87143 c -0.71363,0.41664 -1.43009,0.82843 -2.14929,1.23534 l -6.66186,-11.77499 c 0.6661,-0.37683 1.32963,-0.75816 1.99054,-1.14395 z m -11.32515,6.08887 c -0.74101,0.36547 -1.48448,0.72593 -2.23035,1.08135 l -5.82036,-12.21199 c 0.69083,-0.32933 1.37947,-0.66333 2.06582,-1.00196 z m -11.7227,5.27886 c -0.76473,0.31256 -1.53156,0.61993 -2.30043,0.92208 l -4.94891,-12.58671 c 0.71192,-0.28008 1.42198,-0.56499 2.13012,-0.85469 z m -12.06325,4.44145 c -0.78477,0.25787 -1.5713,0.51039 -2.35951,0.75751 l -4.04752,-12.89917 c 0.72934,-0.22905 1.45718,-0.46311 2.18344,-0.70213 z m -12.34679,3.5766 c -0.80116,0.20143 -1.60372,0.39733 -2.40761,0.58767 l -3.11616,-13.14938 c 0.7431,-0.17626 1.48504,-0.3577 2.22577,-0.54428 z m -12.57333,2.68434 c -0.81388,0.14321 -1.62881,0.28073 -2.44472,0.41253 l -2.15484,-13.33731 c 0.75319,-0.12172 1.50557,-0.24878 2.2571,-0.38115 z m -12.74285,1.76464 c -0.82294,0.0832 -1.64658,0.16062 -2.47084,0.23211 l -1.16358,-13.46298 c 0.75962,-0.0654 1.51879,-0.13633 2.27745,-0.21273 z m -12.85537,0.81752 c -0.82834,0.0215 -1.65702,0.037 -2.48598,0.0464 l -0.14236,-13.52639 c 0.76238,-0.007 1.52468,-0.0204 2.28681,-0.039 z m -12.8944,-0.17017 c -0.82692,-0.0427 -1.65336,-0.0914 -2.47928,-0.14605 l 0.88651,-13.48656 c 0.76074,0.0497 1.52183,0.0938 2.28319,0.13227 z m -12.82348,-1.14289 c -0.82027,-0.10385 -1.63973,-0.2135 -2.45829,-0.32893 l 1.88599,-13.37797 c 0.75531,0.10645 1.51133,0.20752 2.26797,0.30316 z m -12.69157,-2.08067 c -0.80996,-0.16322 -1.61875,-0.33207 -2.42631,-0.50653 l 2.85552,-13.20711 c 0.74623,0.16148 1.4935,0.31774 2.24176,0.46876 z m -12.50264,-2.99103 c -0.79599,-0.22083 -1.59046,-0.44712 -2.38334,-0.67885 l 3.79509,-12.97399 c 0.73348,0.21475 1.46835,0.42446 2.20457,0.62908 z m -12.2567,-3.87397 c -0.77836,-0.27668 -1.55485,-0.55865 -2.32939,-0.84588 l 4.70471,-12.6786 c 0.71706,0.26626 1.43588,0.52764 2.15639,0.78411 z m -11.95377,-4.72948 c -0.75707,-0.33076 -1.5119,-0.66665 -2.26444,-1.00763 l 5.58437,-12.32094 c 0.69698,0.316 1.39608,0.6273 2.09722,0.93385 z m -11.59383,-5.55757 c -0.7321,-0.38309 -1.46163,-0.77113 -2.18851,-1.16409 l 6.43409,-11.90102 c 0.67324,0.36398 1.34895,0.72343 2.02706,1.0783 z m -11.17687,-6.35824 c -0.70349,-0.43364 -1.40404,-0.87207 -2.10159,-1.31526 l 7.25384,-11.41884 c 0.64584,0.41021 1.2945,0.81604 1.94591,1.21748 z m -10.70292,-7.13147 c -0.6712,-0.48245 -1.33912,-0.96951 -2.00368,-1.46115 l 8.04364,-10.8744 c 0.61478,0.45467 1.23273,0.90514 1.85378,1.35137 z m -10.17195,-7.87729 c -0.63526,-0.52948 -1.26688,-1.06341 -1.89479,-1.60175 l 8.80349,-10.26769 c 0.58006,0.49736 1.16363,0.9907 1.75067,1.47997 z m -9.58398,-8.59569 c -0.59565,-0.57475 -1.18731,-1.15378 -1.77491,-1.73706 l 9.53339,-9.59871 c 0.54166,0.5383 1.0872,1.07273 1.63655,1.60328 z m -8.92675,-9.27951 c -0.5509,-0.61633 -1.09746,-1.23637 -1.63964,-1.86004 l 10.19891,-8.87327 c 0.50174,0.5762 1.00747,1.14891 1.51719,1.71804 z m -8.22014,-9.8825 c -0.50517,-0.65296 -1.00586,-1.30929 -1.50207,-1.96891 l 10.79876,-8.12416 c 0.45958,0.61082 0.92328,1.21848 1.39107,1.8229 z m -7.49869,-10.42537 c -0.45819,-0.6861 -0.91181,-1.37521 -1.36081,-2.06729 l 11.33912,-7.35421 c 0.41619,0.64194 0.83663,1.28105 1.26128,1.91726 z m -6.75814,-10.91379 c -0.41001,-0.71572 -0.81531,-1.43413 -1.21588,-2.15516 l 11.81998,-6.56343 c 0.37159,0.66956 0.74754,1.33662 1.12783,2.00113 z m -5.99853,-11.34773 c -0.36059,-0.74186 -0.71636,-1.48606 -1.06728,-2.23255 l 12.24137,-5.7518 c 0.32576,0.69367 0.656,1.38519 0.99069,2.07449 z m -5.21984,-11.72722 c -0.30995,-0.76449 -0.61495,-1.53099 -0.915,-2.29944 l 12.60328,-4.91934 c 0.2787,0.71429 0.562,1.42677 0.84987,2.13736 z m -4.42207,-12.05225 c -0.25808,-0.78362 -0.5111,-1.56891 -0.75904,-2.35582 l 12.90569,-4.06605 c 0.23042,0.73141 0.46555,1.46135 0.70537,2.18973 z m -3.60524,-12.32281 c -0.20498,-0.79925 -0.40479,-1.59984 -0.5994,-2.40171 l 13.14862,-3.19192 c 0.18091,0.74503 0.36666,1.48892 0.55721,2.2316 z m -2.76931,-12.53891 c -0.15066,-0.81139 -0.29603,-1.62377 -0.43609,-2.4371 l 13.33207,-2.29696 c 0.13018,0.75516 0.2653,1.50951 0.40535,2.26298 z m -1.91432,-12.70054 c -0.0951,-0.82003 -0.18482,-1.64072 -0.2691,-2.462 l 13.45603,-1.38116 c 0.0782,0.76178 0.1615,1.52309 0.24983,2.28386 z m -1.04025,-12.80773 c -0.0384,-0.82516 -0.0712,-1.65064 -0.0984,-2.47639 l 13.5205,-0.44452 c 0.025,0.7649 0.0553,1.52967 0.0906,2.29424 z m -0.14499,-12.85849 c 0.02,-0.82606 0.0455,-1.65191 0.0765,-2.47747 l 13.51807,0.50703 c -0.0286,0.7648 -0.052,1.52976 -0.0702,2.29481 z m 0.75702,-12.83048 c 0.0771,-0.82205 0.15968,-1.64354 0.24767,-2.4644 l 13.44967,1.44228 c -0.0817,0.76145 -0.15831,1.52339 -0.22986,2.28576 z m 1.63718,-12.74071 c 0.13305,-0.81452 0.27143,-1.62816 0.41513,-2.44083 l 13.32178,2.35671 c -0.13357,0.75459 -0.26219,1.51002 -0.38585,2.2662 z m 2.49826,-12.59646 c 0.18777,-0.80351 0.38074,-1.60579 0.57891,-2.40677 l 13.13441,3.2503 c -0.18422,0.74424 -0.36361,1.48965 -0.53817,2.23616 z m 3.34028,-12.39776 c 0.24125,-0.78899 0.4876,-1.57642 0.73901,-2.36222 l 12.88755,4.12306 c -0.23364,0.73039 -0.46259,1.46228 -0.6868,2.19561 z m 4.16321,-12.1446 c 0.29351,-0.77097 0.592,-1.54005 0.89544,-2.30715 l 12.58121,4.97497 c -0.28185,0.71304 -0.55911,1.42792 -0.83177,2.14457 z m 4.96708,-11.83696 c 0.34454,-0.74947 0.69395,-1.49669 1.04819,-2.24161 l 12.21537,5.80606 c -0.32882,0.69218 -0.65318,1.38655 -0.97305,2.08303 z m 5.75185,-11.47488 c 0.39436,-0.72445 0.79345,-1.44633 1.19727,-2.16555 l 11.79005,6.6163 c -0.37457,0.66783 -0.7448,1.33819 -1.11065,2.01099 z m 6.51757,-11.05833 c 0.44294,-0.69594 0.8905,-1.38896 1.34266,-2.079 l 11.30525,7.40571 c -0.4191,0.63999 -0.83397,1.28283 -1.24458,1.92846 z m 7.2642,-10.58731 c 0.49029,-0.66393 0.98509,-1.3246 1.48437,-1.98196 l 10.76097,8.17429 c -0.4624,0.60864 -0.92068,1.22047 -1.37483,1.83543 z m 7.99175,-10.06184 c 0.53642,-0.62841 1.07724,-1.25324 1.62241,-1.87441 l 10.1572,8.92203 c -0.50447,0.57379 -1.00495,1.15112 -1.50141,1.7319 z m 8.70154,-9.48132 c 0.58223,-0.58885 1.16856,-1.17347 1.75893,-1.75384 l 9.4861,9.64482 c -0.54431,0.53565 -1.08477,1.07517 -1.62131,1.61853 z m 9.38414,-8.81939 c 0.62301,-0.54413 1.24977,-1.08387 1.88021,-1.61919 l 8.75423,10.30968 c -0.58246,0.4946 -1.16142,0.99324 -1.73681,1.49588 z m 9.99033,-8.10976 c 0.66012,-0.49766 1.32364,-0.99075 1.9905,-1.47925 l 7.9924,10.91227 c -0.61695,0.45179 -1.23075,0.90778 -1.84133,1.36795 z m 10.5395,-7.3727 c 0.69358,-0.44942 1.3902,-0.89411 2.0898,-1.33404 l 7.20061,11.45261 c -0.64776,0.40721 -1.29274,0.8188 -1.93485,1.23474 z m 11.03167,-6.60822 c 0.72336,-0.39942 1.44942,-0.79395 2.17811,-1.18353 l 6.37888,11.93068 c -0.67493,0.36087 -1.34742,0.72629 -2.01739,1.09623 z m 11.46683,-5.81632 c 0.74949,-0.34766 1.50132,-0.69025 2.25543,-1.02774 l 5.52719,12.34648 c -0.69842,0.31277 -1.39476,0.63027 -2.08894,0.95245 z m 11.84498,-4.99699 c 0.77196,-0.29414 1.5459,-0.58304 2.32177,-0.86667 l 4.64555,12.70003 c -0.71826,0.26291 -1.43479,0.53071 -2.1495,0.80337 z m 12.16614,-4.15023 c 0.79075,-0.23886 1.58315,-0.47231 2.37711,-0.70031 l 3.73395,12.9913 c -0.73443,0.21129 -1.46748,0.42763 -2.19908,0.64901 z m 12.43027,-3.27606 c 0.8059,-0.18182 1.61308,-0.35805 2.42147,-0.52867 l 2.7924,13.22032 c -0.74694,0.1579 -1.49285,0.32103 -2.23766,0.48936 z m 12.63741,-2.37447 c 0.81737,-0.123 1.63568,-0.24025 2.45484,-0.35172 l 1.8209,13.38706 c -0.75579,0.10276 -1.5109,0.21091 -2.26526,0.32443 z m 12.78754,-1.44543 c 0.82519,-0.0624 1.65095,-0.11895 2.47722,-0.16951 l 0.81944,13.49155 c -0.76097,0.0458 -1.52161,0.0973 -2.28187,0.15421 z m 12.88065,-0.48874 c 0.8293,0.001 1.65836,0.009 2.48712,0.0225 l -0.21074,13.52412 c -0.76231,-0.0112 -1.52474,-0.0168 -2.28721,-0.0166 z m 12.87931,0.5092 c 0.82506,0.0637 1.64954,0.13335 2.47337,0.20887 l -1.22998,13.4566 c -0.7593,-0.0692 -1.51907,-0.13287 -2.27924,-0.19101 z m 12.78499,1.46507 c 0.81717,0.12425 1.63341,0.25425 2.44864,0.38996 l -2.21927,13.32682 c -0.75263,-0.12538 -1.50608,-0.24542 -2.26028,-0.3601 z m 12.63367,2.39352 c 0.80562,0.18303 1.60995,0.37162 2.41292,0.56577 l -3.17859,13.13477 c -0.7423,-0.17981 -1.48577,-0.35445 -2.23034,-0.5239 z m 12.42535,3.29456 c 0.79041,0.24003 1.57917,0.48547 2.36622,0.73628 l -4.10798,12.88046 c -0.7283,-0.23247 -1.45812,-0.45996 -2.1894,-0.68242 z m 12.16003,4.16816 c 0.77152,0.29528 1.54105,0.59579 2.30852,0.90152 l -5.0074,12.56388 c -0.71064,-0.28339 -1.42316,-0.56195 -2.13749,-0.83566 z m 11.83768,5.01434 c 0.74899,0.34877 1.49562,0.7026 2.23984,1.06147 l -5.87687,12.18504 c -0.68932,-0.33253 -1.38087,-0.66041 -2.07458,-0.9836 z m 11.45835,5.8331 c 0.72278,0.40049 1.44285,0.80587 2.16016,1.21612 l -6.71639,11.74394 c -0.66433,-0.37991 -1.33125,-0.75534 -2.00068,-1.12626 z m 11.02199,6.62443 c 0.69291,0.45045 1.38277,0.90563 2.06951,1.3655 l -7.52596,11.24056 c -0.63568,-0.42553 -1.2743,-0.84675 -1.91579,-1.26363 z m 10.52864,7.38834 c 0.65938,0.49865 1.31536,1.00185 1.96786,1.50959 l -8.30556,10.67493 c -0.60338,-0.46939 -1.21004,-0.93464 -1.81993,-1.39572 z m 9.97828,8.12482 c 0.62219,0.54509 1.24062,1.09456 1.85523,1.64839 l -9.05523,10.04704 c -0.5674,-0.51149 -1.13844,-1.01901 -1.71306,-1.52252 z m 9.37091,8.83388 c 0.19958,0.20247 0.39867,0.40544 0.59728,0.6089 0.37922,0.38938 0.7566,0.78044 1.13212,1.17316 l -9.77062,9.35608 c -0.3473,-0.36213 -0.6963,-0.72266 -1.04699,-1.08156 -0.18298,-0.18773 -0.36642,-0.37501 -0.55033,-0.56183 z m 8.68667,9.49414 c 0.53548,0.62919 1.06657,1.26197 1.59324,1.89826 l -10.4097,8.62071 c -0.48753,-0.58838 -0.9791,-1.17337 -1.47469,-1.7549 z m 7.97679,10.07334 c 0.48932,0.66463 0.97413,1.33251 1.45441,2.00356 l -10.9893,7.8645 c -0.44496,-0.6218 -0.89407,-1.24055 -1.34733,-1.85618 z m 7.24883,10.59768 c 0.44194,0.69657 0.87925,1.39605 1.31191,2.09837 l -11.50942,7.08746 c -0.40115,-0.65173 -0.80659,-1.30074 -1.21629,-1.94697 z m 6.50181,11.06756 c 0.39333,0.72501 0.78191,1.45259 1.16573,2.18268 l -11.97005,6.28958 c -0.35614,-0.67815 -0.71667,-1.35393 -1.08158,-2.02726 z m 5.7357,11.48298 c 0.34349,0.74995 0.68212,1.50214 1.01587,2.25649 l -12.3712,5.47087 c -0.30988,-0.70108 -0.62428,-1.40012 -0.94318,-2.09706 z m 4.95052,11.84394 c 0.29243,0.77139 0.57988,1.54467 0.86234,2.3198 l -12.71286,4.63132 c -0.26241,-0.72051 -0.52946,-1.43932 -0.80111,-2.15636 z m 4.14626,12.15042 c 0.24015,0.78934 0.4752,1.58023 0.70513,2.37262 l -12.99503,3.77094 c -0.21371,-0.73644 -0.43218,-1.47152 -0.65537,-2.20516 z m 3.32293,12.40246 c 0.18663,0.80377 0.36805,1.60877 0.54424,2.41493 l -13.21772,2.88972 c -0.16379,-0.74887 -0.33244,-1.49671 -0.50595,-2.24346 z m 2.48051,12.60002 c 0.13191,0.81472 0.25847,1.63033 0.37968,2.44675 l -13.38092,1.98767 c -0.11264,-0.7578 -0.23026,-1.51491 -0.35285,-2.27126 z m 1.61904,12.74313 c 0.0759,0.82217 0.14642,1.64488 0.21143,2.46808 l -13.48464,1.06478 c -0.0603,-0.76324 -0.12562,-1.52612 -0.19607,-2.28857 z m 0.73847,12.83178 c 0.0187,0.82611 0.0319,1.65243 0.0395,2.4789 l -13.52888,0.12105 c -0.007,-0.76517 -0.0185,-1.53031 -0.0356,-2.29538 z"
-         sodipodi:ry="178.28075"
-         sodipodi:rx="173.90331"
-         sodipodi:cy="549.35583"
-         sodipodi:cx="353.77585"
-         id="path3969-8-6"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#f1f1f1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.27404177;marker:none;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#4f4f4f;stroke-width:1.27776921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path5526-1-3"
-         sodipodi:cx="353.77585"
-         sodipodi:cy="549.35583"
-         sodipodi:rx="173.90331"
-         sodipodi:ry="178.28075"
-         d="m 545.58683,549.35583 c -11.93845,0 -23.8769,0 -35.81535,0 0.0337,40.72854 -15.9714,81.88377 -43.79907,111.42835 l 26.10997,24.49667 c 34.23052,-36.6006 53.47075,-85.92139 53.50445,-135.92502 z m -256.14574,184.61318 12.30876,-33.61353 c -21.83559,-8.01125 -41.99243,-20.8678 -58.12317,-37.4404 -12.1794,-12.42584 -22.20316,-27.0409 -29.7387,-42.8957 l -32.32595,15.38743 c 9.18222,19.26592 21.43526,37.08802 36.42657,52.51683 20.05354,20.5225 44.65348,36.24737 71.45249,46.04537 z m -86.17792,-306.13523 28.37742,21.77921 c 3.72158,-4.84667 7.7217,-9.46573 11.98609,-13.8164 24.00231,-24.65979 56.9188,-41.09186 91.01602,-45.57586 l -4.67083,-35.4566 c -42.23833,5.57198 -82.1439,25.48672 -111.98327,56.0239 -5.24892,5.4021 -10.16215,11.09761 -14.72543,17.04575 z"
-         transform="matrix(0.01215346,-0.63095934,0.60863222,0.01377002,-17.494816,715.66888)"
-         inkscape:path-effect="#path-effect5528-8-6" />
-    </g>
-    <g
-       id="g5606-5-4"
-       transform="matrix(0.56785208,0,0,0.56785208,548.82559,-1475.3216)"
-       inkscape:export-xdpi="74.729294"
-       inkscape:export-ydpi="74.729294">
-      <ellipse
-         transform="matrix(0.33921452,0,0,0.33088548,479.30166,474.23186)"
-         id="path3973-1-9"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#2e2e2e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.14534473;marker:none;enable-background:accumulate"
-         cx="353.77585"
-         cy="549.35583"
-         rx="173.90331"
-         ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-      <ellipse
-         clip-path="url(#clipPath5598-8-0)"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d9d;stroke-width:4.13543987;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path5596-2-2"
-         transform="matrix(0.33921452,0,0,0.33088548,479.30166,474.23186)"
-         cx="353.77585"
-         cy="549.35583"
-         rx="173.90331"
-         ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-    </g>
-    <g
-       id="g5581-0-5"
-       transform="matrix(0.65480881,0,0,0.65480881,-27.770566,-1333.0964)"
-       inkscape:export-xdpi="75"
-       inkscape:export-ydpi="75">
-      <ellipse
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d0d0d0;fill-opacity:1;fill-rule:nonzero;stroke:#4f4f4f;stroke-width:2.3640089;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3971-8-1"
-         transform="matrix(0.33921452,0,0,0.33088548,470.54681,306.29777)"
-         cx="353.77585"
-         cy="549.35583"
-         rx="173.90331"
-         ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-      <g
-         transform="matrix(0.44296145,0,0,0.44296145,436.74425,249.99309)"
-         id="g886-4-8">
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-           d="m 255.48266,481.90361 c 24.34285,-4.60872 51.09939,-8.0106 71.63066,-14.52511 39.31591,10.19156 78.7274,14.12716 118.7875,22.08612 l -1.79076,12.73434 c -31.48805,-8.3315 -69.68441,-15.87379 -119.18546,-22.08612 -32.823,5.17718 -61.44948,12.45263 -90.13523,19.69843 z"
-           id="path821-2-4"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-           d="m 315.6875,486.75 c -27.82863,12.0828 -53.61434,22.86105 -80.90625,22.15625 L 233.0625,521 c 18.12902,1.14086 33.88984,7.1688 43.0625,26.96875 0,0 -6.31445,18.11427 -7.90625,22.09375 -0.92006,2.30014 22.59993,11.07516 40.46875,20.9375 13.04606,7.20051 21.90625,16.5625 21.90625,16.5625 L 296.875,547.25 c 68.28885,37.17415 140.61123,61.91402 158.65285,21.25 9.99125,-22.51929 -15.5529,-41.2788 -24.1841,-22.9375 0,0 11.66019,-5.38058 13.5625,3.25 C 454.93395,594.30718 377.77954,575.57571 347,549.34375 343.62965,546.47136 451.84375,522.70619 451.84375,526.5 L 455.5,513.40625 C 414.57038,523.11585 363.03225,489.78739 315.6875,486.75 Z m 6.6875,21.34375 c 25.28005,-0.15037 54.83213,3.1577 83.40625,13.5625 2.11527,0.77024 -62.46875,14.90625 -62.46875,14.90625 L 269,514.0625 c 12.06565,-3.00608 31.06907,-5.83607 53.375,-5.96875 z"
-           id="path823-8-4"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccssccscsscccssccs" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate"
-           d="m 318.40625,499.1875 c -1.88714,3.10061 -2.9375,6.55234 -2.9375,10.21875 0,13.12159 13.52276,23.78125 30.21875,23.78125 16.69599,0 30.21875,-10.65966 30.21875,-23.78125 0,-0.78808 -0.0609,-1.54411 -0.15625,-2.3125 -16.96282,-2.23813 -43.85462,-5.84753 -57.34375,-7.90625 z"
-           id="path827-0-9"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       id="g5581-0-5-8"
-       transform="matrix(0.37431908,0,0,0.37648975,141.2193,-1293.6214)"
-       inkscape:export-xdpi="74.730003"
-       inkscape:export-ydpi="74.730003">
-      <ellipse
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#2e2e2e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.36967111;marker:none;enable-background:accumulate"
-         id="path3971-8-1-8"
-         transform="matrix(0.33921452,0,0,0.33088548,470.54681,306.29777)"
-         cx="353.77585"
-         cy="549.35583"
-         rx="173.90331"
-         ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-      <g
-         transform="matrix(0.44296145,0,0,0.44296145,436.74425,249.99309)"
-         id="g886-4-8-0">
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-           d="m 255.48266,481.90361 c 24.34285,-4.60872 51.09939,-8.0106 71.63066,-14.52511 39.31591,10.19156 78.7274,14.12716 118.7875,22.08612 l -1.79076,12.73434 c -31.48805,-8.3315 -69.68441,-15.87379 -119.18546,-22.08612 -32.823,5.17718 -61.44948,12.45263 -90.13523,19.69843 z"
-           id="path821-2-4-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-           d="m 315.6875,486.75 c -27.82863,12.0828 -53.61434,22.86105 -80.90625,22.15625 L 233.0625,521 c 18.12902,1.14086 33.88984,7.1688 43.0625,26.96875 0,0 -6.31445,18.11427 -7.90625,22.09375 -0.92006,2.30014 22.59993,11.07516 40.46875,20.9375 13.04606,7.20051 21.90625,16.5625 21.90625,16.5625 L 296.875,547.25 c 68.28885,37.17415 140.61123,61.91402 158.65285,21.25 9.99125,-22.51929 -15.5529,-41.2788 -24.1841,-22.9375 0,0 11.66019,-5.38058 13.5625,3.25 C 454.93395,594.30718 377.77954,575.57571 347,549.34375 343.62965,546.47136 451.84375,522.70619 451.84375,526.5 L 455.5,513.40625 C 414.57038,523.11585 363.03225,489.78739 315.6875,486.75 Z m 6.6875,21.34375 c 25.28005,-0.15037 54.83213,3.1577 83.40625,13.5625 2.11527,0.77024 -62.46875,14.90625 -62.46875,14.90625 L 269,514.0625 c 12.06565,-3.00608 31.06907,-5.83607 53.375,-5.96875 z"
-           id="path823-8-4-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccssccscsscccssccs" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate"
-           d="m 318.40625,499.1875 c -1.88714,3.10061 -2.9375,6.55234 -2.9375,10.21875 0,13.12159 13.52276,23.78125 30.21875,23.78125 16.69599,0 30.21875,-10.65966 30.21875,-23.78125 0,-0.78808 -0.0609,-1.54411 -0.15625,-2.3125 -16.96282,-2.23813 -43.85462,-5.84753 -57.34375,-7.90625 z"
-           id="path827-0-9-4"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       transform="matrix(0.65480881,0,0,0.65480881,150.47085,-1864.273)"
-       id="g957">
-      <g
-         id="g4180"
-         inkscape:export-xdpi="84.952728"
-         inkscape:export-ydpi="84.952728"
-         transform="translate(-217.99812,0)">
-        <g
-           transform="translate(25.154333,-9.7822405)"
-           id="g4151">
-          <g
-             inkscape:export-ydpi="45.208038"
-             inkscape:export-xdpi="45.208038"
-             id="g5642-7-0-1"
-             transform="translate(-56.700676,1049.5095)"
-             style="fill:#ffffff;fill-opacity:1" />
-          <circle
-             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:6.12233877;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-             id="path4149"
-             transform="matrix(0.81668138,0,0,0.81668138,48.546295,284.24611)"
-             cx="264.81921"
-             cy="1550.5577"
-             r="104.11098"
-             d="m 368.93019,1550.5577 a 104.11098,104.11098 0 0 1 -104.11098,104.111 104.11098,104.11098 0 0 1 -104.11097,-104.111 104.11098,104.11098 0 0 1 104.11097,-104.1109 104.11098,104.11098 0 0 1 104.11098,104.1109 z" />
-        </g>
-        <path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 215.73806,1480.4485 73.75494,59.6283"
-           inkscape:path-effect="#path-effect4168"
-           id="path4166"
-           d="m 215.73806,1480.4485 c 0,0 -3.87879,4.7977 -3.87879,4.7977 14.75099,11.9257 62.88274,42.9049 77.63373,54.8306 -14.75099,-11.9257 -55.12516,-52.5004 -69.87615,-64.426 0,0 -3.87879,4.7977 -3.87879,4.7977 z"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-        <path
-           sodipodi:nodetypes="cc"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-           d="m 376.79927,1502.808 c -0.12849,0.055 -2.65454,-4.7645 -2.78303,-4.7094 -17.06805,7.3288 -66.13165,34.3002 -83.19971,41.6289 17.06806,-7.3287 70.4128,-24.3297 87.48086,-31.6584 0.12849,-0.055 -1.62661,-5.2059 -1.49812,-5.2611 z"
-           id="path4170"
-           inkscape:path-effect="#path-effect4172"
-           inkscape:original-d="m 376.79927,1502.808 -85.98274,36.9195"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
-           inkscape:original-d="m 270.24272,1634.3386 20.57381,-92.4687"
-           inkscape:path-effect="#path-effect4176"
-           id="path4174"
-           d="m 270.24272,1634.3386 c 0.0553,-0.2486 6.31885,0.3621 6.37417,0.1135 4.05944,-18.2451 10.1402,-74.3371 14.19964,-92.5822 -4.05944,18.2451 -22.33532,71.6237 -26.39476,89.8688 -0.0553,0.2487 5.87627,2.3513 5.82095,2.5999 z"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-      </g>
-      <circle
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path4178"
-         transform="translate(-213.80573,2.0961811)"
-         inkscape:export-xdpi="84.952728"
-         inkscape:export-ydpi="84.952728"
-         cx="285.78116"
-         cy="1538.6793"
-         r="95.376846"
-         d="m 381.158,1538.6793 a 95.376846,95.376846 0 0 1 -95.37684,95.3769 95.376846,95.376846 0 0 1 -95.37685,-95.3769 95.376846,95.376846 0 0 1 95.37685,-95.3768 95.376846,95.376846 0 0 1 95.37684,95.3768 z" />
-    </g>
-    <g
-       inkscape:export-ydpi="74.729294"
-       inkscape:export-xdpi="74.729294"
-       transform="matrix(0.56785208,0,0,0.56785208,548.82559,-1379.4204)"
-       id="g4061">
-      <ellipse
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.14534473;marker:none;enable-background:accumulate"
-         id="path4063"
-         transform="matrix(0.33921452,0,0,0.33088548,479.30166,474.23186)"
-         cx="353.77585"
-         cy="549.35583"
-         rx="173.90331"
-         ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-      <ellipse
-         transform="matrix(0.33921452,0,0,0.33088548,479.30166,474.23186)"
-         id="path4065"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d9d;stroke-width:4.13543987;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         clip-path="url(#clipPath5598-8-0)"
-         cx="353.77585"
-         cy="549.35583"
-         rx="173.90331"
-         ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-    </g>
-    <g
-       id="g5581-0-5-8-8"
-       transform="matrix(0.56785213,0,0,0.57114509,551.99184,-1204.316)"
-       inkscape:export-xdpi="74.730003"
-       inkscape:export-ydpi="74.730003">
-      <ellipse
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.36967111;marker:none;enable-background:accumulate"
-         id="path3971-8-1-8-6"
-         transform="matrix(0.33921452,0,0,0.33088548,470.54681,306.29777)"
-         cx="353.77585"
-         cy="549.35583"
-         rx="173.90331"
-         ry="178.28075"
-         d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-      <g
-         transform="matrix(0.44296145,0,0,0.44296145,436.74425,249.99309)"
-         id="g886-4-8-0-6">
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-           d="m 255.48266,481.90361 c 24.34285,-4.60872 51.09939,-8.0106 71.63066,-14.52511 39.31591,10.19156 78.7274,14.12716 118.7875,22.08612 l -1.79076,12.73434 c -31.48805,-8.3315 -69.68441,-15.87379 -119.18546,-22.08612 -32.823,5.17718 -61.44948,12.45263 -90.13523,19.69843 z"
-           id="path821-2-4-3-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-           d="m 315.6875,486.75 c -27.82863,12.0828 -53.61434,22.86105 -80.90625,22.15625 L 233.0625,521 c 18.12902,1.14086 33.88984,7.1688 43.0625,26.96875 0,0 -6.31445,18.11427 -7.90625,22.09375 -0.92006,2.30014 22.59993,11.07516 40.46875,20.9375 13.04606,7.20051 21.90625,16.5625 21.90625,16.5625 L 296.875,547.25 c 68.28885,37.17415 140.61123,61.91402 158.65285,21.25 9.99125,-22.51929 -15.5529,-41.2788 -24.1841,-22.9375 0,0 11.66019,-5.38058 13.5625,3.25 C 454.93395,594.30718 377.77954,575.57571 347,549.34375 343.62965,546.47136 451.84375,522.70619 451.84375,526.5 L 455.5,513.40625 C 414.57038,523.11585 363.03225,489.78739 315.6875,486.75 Z m 6.6875,21.34375 c 25.28005,-0.15037 54.83213,3.1577 83.40625,13.5625 2.11527,0.77024 -62.46875,14.90625 -62.46875,14.90625 L 269,514.0625 c 12.06565,-3.00608 31.06907,-5.83607 53.375,-5.96875 z"
-           id="path823-8-4-5-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccssccscsscccssccs" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate"
-           d="m 318.40625,499.1875 c -1.88714,3.10061 -2.9375,6.55234 -2.9375,10.21875 0,13.12159 13.52276,23.78125 30.21875,23.78125 16.69599,0 30.21875,-10.65966 30.21875,-23.78125 0,-0.78808 -0.0609,-1.54411 -0.15625,-2.3125 -16.96282,-2.23813 -43.85462,-5.84753 -57.34375,-7.90625 z"
-           id="path827-0-9-4-5"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <ellipse
-       inkscape:export-ydpi="84"
-       inkscape:export-xdpi="84"
-       clip-path="url(#clipPath5598-8-0-5)"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d9d;stroke-width:4.13543987;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path5596-2-2-8"
-       transform="matrix(0.19262366,0,0,0.18789401,1152.6169,-1179.3441)"
-       cx="353.77585"
-       cy="549.35583"
-       rx="173.90331"
-       ry="178.28075" />
-    <g
-       inkscape:export-ydpi="84"
-       inkscape:export-xdpi="84"
-       transform="matrix(0.6944464,0,0,0.6944464,883.13611,-2242.7919)"
-       id="g4154">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path821-2-4-7"
-         d="m 442.86429,1754.1491 c 10.78295,-2.0415 22.63506,-3.5484 31.72963,-6.4341 17.41543,4.5145 34.8732,6.2578 52.61828,9.7833 l -0.79324,5.6408 c -13.94799,-3.6905 -30.86751,-7.0314 -52.79456,-9.7833 -14.53933,2.2933 -27.21975,5.5161 -39.92644,8.7257 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="ccccssccscsscccssccs"
-         inkscape:connector-curvature="0"
-         id="path823-8-4-0"
-         d="m 469.53272,1756.2959 c -12.32701,5.3522 -23.74909,10.1265 -35.83835,9.8143 l -0.76134,5.3571 c 8.03045,0.5053 15.01189,3.1755 19.07502,11.9461 0,0 -2.79705,8.0239 -3.50216,9.7867 -0.40755,1.0188 10.0109,4.9058 17.9261,9.2745 5.7789,3.1895 9.70362,7.3365 9.70362,7.3365 l -14.9361,-26.7161 c 30.24932,16.4667 62.28535,27.4255 70.27709,9.4129 4.42574,-9.9751 -6.88933,-18.2849 -10.71262,-10.1604 0,0 5.16501,-2.3834 6.00766,1.4396 4.44189,20.1524 -29.73454,11.8551 -43.36869,0.2354 -1.49294,-1.2724 46.44174,-11.7994 46.44174,-10.1189 l 1.61958,-5.8001 c -18.13025,4.301 -40.95965,-10.4622 -61.93155,-11.8076 z m 2.9623,9.4544 c 11.19809,-0.067 24.28852,1.3987 36.94576,6.0077 0.93698,0.3412 -27.67125,6.6029 -27.67125,6.6029 l -32.91758,-9.9667 c 5.34462,-1.3315 13.7624,-2.5851 23.64307,-2.6439 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path827-0-9-49"
-         d="m 470.73702,1761.8052 c -0.83593,1.3734 -1.3012,2.9024 -1.3012,4.5265 0,5.8124 5.99006,10.5342 13.38574,10.5342 7.39568,0 13.38574,-4.7218 13.38574,-10.5342 0,-0.3491 -0.027,-0.684 -0.0692,-1.0244 -7.51389,-0.9914 -19.42592,-2.5902 -25.40108,-3.5021 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate" />
-    </g>
-    <g
-       transform="matrix(0.65480881,0,0,0.65480881,7.7237537,-1847.9591)"
-       inkscape:export-ydpi="84"
-       inkscape:export-xdpi="84"
-       id="g4187">
-      <circle
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:5.44443083;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path4178-1"
-         transform="matrix(0.91836963,0,0,0.91836963,266.97128,109.53892)"
-         inkscape:export-xdpi="84.952728"
-         inkscape:export-ydpi="84.952728"
-         cx="285.78116"
-         cy="1538.6793"
-         r="95.376846"
-         d="m 381.158,1538.6793 a 95.376846,95.376846 0 0 1 -95.37684,95.3769 95.376846,95.376846 0 0 1 -95.37685,-95.3769 95.376846,95.376846 0 0 1 95.37685,-95.3768 95.376846,95.376846 0 0 1 95.37684,95.3768 z" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         d="m 529.42402,1434.6375 0,175.9556"
-         id="path4181"
-         inkscape:connector-curvature="0" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         d="m 439.11051,1522.6153 180.62702,0"
-         id="path4183"
-         inkscape:connector-curvature="0" />
-      <circle
-         inkscape:export-ydpi="84.952728"
-         inkscape:export-xdpi="84.952728"
-         transform="matrix(0.77143496,0,0,0.77143496,308.96244,335.62425)"
-         id="path4185"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:3.88885665;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         cx="285.78116"
-         cy="1538.6793"
-         r="95.376846"
-         d="m 381.158,1538.6793 a 95.376846,95.376846 0 0 1 -95.37684,95.3769 95.376846,95.376846 0 0 1 -95.37685,-95.3769 95.376846,95.376846 0 0 1 95.37685,-95.3768 95.376846,95.376846 0 0 1 95.37684,95.3768 z" />
-    </g>
-    <g
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/pointer4.png"
-       transform="matrix(0.61508641,0,0,0.61518418,161.53996,-1784.1552)"
-       id="g933"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <circle
-         inkscape:export-ydpi="84.952728"
-         inkscape:export-xdpi="84.952728"
-         transform="matrix(0.91836963,0,0,0.91836963,266.97128,109.53892)"
-         id="path935"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:5.79557276;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         cx="285.78116"
-         cy="1538.6793"
-         r="95.376846"
-         d="m 381.158,1538.6793 a 95.376846,95.376846 0 0 1 -95.37684,95.3769 95.376846,95.376846 0 0 1 -95.37685,-95.3769 95.376846,95.376846 0 0 1 95.37685,-95.3768 95.376846,95.376846 0 0 1 95.37684,95.3768 z" />
-      <circle
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:4.13967085;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path941"
-         transform="matrix(0.77143496,0,0,0.77143496,308.96244,335.62425)"
-         inkscape:export-xdpi="84.952728"
-         inkscape:export-ydpi="84.952728"
-         cx="285.78116"
-         cy="1538.6793"
-         r="95.376846"
-         d="m 381.158,1538.6793 a 95.376846,95.376846 0 0 1 -95.37684,95.3769 95.376846,95.376846 0 0 1 -95.37685,-95.3769 95.376846,95.376846 0 0 1 95.37685,-95.3768 95.376846,95.376846 0 0 1 95.37684,95.3768 z" />
-    </g>
-    <g
-       inkscape:export-filename="ui/pointer.png"
-       transform="matrix(0.65782619,0,0,0.66739584,28.299111,-894.11737)"
-       id="g943"
-       inkscape:export-xdpi="100"
-       inkscape:export-ydpi="100">
-      <path
-         inkscape:connector-curvature="0"
-         id="path947"
-         d="m 529.42402,1434.6375 0,175.9556"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path949"
-         d="m 439.11051,1522.6153 180.62702,0"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    </g>
-    <ellipse
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/pointer5.png"
-       inkscape:export-ydpi="90.23893"
-       inkscape:export-xdpi="90.23893"
-       id="path950"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:1.9644264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       cx="611.57544"
-       cy="-847.46637"
-       rx="53.876156"
-       ry="53.88472"
-       d="m 665.4516,-847.46637 a 53.876156,53.88472 0 0 1 -53.87616,53.88472 53.876156,53.88472 0 0 1 -53.87616,-53.88472 53.876156,53.88472 0 0 1 53.87616,-53.88472 53.876156,53.88472 0 0 1 53.87616,53.88472 z" />
-    <ellipse
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:1.9644264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path955"
-       inkscape:export-xdpi="84.952728"
-       inkscape:export-ydpi="84.952728"
-       cx="222.97534"
-       cy="-360.62357"
-       rx="53.876156"
-       ry="53.88472"
-       d="m 276.8515,-360.62357 a 53.876156,53.88472 0 0 1 -53.87616,53.88472 53.876156,53.88472 0 0 1 -53.87615,-53.88472 53.876156,53.88472 0 0 1 53.87615,-53.88472 53.876156,53.88472 0 0 1 53.87616,53.88472 z" />
-    <g
-       id="g975"
-       transform="matrix(0.45776801,0,0,0.45776801,-70.35083,-1231.7359)"
-       inkscape:export-xdpi="84"
-       inkscape:export-ydpi="84">
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-         d="m 442.86429,1754.1491 c 10.78295,-2.0415 22.63506,-3.5484 31.72963,-6.4341 17.41543,4.5145 34.8732,6.2578 52.61828,9.7833 l -0.79324,5.6408 c -13.94799,-3.6905 -30.86751,-7.0314 -52.79456,-9.7833 -14.53933,2.2933 -27.21975,5.5161 -39.92644,8.7257 z"
-         id="path977"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-         d="m 469.53272,1756.2959 c -12.32701,5.3522 -23.74909,10.1265 -35.83835,9.8143 l -0.76134,5.3571 c 8.03045,0.5053 15.01189,3.1755 19.07502,11.9461 0,0 -2.79705,8.0239 -3.50216,9.7867 -0.40755,1.0188 10.0109,4.9058 17.9261,9.2745 5.7789,3.1895 9.70362,7.3365 9.70362,7.3365 l -14.9361,-26.7161 c 30.24932,16.4667 62.28535,27.4255 70.27709,9.4129 4.42574,-9.9751 -6.88933,-18.2849 -10.71262,-10.1604 0,0 5.16501,-2.3834 6.00766,1.4396 4.44189,20.1524 -29.73454,11.8551 -43.36869,0.2354 -1.49294,-1.2724 46.44174,-11.7994 46.44174,-10.1189 l 1.61958,-5.8001 c -18.13025,4.301 -40.95965,-10.4622 -61.93155,-11.8076 z m 2.9623,9.4544 c 11.19809,-0.067 24.28852,1.3987 36.94576,6.0077 0.93698,0.3412 -27.67125,6.6029 -27.67125,6.6029 l -32.91758,-9.9667 c 5.34462,-1.3315 13.7624,-2.5851 23.64307,-2.6439 z"
-         id="path979"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccssccscsscccssccs" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate"
-         d="m 470.73702,1761.8052 c -0.83593,1.3734 -1.3012,2.9024 -1.3012,4.5265 0,5.8124 5.99006,10.5342 13.38574,10.5342 7.39568,0 13.38574,-4.7218 13.38574,-10.5342 0,-0.3491 -0.027,-0.684 -0.0692,-1.0244 -7.51389,-0.9914 -19.42592,-2.5902 -25.40108,-3.5021 z"
-         id="path981"
-         inkscape:connector-curvature="0" />
-    </g>
-    <ellipse
-       transform="matrix(0.12697445,0,0,0.12385674,249.41516,-484.96881)"
-       id="path983"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d9d;stroke-width:4.13543987;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       clip-path="url(#clipPath5598-8-0-5)"
-       inkscape:export-xdpi="84"
-       inkscape:export-ydpi="84"
-       cx="353.77585"
-       cy="549.35583"
-       rx="173.90331"
-       ry="178.28075"
-       d="M 527.67915,549.35583 A 173.90331,178.28075 0 0 1 353.77585,727.63658 173.90331,178.28075 0 0 1 179.87254,549.35583 173.90331,178.28075 0 0 1 353.77585,371.07509 173.90331,178.28075 0 0 1 527.67915,549.35583 Z" />
-    <path
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-       d="m 978.07912,67.880616 c -69.5455,0 -125.9346,56.389104 -125.9346,125.934604 0,69.5456 56.3891,125.9124 125.9346,125.9124 69.54548,0 125.91228,-56.3668 125.91228,-125.9124 0,-69.5455 -56.3668,-125.934604 -125.91228,-125.934604 z m 0,58.425104 c 37.27848,0 67.48718,30.2251 67.48718,67.5095 0,37.2844 -30.2087,67.5095 -67.48718,67.5095 -37.2784,0 -67.5095,-30.2251 -67.5095,-67.5095 0,-37.2844 30.2311,-67.5095 67.5095,-67.5095 z"
-       id="path991"
-       inkscape:connector-curvature="0" />
-    <ellipse
-       inkscape:export-ydpi="84.952728"
-       inkscape:export-xdpi="84.952728"
-       id="path993"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:1.9644264;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       cx="978.06903"
-       cy="193.80428"
-       rx="53.876156"
-       ry="53.88472" />
-    <g
-       inkscape:export-ydpi="84"
-       inkscape:export-xdpi="84"
-       transform="matrix(0.45776801,0,0,0.45776801,681.13792,-681.63407)"
-       id="g995">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path997"
-         d="m 442.86429,1754.1491 c 10.78295,-2.0415 22.63506,-3.5484 31.72963,-6.4341 17.41543,4.5145 34.8732,6.2578 52.61828,9.7833 l -0.79324,5.6408 c -13.94799,-3.6905 -30.86751,-7.0314 -52.79456,-9.7833 -14.53933,2.2933 -27.21975,5.5161 -39.92644,8.7257 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="ccccssccscsscccssccs"
-         inkscape:connector-curvature="0"
-         id="path999"
-         d="m 469.53272,1756.2959 c -12.32701,5.3522 -23.74909,10.1265 -35.83835,9.8143 l -0.76134,5.3571 c 8.03045,0.5053 15.01189,3.1755 19.07502,11.9461 0,0 -2.79705,8.0239 -3.50216,9.7867 -0.40755,1.0188 10.0109,4.9058 17.9261,9.2745 5.7789,3.1895 9.70362,7.3365 9.70362,7.3365 l -14.9361,-26.7161 c 30.24932,16.4667 62.28535,27.4255 70.27709,9.4129 4.42574,-9.9751 -6.88933,-18.2849 -10.71262,-10.1604 0,0 5.16501,-2.3834 6.00766,1.4396 4.44189,20.1524 -29.73454,11.8551 -43.36869,0.2354 -1.49294,-1.2724 46.44174,-11.7994 46.44174,-10.1189 l 1.61958,-5.8001 c -18.13025,4.301 -40.95965,-10.4622 -61.93155,-11.8076 z m 2.9623,9.4544 c 11.19809,-0.067 24.28852,1.3987 36.94576,6.0077 0.93698,0.3412 -27.67125,6.6029 -27.67125,6.6029 l -32.91758,-9.9667 c 5.34462,-1.3315 13.7624,-2.5851 23.64307,-2.6439 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path1001"
-         d="m 470.73702,1761.8052 c -0.83593,1.3734 -1.3012,2.9024 -1.3012,4.5265 0,5.8124 5.99006,10.5342 13.38574,10.5342 7.39568,0 13.38574,-4.7218 13.38574,-10.5342 0,-0.3491 -0.027,-0.684 -0.0692,-1.0244 -7.51389,-0.9914 -19.42592,-2.5902 -25.40108,-3.5021 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate" />
-    </g>
-    <ellipse
-       inkscape:export-ydpi="84"
-       inkscape:export-xdpi="84"
-       clip-path="url(#clipPath5598-8-0-5)"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d9d;stroke-width:4.13543987;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path1003"
-       transform="matrix(0.12697445,0,0,0.12385674,1011.7186,67.296116)"
-       cx="353.77585"
-       cy="549.35583"
-       rx="173.90331"
-       ry="178.28075" />
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-       id="rect1005"
-       width="5.0981116"
-       height="319.14172"
-       x="975.51898"
-       y="34.233334" />
-    <rect
-       y="-1137.639"
-       x="191.2552"
-       height="319.14172"
-       width="5.0981116"
-       id="rect1007"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-       transform="matrix(0,1,-1,0,0,0)" />
-    <path
-       id="path1019"
-       d="m 226.09252,-234.83671 c 67.20714,-1.6822 121.32534,-56.0392 122.67434,-123.3291 l -67.81364,0 c -1.30468,30.0671 -25.45314,54.2098 -55.51551,55.5155 l 0,67.8136 c 0.21767,0 0.43742,0.01 0.65481,0 z"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
-       d="m 219.76952,-234.83671 c -67.20713,-1.6822 -121.32534,-56.0392 -122.67433,-123.3291 l 67.81363,0 c 1.30468,30.0671 25.45314,54.2098 55.51551,55.5155 l 0,67.8136 c -0.21767,0 -0.43741,0.01 -0.65481,0 z"
-       id="path1021" />
-    <g
-       id="g6779"
-       inkscape:label="Gear8"
-       transform="matrix(1.0331439,0,0,1.0331439,1346.9408,-871.08091)"
-       style="fill:#ffffff;fill-opacity:1">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1"
-         d="m 539.6875,776.625 -3.78125,10.5625 0.0312,0.59375 1.84375,9.15625 -10.65625,4.40625 -5.15625,-7.78125 -0.40625,-0.46875 -10.125,-4.75 -5.59375,5.59375 4.78125,10.125 0.4375,0.40625 7.78125,5.15625 -4.40625,10.65625 -9.15625,-1.84375 -0.59375,-0.0625 -10.53125,3.8125 0,7.90625 10.53125,3.78125 0.59375,-0.0312 9.15625,-1.84375 4.40625,10.65625 -7.78125,5.15625 -0.4375,0.40625 -4.78125,10.125 5.59375,5.59375 10.125,-4.78125 0.40625,-0.4375 5.15625,-7.78125 10.65625,4.40625 -1.84375,9.15625 -0.0312,0.59375 3.78125,10.53125 7.90625,0 3.8125,-10.53125 -0.0625,-0.59375 -1.84375,-9.15625 10.65625,-4.40625 5.15625,7.78125 0.40625,0.4375 10.125,4.78125 5.59375,-5.59375 -4.75,-10.125 -0.46875,-0.40625 L 568.4375,842.6563 572.84375,832 582,833.84375 l 0.59375,0.0312 10.5625,-3.78125 0,-7.90625 -10.5625,-3.8125 -0.59375,0.0625 -9.15625,1.84375 -4.40625,-10.65625 7.78125,-5.15625 0.46875,-0.40625 4.75,-10.125 -5.59375,-5.59375 -10.125,4.75 -0.40625,0.46875 -5.15625,7.78125 -10.65625,-4.40625 1.84375,-9.15625 0.0625,-0.59375 -3.8125,-10.5625 -7.90625,0 z m 3.96875,31.3125 c 10.05204,0 18.1875,8.13546 18.1875,18.1875 0,10.05204 -8.13546,18.21875 -18.1875,18.21875 -10.05204,0 -18.21875,-8.16671 -18.21875,-18.21875 0,-10.05204 8.16671,-18.1875 18.21875,-18.1875 z"
-         transform="matrix(0.96149492,0,0,0.96149492,-522.71094,-794.32909)"
-         id="path6781"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g966"
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/config.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       transform="matrix(0.9933626,0,0,0.9933626,806.90517,-1691.7371)">
-      <rect
-         y="778.85828"
-         x="606.93445"
-         height="100"
-         width="100"
-         id="rect964"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/config.png"
-         id="layer1-4"
-         inkscape:label="Layer 1"
-         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
-         transform="matrix(0.40504087,0,0,0.40504087,496.46234,602.62397)">
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1;stroke:none"
-           d="m 393.9375,475.8125 -2.75,6.5 -0.75,4.6875 0.125,1.75 -7,0.90625 -0.3125,-1.71875 -1.9375,-4.3125 -4.3125,-5.5625 -4.4375,1.15625 -0.9375,7 0.5,4.71875 0.5625,1.65625 -6.5,2.6875 -0.75,-1.59375 -3,-3.65625 -5.625,-4.25 -3.9375,2.25 0.875,7 1.6875,4.4375 1,1.4375 -5.625,4.3125 -1.125,-1.34375 -3.875,-2.75 -6.5,-2.6875 -3.25,3.21875 2.6875,6.53125 2.75,3.84375 1.375,1.125 -4.3125,5.625 -1.4375,-1 -4.4375,-1.6875 -7,-0.875 -2.25,3.9375 4.25,5.59375 3.6875,3 1.5625,0.78125 -2.6875,6.53125 -1.6875,-0.59375 L 323.875,534 l -7,0.9375 -1.1875,4.40625 5.5625,4.3125 4.3125,1.9375 1.75,0.3125 -0.9375,7.03125 -1.75,-0.15625 -4.6875,0.78125 -6.5,2.71875 0,4.53125 6.5,2.71875 4.6875,0.78125 1.75,-0.15625 0.9375,7.03125 -1.75,0.3125 -4.3125,1.96875 -5.5625,4.28125 1.1875,4.40625 7,0.9375 4.6875,-0.46875 1.6875,-0.59375 2.6875,6.5625 -1.5625,0.75 -3.6875,3 -4.25,5.59375 2.25,3.9375 7,-0.875 4.4375,-1.6875 1.4375,-1 4.3125,5.625 -1.375,1.125 -2.75,3.84375 -2.6875,6.53125 3.25,3.21875 6.5,-2.65625 3.875,-2.78125 1.125,-1.34375 5.625,4.3125 -1,1.4375 -1.6875,4.4375 -0.875,7 3.9375,2.28125 5.625,-4.28125 3,-3.65625 0.75,-1.59375 6.5,2.71875 -0.5625,1.65625 -0.5,4.6875 0.9375,7 4.4375,1.1875 4.3125,-5.59375 1.9375,-4.3125 0.3125,-1.71875 7,0.90625 -0.125,1.75 0.75,4.6875 2.75,6.5 4.5625,0 2.6875,-6.5 0.75,-4.6875 -0.125,-1.75 7,-0.90625 0.3125,1.71875 2,4.3125 4.3125,5.59375 4.375,-1.1875 0.9375,-7 -0.4375,-4.6875 -0.625,-1.65625 6.5625,-2.71875 0.75,1.59375 3,3.65625 5.5625,4.28125 4,-2.28125 -0.9375,-7 -1.6875,-4.4375 -1,-1.4375 5.625,-4.3125 1.1875,1.34375 3.8125,2.78125 6.5,2.65625 3.25,-3.21875 -2.6875,-6.53125 -2.75,-3.84375 -1.375,-1.125 4.3125,-5.625 1.5,1 4.375,1.6875 7,0.875 2.3125,-3.9375 -4.3125,-5.59375 -3.625,-3 -1.625,-0.75 2.75,-6.5625 1.625,0.59375 4.75,0.46875 6.9375,-0.9375 1.1875,-4.40625 -5.5625,-4.28125 -4.3125,-1.96875 -1.75,-0.3125 0.9375,-7.03125 1.75,0.15625 4.6875,-0.78125 6.5,-2.71875 0,-4.53125 -6.5,-2.71875 -4.6875,-0.78125 -1.75,0.15625 -0.9375,-7.03125 1.75,-0.3125 4.3125,-1.9375 5.5625,-4.3125 L 475.5,534.9375 468.5625,534 l -4.75,0.46875 -1.625,0.59375 -2.75,-6.53125 1.625,-0.78125 3.625,-3 4.3125,-5.59375 -2.3125,-3.9375 -7,0.875 -4.375,1.6875 -1.5,1 -4.3125,-5.625 1.375,-1.125 2.75,-3.84375 2.6875,-6.53125 -3.25,-3.21875 -6.5,2.6875 -3.8125,2.75 -1.1875,1.34375 -5.625,-4.3125 1,-1.4375 1.6875,-4.4375 0.9375,-7 -4,-2.25 -5.5625,4.25 -3,3.65625 -0.75,1.59375 -6.5625,-2.6875 0.625,-1.65625 0.4375,-4.71875 -0.9375,-7 -4.375,-1.15625 -4.3125,5.5625 -2,4.3125 -0.3125,1.71875 -7,-0.90625 0.125,-1.75 -0.75,-4.6875 -2.6875,-6.5 -4.5625,0 z m 2.25,30.53125 c 0.96651,0 1.95262,0.0421 2.90625,0.0937 -0.0995,4.40159 -1.1276,7.8826 -2.40625,7.875 -1.28164,-0.008 -2.2859,-3.51994 -2.375,-7.9375 0.6301,-0.0225 1.23944,-0.0312 1.875,-0.0312 z m -7.71875,0.5625 3.0625,3.53125 0,-0.0625 2.375,6.375 0,9.21875 0,0.25 0,9.21875 -2.375,6.375 0,2.84375 c -0.0219,0.007 -0.0407,0.024 -0.0625,0.0312 -0.3299,0.11206 -0.64999,0.2405 -0.96875,0.375 -0.009,0.004 -0.0223,-0.004 -0.0312,0 -0.31212,0.13068 -0.63695,0.28642 -0.9375,0.4375 -0.0291,0.0149 -0.0648,0.0162 -0.0937,0.0312 -0.25899,0.13459 -0.50042,0.28814 -0.75,0.4375 -0.0407,0.0239 -0.0846,0.0382 -0.125,0.0625 -0.0764,0.0467 -0.14326,0.10815 -0.21875,0.15625 -0.19238,0.12073 -0.37635,0.21449 -0.5625,0.34375 -0.0848,0.0595 -0.16656,0.12622 -0.25,0.1875 -0.30297,0.2199 -0.59039,0.47685 -0.875,0.71875 -0.1587,0.13488 -0.31606,0.26482 -0.46875,0.40625 -0.1196,0.11203 -0.22798,0.22779 -0.34375,0.34375 -0.26952,0.26655 -0.53322,0.52575 -0.78125,0.8125 -0.24184,0.27959 -0.4673,0.57741 -0.6875,0.875 -0.67919,0.9179 -1.26881,1.90268 -1.71875,2.96875 l -3.21875,0 -6.375,2.375 -9.21875,0 -0.25,0 -9.21875,0 -6.28125,-2.34375 -3.375,-2.96875 c 3.71343,-22.19248 21.42713,-39.6804 43.7499,-42.9999 z m 16.375,0.15625 c 22.1913,3.68786 39.6626,21.32274 42.96875,43.78125 l -3.53125,3.0625 0.0625,0 -6.375,2.375 -9.21875,0 -0.25,0 -9.21875,0 -6.375,-2.375 -2.84375,0 c -0.007,-0.0221 -0.0238,-0.0404 -0.0312,-0.0625 -0.11419,-0.34119 -0.23712,-0.67069 -0.375,-1 -0.27185,-0.64069 -0.58069,-1.25397 -0.9375,-1.84375 -0.0321,-0.054 -0.0609,-0.10268 -0.0937,-0.15625 -0.0121,-0.0195 -0.019,-0.0431 -0.0312,-0.0625 -0.18907,-0.3054 -0.38347,-0.58528 -0.59375,-0.875 -0.2199,-0.30297 -0.47685,-0.59039 -0.71875,-0.875 -0.23844,-0.28054 -0.49137,-0.55099 -0.75,-0.8125 -0.26655,-0.26952 -0.52575,-0.53322 -0.8125,-0.78125 -0.27959,-0.24184 -0.57741,-0.4673 -0.875,-0.6875 -0.91791,-0.67919 -1.90268,-1.26881 -2.96875,-1.71875 l 0,-3.21875 -2.375,-6.375 0,-9.21875 0,-0.25 0,-9.21875 2.34375,-6.28125 2.99985,-3.40625 z m -8.15625,31.65625 c 1.03299,-0.006 1.92692,2.25218 2.28125,5.4375 -0.89409,-0.17199 -1.83752,-0.2484 -2.78125,-0.25 -0.16624,-2.9e-4 -0.33505,0.0264 -0.5,0.0312 -0.33747,0.01 -0.66869,0.0297 -1,0.0625 -0.0313,0.003 -0.0625,-0.003 -0.0937,0 -0.0416,0.004 -0.0835,-0.005 -0.125,0 0.35765,-3.09526 1.20513,-5.27518 2.2187,-5.2812 z m -0.75,12.625 0.21875,0 c 0.49822,8.4e-4 0.99873,0.0596 1.46875,0.15625 0.01,0.002 0.0213,-0.002 0.0312,0 0.22451,0.0472 0.43989,0.0888 0.65625,0.15625 0.20816,0.065 0.42548,0.13578 0.625,0.21875 0.0125,0.005 0.0188,0.026 0.0312,0.0312 0.009,0.004 0.0225,-0.004 0.0312,0 0.20698,0.0885 0.39723,0.20578 0.59375,0.3125 0.008,0.004 0.0231,-0.004 0.0312,0 0.19657,0.10768 0.37757,0.25017 0.5625,0.375 0.007,0.005 0.024,-0.005 0.0312,0 0.18468,0.12561 0.35936,0.26456 0.53125,0.40625 0.007,0.005 0.0248,-0.005 0.0312,0 0.48268,0.40046 0.91685,0.86359 1.28125,1.375 0.0341,0.0479 0.0608,0.10754 0.0937,0.15625 0.12978,0.19189 0.23262,0.38932 0.34375,0.59375 0.11113,0.20443 0.22124,0.40923 0.3125,0.625 0.0635,0.1528 0.13431,0.31078 0.1875,0.46875 0.0107,0.0314 0.021,0.0622 0.0312,0.0937 0.0613,0.19048 0.11051,0.39661 0.15625,0.59375 0.0145,0.0626 0.0184,0.12429 0.0312,0.1875 0.0344,0.16823 0.0711,0.32764 0.0937,0.5 0.004,0.0304 -0.004,0.0632 0,0.0937 0.0245,0.20693 0.0556,0.41296 0.0625,0.625 0.003,0.0822 1.4e-4,0.16711 0,0.25 -0.001,0.23851 -0.007,0.48617 -0.0312,0.71875 -10e-4,0.0101 10e-4,0.0212 0,0.0312 -0.0249,0.23214 -0.0787,0.46241 -0.125,0.6875 -0.002,0.01 0.002,0.0213 0,0.0312 -0.0472,0.22451 -0.0888,0.43989 -0.15625,0.65625 -0.003,0.009 0.003,0.0225 0,0.0312 -0.0629,0.19863 -0.13944,0.40303 -0.21875,0.59375 -0.005,0.0124 -0.026,0.0188 -0.0312,0.0312 -0.004,0.009 0.004,0.0227 0,0.0312 -0.0885,0.20697 -0.20578,0.39723 -0.3125,0.59375 -0.004,0.008 0.004,0.0231 0,0.0312 -0.10768,0.19657 -0.25017,0.37757 -0.375,0.5625 -0.005,0.007 0.005,0.024 0,0.0312 -0.12561,0.18468 -0.26456,0.35936 -0.40625,0.53125 -0.005,0.006 0.005,0.0256 0,0.0312 -0.14271,0.172 -0.31098,0.31077 -0.46875,0.46875 -0.28498,0.28535 -0.57708,0.57796 -0.90625,0.8125 -0.0493,0.0349 -0.10604,0.06 -0.15625,0.0937 -0.38377,0.25956 -0.78722,0.47372 -1.21875,0.65625 -0.1528,0.0635 -0.31078,0.13431 -0.46875,0.1875 -0.0314,0.0106 -0.0622,0.021 -0.0937,0.0312 -0.0316,0.0103 -0.062,0.0214 -0.0937,0.0312 -0.1608,0.0494 -0.33455,0.0866 -0.5,0.125 -0.24437,0.0567 -0.49677,0.0939 -0.75,0.125 -0.1443,0.0177 -0.29063,0.0221 -0.4375,0.0312 -0.0718,0.004 -0.14638,0.0289 -0.21875,0.0312 -0.0822,0.003 -0.16711,1.4e-4 -0.25,0 -0.24902,-10e-4 -0.50748,-0.005 -0.75,-0.0312 -0.23243,-0.0239 -0.46207,-0.0796 -0.6875,-0.125 -0.0102,-0.002 -0.0211,0.002 -0.0312,0 -0.22485,-0.0462 -0.4395,-0.0897 -0.65625,-0.15625 -0.009,-0.003 -0.0218,0.003 -0.0312,0 -0.11777,-0.0367 -0.22864,-0.0825 -0.34375,-0.125 -0.0838,-0.0313 -0.16768,-0.0595 -0.25,-0.0937 -0.0124,-0.005 -0.0189,-0.0261 -0.0312,-0.0312 -0.009,-0.004 -0.0226,0.004 -0.0312,0 -0.20739,-0.0878 -0.39677,-0.20651 -0.59375,-0.3125 -0.008,-0.004 -0.0236,0.004 -0.0312,0 -0.197,-0.10699 -0.37709,-0.25082 -0.5625,-0.375 -0.007,-0.005 -0.0242,0.005 -0.0312,0 -0.18515,-0.12498 -0.35886,-0.26515 -0.53125,-0.40625 -0.006,-0.005 -0.0253,0.005 -0.0312,0 -0.17246,-0.14217 -0.31027,-0.31148 -0.46875,-0.46875 -0.23952,-0.23921 -0.48341,-0.47929 -0.6875,-0.75 -0.039,-0.0518 -0.0873,-0.10338 -0.125,-0.15625 -0.0337,-0.0482 -0.0612,-0.10716 -0.0937,-0.15625 -0.35285,-0.5217 -0.6365,-1.08073 -0.84375,-1.6875 -0.0102,-0.0304 -0.0214,-0.0631 -0.0312,-0.0937 -0.0371,-0.11363 -0.0623,-0.22772 -0.0937,-0.34375 -0.0385,-0.14298 -0.0638,-0.2911 -0.0937,-0.4375 -0.0334,-0.16374 -0.0717,-0.33241 -0.0937,-0.5 -10e-4,-0.0102 0.001,-0.021 0,-0.0312 -10e-4,-0.0102 0.001,-0.0211 0,-0.0312 -0.0175,-0.14283 -0.0222,-0.29219 -0.0312,-0.4375 -0.005,-0.0739 -0.0288,-0.14426 -0.0312,-0.21875 l 0,-0.21875 c -3e-5,-0.0104 -2e-5,-0.0209 0,-0.0312 10e-4,-0.24902 0.005,-0.50748 0.0312,-0.75 0.0239,-0.23221 0.0796,-0.46248 0.125,-0.6875 0.002,-0.0102 -0.002,-0.0211 0,-0.0312 0.0462,-0.22444 0.0897,-0.44006 0.15625,-0.65625 0.003,-0.009 -0.003,-0.0219 0,-0.0312 0.0635,-0.20311 0.13824,-0.39889 0.21875,-0.59375 0.005,-0.0125 0.026,-0.0188 0.0312,-0.0312 0.004,-0.009 -0.004,-0.0226 0,-0.0312 0.0878,-0.20668 0.20651,-0.39758 0.3125,-0.59375 0.004,-0.008 -0.004,-0.0236 0,-0.0312 0.10699,-0.1962 0.25082,-0.37797 0.375,-0.5625 0.005,-0.007 -0.005,-0.0243 0,-0.0312 0.12498,-0.18427 0.26515,-0.35978 0.40625,-0.53125 0.005,-0.006 -0.005,-0.0253 0,-0.0312 0.14217,-0.17154 0.31148,-0.31122 0.46875,-0.46875 0.28498,-0.28535 0.57708,-0.57796 0.90625,-0.8125 0.0482,-0.0337 0.10716,-0.0612 0.15625,-0.0937 0.5217,-0.35285 1.08073,-0.6365 1.6875,-0.84375 0.0304,-0.0103 0.0631,-0.0214 0.0937,-0.0312 0.11363,-0.0371 0.22772,-0.0623 0.34375,-0.0937 0.14298,-0.0385 0.2911,-0.0638 0.4375,-0.0937 0.23484,-0.0479 0.47617,-0.10067 0.71875,-0.125 0.16563,-0.0168 0.33067,-0.0259 0.49975,-0.0313 z m -51.84375,4.28125 c 4.38664,0.10376 7.85133,1.13065 7.84375,2.40625 -0.008,1.27857 -3.50356,2.28165 -7.90625,2.375 -0.0213,-0.6126 -0.0625,-1.22597 -0.0625,-1.84375 0,-0.98561 0.071,-1.96528 0.125,-2.9375 z m 37.6875,0.125 c -0.17196,0.89407 -0.2484,1.83752 -0.25,2.78125 -8.3e-4,0.49565 0.0471,0.98559 0.0937,1.46875 10e-4,0.0104 -0.001,0.0208 0,0.0312 0.003,0.0308 -0.003,0.063 0,0.0937 0.004,0.0416 -0.005,0.0835 0,0.125 -3.09528,-0.35772 -5.27523,-1.20518 -5.28125,-2.21875 -0.006,-1.03291 2.25223,-1.92682 5.43755,-2.28115 z m 66.5625,0.9375 c 10e-4,0.0314 -10e-4,0.0624 0,0.0937 l 0.0312,1.78125 c 0,0.97507 -0.0409,1.94435 -0.0937,2.90625 -4.40158,-0.0995 -7.8826,-1.1276 -7.875,-2.40625 0.008,-1.28159 3.51994,-2.28585 7.9375,-2.37495 z m -37.625,0.15625 c 3.09529,0.3577 5.27523,1.20518 5.28125,2.21875 0.006,1.03299 -2.25218,1.92692 -5.4375,2.28125 0.17197,-0.89409 0.2484,-1.83752 0.25,-2.78125 2.8e-4,-0.16624 -0.0264,-0.33505 -0.0312,-0.5 -0.009,-0.29508 -0.0364,-0.58458 -0.0625,-0.875 -0.007,-0.0731 0.008,-0.14599 0,-0.21875 -0.004,-0.0416 0.005,-0.0835 -5e-5,-0.125 z m -56.34375,3.96875 9.21875,0 0.25,0 9.21875,0 6.375,2.375 2.84375,0 c 0.11383,0.3455 0.26817,0.66657 0.40625,1 0.004,0.009 -0.004,0.0222 0,0.0312 0.004,0.009 -0.004,0.0223 0,0.0312 0.13068,0.31212 0.28642,0.63695 0.4375,0.9375 0.14778,0.28911 0.30267,0.56623 0.46875,0.84375 0.0239,0.0407 0.0382,0.0846 0.0625,0.125 0.0467,0.0764 0.10815,0.14326 0.15625,0.21875 0.12073,0.19238 0.21449,0.37635 0.34375,0.5625 0.0595,0.0848 0.12622,0.16656 0.1875,0.25 0.34252,0.4719 0.72993,0.91722 1.125,1.34375 0.10694,0.11417 0.23323,0.20182 0.34375,0.3125 0.005,0.005 -0.005,0.026 0,0.0312 1.32812,1.34288 2.89009,2.44208 4.65625,3.1875 l 0,3.21875 2.375,6.375 0,9.21875 0,0.25 0,9.21875 -2.34375,6.28125 -2.96875,3.40625 C 365.33101,606.31799 347.86932,588.58181 344.5625,566.25 l 3.5,-3.0625 -0.0625,0 6.375,-2.375 z m 64.90625,1.0625 9.21875,0 0.25,0 9.21875,0 6.28125,2.34375 3.40625,3 c -3.71228,22.20816 -21.43398,39.67617 -43.78125,42.96875 l -3.0625,-3.53125 0,0.0625 -2.375,-6.375 0,-9.21875 0,-0.25 0,-9.21875 2.375,-6.375 0,-2.84375 c 0.0221,-0.007 0.0404,-0.0237 0.0625,-0.0312 0.32296,-0.10809 0.62516,-0.24566 0.9375,-0.375 0.009,-0.004 0.0223,0.004 0.0312,0 0.35117,-0.14624 0.72599,-0.29678 1.0625,-0.46875 0.27979,-0.1454 0.54371,-0.30614 0.8125,-0.46875 0.054,-0.0321 0.10268,-0.061 0.15625,-0.0937 0.23019,-0.14323 0.46613,-0.28205 0.6875,-0.4375 0.39155,-0.27189 0.76289,-0.59848 1.125,-0.90625 0.1587,-0.13639 0.31609,-0.26326 0.46875,-0.40625 0.1119,-0.10364 0.20393,-0.23669 0.3125,-0.34375 0.005,-0.005 0.0258,0.005 0.0312,0 1.34288,-1.32812 2.44208,-2.89009 3.1875,-4.65625 l 3.21875,0 6.3751,-2.3751 z M 393.375,572.9375 c 0.8941,0.17197 1.83752,0.2484 2.78125,0.25 0.48503,8.2e-4 0.96444,-0.0491 1.4375,-0.0937 0.0208,-0.002 0.0417,0.002 0.0625,0 0.0313,-0.003 0.0625,0.003 0.0937,0 0.0416,-0.004 0.0835,0.005 0.125,0 -0.35769,3.09529 -1.20518,5.27523 -2.21875,5.28125 -1.03293,0.006 -1.92687,-2.25223 -2.2812,-5.43755 z m 2.28125,29.84375 c 1.28165,0.008 2.2859,3.51994 2.375,7.9375 -0.61253,0.0213 -1.22604,0.0312 -1.84375,0.0312 -0.9961,0 -1.95508,-0.0386 -2.9375,-0.0937 0.0995,-4.40158 1.1276,-7.8826 2.40625,-7.875 z"
-           id="path6093" />
-      </g>
-    </g>
-    <g
-       id="g1815"
-       transform="matrix(0.57587358,0,0,0.57587358,740.69027,575.10968)"
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/quit.png"
-       inkscape:export-xdpi="59"
-       inkscape:export-ydpi="59">
-      <rect
-         ry="40"
-         rx="40"
-         y="1587.5555"
-         x="-472.99298"
-         height="494.86526"
-         width="494.86526"
-         id="rect1803"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:30;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="csssc"
-         inkscape:connector-curvature="0"
-         id="path1805"
-         d="m -280.35079,1721.6125 c -46.76834,20.9939 -79.34593,68.0326 -79.34593,122.6945 0,74.2148 60.04826,134.3675 134.13422,134.3675 74.08596,0 134.134218,-60.1527 134.134218,-134.3675 0,-54.6692 -32.570828,-101.7074 -79.345918,-122.6945"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:40;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <rect
-         ry="25.204872"
-         rx="46.820614"
-         y="1681.4468"
-         x="-237.85724"
-         height="89.585251"
-         width="24.593159"
-         id="rect1813"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    </g>
-    <g
-       id="g1860"
-       transform="matrix(0.57587358,0,0,0.57587358,-4.8314469,505.61069)"
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/back.png"
-       inkscape:export-xdpi="59"
-       inkscape:export-ydpi="59">
-      <rect
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:30;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="rect1803-6"
-         width="494.86526"
-         height="494.86526"
-         x="173.61316"
-         y="1707.1705"
-         rx="40"
-         ry="40" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-         d="m 596.0538,1880.818 5.26346,115.7952 -221.06283,0 0,81.5823 -139.48011,-139.4804 c 0,0 141.53692,-85.131 144.49467,-83.4239 2.95771,1.7081 -2.63178,72.8975 -2.63178,72.8975 z"
-         id="path926-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc" />
-    </g>
-    <g
-       id="g3323"
-       inkscape:export-xdpi="59"
-       inkscape:export-ydpi="59"
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/reload.png"
-       transform="matrix(0.84350454,0,0,0.84350454,-32.311947,-18.511808)">
-      <rect
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:20.48146439;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="rect1803-1"
-         width="337.85217"
-         height="337.85217"
-         x="1034.0619"
-         y="1796.6134"
-         rx="27.308619"
-         ry="27.308619" />
-      <g
-         style="fill:#ffffff;fill-opacity:1"
-         inkscape:label="Layer 1"
-         id="layer1-41"
-         transform="matrix(4.421117,0,0,4.421117,-442.15111,453.7938)">
-        <path
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:xx-small;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.11111116;marker:none;enable-background:accumulate"
-           d="m 399.28125,314.125 -9.125,7.25 c -4.79903,-4.02427 -10.96238,-6.46875 -17.65625,-6.46875 -15.12864,0 -27.5625,12.43386 -27.5625,27.5625 0,15.12864 12.43386,27.28125 27.5625,27.28125 11.86031,0 22.05181,-7.45465 25.90625,-17.96875 l -9.875,-2.40625 c -2.6427,6.23188 -8.76675,10.53125 -16.03125,10.53125 -9.72414,0 -17.4375,-7.71336 -17.4375,-17.4375 0,-9.72414 7.71336,-17.71875 17.4375,-17.71875 3.60788,0 6.92296,1.1171 9.6875,3 l -9.03125,7.1875 26.125,4.84375 0,-25.65625 z"
-           id="path3768"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       id="g3373"
-       transform="matrix(0,2.1918547,-2.1918547,0,3541.9367,-1313.749)"
-       inkscape:export-filename="images/menu.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       style="stroke:none">
-      <g
-         id="g3338"
-         transform="translate(11.036416,169.8964)"
-         style="stroke:none">
-        <rect
-           y="821.28723"
-           x="743.29559"
-           height="17.496626"
-           width="17.496626"
-           id="rect3340"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.69999981;marker:none;enable-background:accumulate" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.69999981;marker:none;enable-background:accumulate"
-           id="rect3342"
-           width="17.496626"
-           height="17.496626"
-           x="786.35712"
-           y="821.28723" />
-        <rect
-           y="821.28723"
-           x="765.16809"
-           height="17.496626"
-           width="17.496626"
-           id="rect3344"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.69999981;marker:none;enable-background:accumulate" />
-      </g>
-      <rect
-         y="962.71338"
-         x="747.39252"
-         height="74.437172"
-         width="74.437172"
-         id="rect3354"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:none;stroke-width:1.51912594;marker:none;enable-background:accumulate" />
-    </g>
-    <g
-       id="g996"
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/left.png"
-       inkscape:export-xdpi="180"
-       inkscape:export-ydpi="180"
-       transform="matrix(0.9933626,0,0,0.9933626,806.90517,-1691.7371)">
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path989"
-         d="m 633.84901,572.16153 0,84.09747 -30.44908,-42.66709 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-      <rect
-         y="564.21027"
-         x="563.54962"
-         height="100"
-         width="100"
-         id="rect991"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-    </g>
-    <g
-       id="g1000"
-       transform="matrix(-0.9933626,0,0,0.9933626,2025.8596,-1587.073)"
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/right.png"
-       inkscape:export-xdpi="180"
-       inkscape:export-ydpi="180">
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-         d="m 633.84901,572.16153 0,84.09747 -30.44908,-42.66709 z"
-         id="path1002"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <rect
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-         id="rect1004"
-         width="100"
-         height="100"
-         x="563.54962"
-         y="564.21027" />
-    </g>
-    <g
-       id="g5336"
-       inkscape:export-filename="ui/leave.png"
-       inkscape:export-xdpi="100"
-       inkscape:export-ydpi="100"
-       transform="matrix(3.6203495,0,0,3.5928985,2547.8024,-768.65233)">
-      <path
-         inkscape:export-ydpi="100"
-         inkscape:export-xdpi="100"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path936-1"
-         d="m -569.64004,260.80611 -0.72214,-15.88695 30.32962,0 0,-11.19306 19.13656,19.1366 c 0,0 -19.41875,11.67993 -19.82454,11.44568 -0.40581,-0.23432 0.36107,-10.00145 0.36107,-10.00145 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-    </g>
-    <g
-       id="g1069"
-       transform="matrix(0.41384779,0,0,0.41384779,1653.0105,-1287.0443)"
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/forward.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         inkscape:export-ydpi="59"
-         inkscape:export-xdpi="59"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/back.png"
-         transform="matrix(0.46907977,0,0,0.46907977,125.35285,1539.055)"
-         id="g1860-5">
-        <rect
-           ry="40"
-           rx="40"
-           y="1707.1705"
-           x="173.61316"
-           height="494.86526"
-           width="494.86526"
-           id="rect1803-6-1"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:26.98467255;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/forward.png"
-           inkscape:export-xdpi="90"
-           inkscape:export-ydpi="90" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path1065"
-         d="m 265.15329,2394.993 0,121.8537 60.52378,-57.7217 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-         d="m 340.34004,2394.993 0,121.8537 60.52378,-57.7217 z"
-         id="path1067"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <g
-       id="g1013"
-       transform="matrix(0.36624898,0,0,0.36624898,659.51817,-68.411352)"
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
-       inkscape:export-xdpi="84"
-       inkscape:export-ydpi="84">
-      <rect
-         ry="25"
-         rx="25"
-         y="853.23486"
-         x="1009.1696"
-         height="69.5979"
-         width="114.06322"
-         id="rect1009"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path1011"
-         d="m 1051.7016,917.03294 9.6664,30.93239 13.5329,-36.73222 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-    </g>
-    <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-       id="rect1012"
-       width="407.08478"
-       height="198.82513"
-       x="1473.2963"
-       y="746.2406" />
-    <path
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-       d="m 1592.4983,943.36078 39.6957,51.37145 39.6963,-51.37145 z"
-       id="path1014"
-       inkscape:connector-curvature="0"
-       inkscape:export-filename="images/bubblepointer.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <circle
-       r="150"
-       cy="-867.97528"
-       cx="-906.11835"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.33588934;marker:none;enable-background:accumulate"
-       id="path934-1"
-       transform="scale(-1,-1)" />
-    <g
-       id="g4937"
-       transform="matrix(1.0877031,0,0,1.0877031,397.762,-803.95591)"
-       inkscape:export-filename="images/inventory_plain.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <rect
-         ry="10.546551"
-         rx="10.546551"
-         y="894.25983"
-         x="811.90869"
-         height="74.424873"
-         width="125.25163"
-         id="rect3145"
-         style="fill:#ffffff;stroke:none" />
-      <path
-         inkscape:connector-curvature="0"
-         id="rect3147"
-         d="m 856.03227,879.46394 c -2.07555,0 -3.74108,1.66536 -3.74108,3.74105 l 0,18.9477 c 0,2.07546 1.66553,3.74083 3.74108,3.74083 l 36.99469,0 c 2.07553,0 3.74103,-1.66537 3.74103,-3.74083 l 0,-18.9477 c 0,-2.07569 -1.6655,-3.74105 -3.74103,-3.74105 l -36.99469,0 z m 5.54228,3.94853 25.91013,0 c 1.45393,0 2.63258,1.17874 2.63258,2.63287 l 0,13.26677 c 0,1.45391 -1.17865,2.63265 -2.63258,2.63265 l -25.91013,0 c -1.45395,0 -2.63261,-1.17874 -2.63261,-2.63265 l 0,-13.26677 c 0,-1.45413 1.17866,-2.63287 2.63261,-2.63287 z"
-         style="fill:#ffffff;stroke:none" />
-    </g>
-    <g
-       id="g4269"
-       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/help.png"
-       inkscape:export-xdpi="59"
-       inkscape:export-ydpi="59"
-       transform="matrix(0.84350454,0,0,0.84350454,-32.311947,-18.511808)">
-      <g
-         transform="translate(420.06133,0)"
-         id="g4257"
-         inkscape:export-xdpi="59"
-         inkscape:export-ydpi="59"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/reload.png">
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:20.48146439;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-           id="rect4259"
-           width="337.85217"
-           height="337.85217"
-           x="1034.0619"
-           y="1796.6134"
-           rx="27.308619"
-           ry="27.308619" />
-        <g
-           style="fill:#ffffff;fill-opacity:1"
-           inkscape:label="Layer 1"
-           id="g4261"
-           transform="matrix(4.421117,0,0,4.421117,-442.15111,453.7938)" />
-      </g>
-      <text
-         sodipodi:linespacing="0%"
-         id="text4265"
-         y="2092.9443"
-         x="1516.1523"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:0%;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:350px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, Black,'"
-           y="2092.9443"
-           x="1516.1523"
-           id="tspan4267"
-           sodipodi:role="line">?</tspan></text>
-    </g>
-    <g
-       id="g3259"
-       inkscape:export-filename="/home/rgarcia/Dropbox/prj/2013.Proyecto Indiana/diosa/assets/sprites/ui/credits.png"
-       inkscape:export-xdpi="59"
-       inkscape:export-ydpi="59"
-       transform="matrix(0.84350454,0,0,0.84350454,-32.311947,-18.511808)">
-      <g
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/reload.png"
-         inkscape:export-ydpi="59"
-         inkscape:export-xdpi="59"
-         id="g3210"
-         transform="translate(825.23827,0)">
-        <rect
-           ry="27.308619"
-           rx="27.308619"
-           y="1796.6134"
-           x="1034.0619"
-           height="337.85217"
-           width="337.85217"
-           id="rect3212"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:20.48146439;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
-        <g
-           transform="matrix(4.421117,0,0,4.421117,-442.15111,453.7938)"
-           id="g3214"
-           inkscape:label="Layer 1"
-           style="fill:#ffffff;fill-opacity:1" />
-      </g>
-      <path
-         transform="matrix(0.56768937,0.06916234,-0.06916234,0.56768937,1046.5834,783.58391)"
-         d="m 2144.6959,2060.7348 -172.646,-92.6614 -141.1911,134.6765 34.7756,-192.83 -171.7154,-92.6635 194.1385,-26.5141 35.0652,-191.9457 85.2086,176.4434 193.3869,-25.9655 -141.4768,135.5622 z"
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="1.4426115"
-         sodipodi:arg1="0.80939356"
-         sodipodi:r2="103.15732"
-         sodipodi:r1="269.3476"
-         sodipodi:cy="1865.7625"
-         sodipodi:cx="1958.8629"
-         sodipodi:sides="5"
-         id="path3225"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-         sodipodi:type="star" />
-      <circle
-         transform="matrix(0.18065919,0,0,0.18065919,1675.5129,1741.5044)"
-         id="path3246"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-         cx="1809.5873"
-         cy="1241.2417"
-         r="54.835976"
-         d="m 1864.4233,1241.2417 a 54.835976,54.835976 0 0 1 -54.836,54.836 54.835976,54.835976 0 0 1 -54.836,-54.836 54.835976,54.835976 0 0 1 54.836,-54.836 54.835976,54.835976 0 0 1 54.836,54.836 z" />
-      <path
-         sodipodi:nodetypes="ssccs"
-         inkscape:connector-curvature="0"
-         id="rect3248"
-         d="m 1993.6255,1982.652 c 2.4883,-7.0655 16.084,-7.1941 19.2629,0 4.5796,10.3639 2.7519,31.7183 2.7519,31.7183 l -24.2163,0 c 0,0 -1.651,-20.7786 2.2015,-31.7183 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-      <circle
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-         id="path3251"
-         transform="matrix(0.18065919,0,0,0.18065919,1701.4077,1721.7025)"
-         cx="1809.5873"
-         cy="1241.2417"
-         r="54.835976"
-         d="m 1864.4233,1241.2417 a 54.835976,54.835976 0 0 1 -54.836,54.836 54.835976,54.835976 0 0 1 -54.836,-54.836 54.835976,54.835976 0 0 1 54.836,-54.836 54.835976,54.835976 0 0 1 54.836,54.836 z" />
-      <path
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-         d="m 2019.5203,1962.8501 c 2.4883,-7.0655 16.084,-7.1941 19.2629,0 4.5796,10.3639 2.7519,31.7183 2.7519,31.7183 l -24.2163,0 c 0,0 -1.651,-20.7786 2.2015,-31.7183 z"
-         id="path3253"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssccs" />
-      <circle
-         transform="matrix(0.18065919,0,0,0.18065919,1728.8257,1744.5508)"
-         id="path3255"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-         cx="1809.5873"
-         cy="1241.2417"
-         r="54.835976"
-         d="m 1864.4233,1241.2417 a 54.835976,54.835976 0 0 1 -54.836,54.836 54.835976,54.835976 0 0 1 -54.836,-54.836 54.835976,54.835976 0 0 1 54.836,-54.836 54.835976,54.835976 0 0 1 54.836,54.836 z" />
-      <path
-         sodipodi:nodetypes="ssccs"
-         inkscape:connector-curvature="0"
-         id="path3257"
-         d="m 2046.9383,1985.6984 c 2.4883,-7.0655 16.084,-7.1941 19.2629,0 4.5796,10.3639 2.7519,31.7183 2.7519,31.7183 l -24.2163,0 c 0,0 -1.651,-20.7786 2.2015,-31.7183 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" />
-    </g>
-    <g
-       id="g5206"
-       transform="matrix(2.6946049,0,0,2.6631024,1678.288,-2073.9548)"
-       inkscape:export-filename="ui/pointer2.png"
-       inkscape:export-xdpi="100"
-       inkscape:export-ydpi="100">
-      <g
-         style="fill:none;stroke:#000000;stroke-width:0.76394558"
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         id="g4378"
-         transform="matrix(0.24412714,0,0,0.25060842,-614.75066,541.74137)"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/pointer0.png">
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15.44281864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           d="m 529.42402,1434.6375 0,175.9556"
-           id="path4380"
-           inkscape:connector-curvature="0" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:15.44281864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           d="m 439.11051,1522.6153 180.62702,0"
-           id="path4382"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/pointer0.png"
-         transform="matrix(0.24412714,0,0,0.25060842,-614.75066,541.74137)"
-         id="g4372"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90">
-        <path
-           inkscape:connector-curvature="0"
-           id="path4374"
-           d="m 529.42402,1434.6375 0,175.9556"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path4376"
-           d="m 439.11051,1522.6153 180.62702,0"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      </g>
-    </g>
-    <g
-       id="g5266"
-       transform="matrix(2.6946049,0,0,2.6631024,1803.7853,-1938.9755)"
-       inkscape:export-filename="images/pointer.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/pointer0.png"
-         transform="matrix(0.24412714,0,0,0.25060842,-654.75679,587.90166)"
-         id="g4386"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90"
-         style="fill:none;stroke:#000000;stroke-width:0.76394558">
-        <path
-           inkscape:connector-curvature="0"
-           id="path4388"
-           d="m 529.42402,1434.6375 0,175.9556"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path4390"
-           d="m 439.11051,1522.6153 180.62702,0"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      </g>
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         id="g4392"
-         transform="matrix(0.24412714,0,0,0.25060842,-656.75679,585.90166)"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/pointer0.png">
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           d="m 529.42402,1434.6375 0,175.9556"
-           id="path4394"
-           inkscape:connector-curvature="0" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           d="m 439.11051,1522.6153 180.62702,0"
-           id="path4396"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       id="g5316"
-       inkscape:export-filename="ui/pointer4.png"
-       inkscape:export-xdpi="100"
-       inkscape:export-ydpi="100"
-       transform="matrix(2.6946049,0,0,2.6631024,2081.4148,-778.24726)">
-      <g
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/pointer0.png"
-         transform="matrix(0.24412714,0,0,0.25060842,-758.15241,262.00065)"
-         id="g4522"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90"
-         style="fill:none;stroke:#000000;stroke-width:0.76394558;filter:url(#filter4518)">
-        <path
-           inkscape:connector-curvature="0"
-           id="path4524"
-           d="m 529.42402,1434.6375 0,175.9556"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path4526"
-           d="m 439.11051,1522.6153 180.62702,0"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      </g>
-      <g
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         id="g4528"
-         transform="matrix(0.24412714,0,0,0.25060842,-758.15241,262.00065)"
-         inkscape:export-filename="ui/pointer4.png">
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           d="m 529.42402,1434.6375 0,175.9556"
-           id="path4530"
-           inkscape:connector-curvature="0" />
-        <path
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:9.2656908;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           d="m 439.11051,1522.6153 180.62702,0"
-           id="path4532"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-    <g
-       id="g4512"
-       transform="matrix(2.0464629,0,0,2.0464629,1628.3475,-390.36985)"
-       inkscape:export-filename="ui/hotspotpointer4.png"
-       inkscape:export-xdpi="100"
-       inkscape:export-ydpi="100">
-      <g
-         style="stroke:#000000;filter:url(#filter5123)"
-         id="g5079"
-         transform="translate(-889.49268,-430.86712)">
-        <g
-           style="stroke:#000000"
-           id="g5081"
-           transform="matrix(1.8459723,0,0,1.8459723,-85.215047,-910.35311)">
-          <g
-             style="stroke:#000000"
-             id="g5083">
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.75842905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 139.37785,1048.2882 0,12.795"
-               id="path5085"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5087"
-               d="m 139.37785,1088.5759 0,12.7953"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 165.91923,1074.8297 -12.7953,0"
-               id="path5089"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5091"
-               d="m 125.63177,1074.8297 -12.7953,0"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-          </g>
-          <g
-             style="stroke:#000000"
-             transform="matrix(0.51204404,-0.51204404,0.51204404,0.51204404,-482.34989,595.83715)"
-             id="g5093">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5095"
-               d="m 139.37785,1044.7464 0,12.0666"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.4283011;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 139.37785,1092.8461 0,12.0668"
-               id="path5097"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5099"
-               d="m 169.4609,1074.8297 -12.0668,0"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 121.3616,1074.8297 -12.0668,0"
-               id="path5101"
-               inkscape:connector-curvature="0" />
-          </g>
-        </g>
-      </g>
-      <g
-         id="g4497">
-        <g
-           id="g5339"
-           inkscape:export-filename="ui/hotspotpointer4.png"
-           inkscape:export-xdpi="90"
-           inkscape:export-ydpi="90">
-          <g
-             transform="translate(-889.49268,-430.86712)"
-             id="g5018">
-            <g
-               transform="matrix(1.8459723,0,0,1.8459723,-85.215047,-910.35311)"
-               id="g4975">
-              <g
-                 id="g4977">
-                <path
-                   inkscape:connector-curvature="0"
-                   id="path4979"
-                   d="m 139.37785,1048.2882 0,12.795"
-                   style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75842905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-                <path
-                   style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-                   d="m 139.37785,1088.5759 0,12.7953"
-                   id="path4981"
-                   inkscape:connector-curvature="0" />
-                <path
-                   inkscape:connector-curvature="0"
-                   id="path4983"
-                   d="m 165.91923,1074.8297 -12.7953,0"
-                   style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-                <path
-                   style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-                   d="m 125.63177,1074.8297 -12.7953,0"
-                   id="path4985"
-                   inkscape:connector-curvature="0" />
-              </g>
-              <g
-                 id="g4987"
-                 transform="matrix(0.51204404,-0.51204404,0.51204404,0.51204404,-482.34989,595.83715)">
-                <path
-                   style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.4283011;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-                   d="m 139.37785,1044.7464 0,12.0666"
-                   id="path4989"
-                   inkscape:connector-curvature="0" />
-                <path
-                   inkscape:connector-curvature="0"
-                   id="path4991"
-                   d="m 139.37785,1092.8461 0,12.0668"
-                   style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-                <path
-                   style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-                   d="m 169.4609,1074.8297 -12.0668,0"
-                   id="path4993"
-                   inkscape:connector-curvature="0" />
-                <path
-                   inkscape:connector-curvature="0"
-                   id="path4995"
-                   d="m 121.3616,1074.8297 -12.0668,0"
-                   style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-    </g>
-    <g
-       id="g5240"
-       transform="matrix(2.0464629,0,0,2.0464629,1416.4368,-1596.0699)"
-       inkscape:export-filename="ui/hotspotpointer2.png"
-       inkscape:export-xdpi="100"
-       inkscape:export-ydpi="100">
-      <g
-         style="fill:none;stroke:#000000;stroke-width:6;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="translate(-788.09706,-112.35151)"
-         id="g5055">
-        <g
-           style="fill:none;stroke:#000000;stroke-width:3.25031972;stroke-miterlimit:4;stroke-dasharray:none"
-           transform="matrix(1.8459723,0,0,1.8459723,-85.215047,-910.35311)"
-           id="g5057">
-          <g
-             style="fill:none;stroke:#000000;stroke-width:3.25031972;stroke-miterlimit:4;stroke-dasharray:none"
-             id="g5059">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5061"
-               d="m 139.37785,1048.2882 0,12.795"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.25031972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.25031972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 139.37785,1088.5759 0,12.7953"
-               id="path5063"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5065"
-               d="m 165.91923,1074.8297 -12.7953,0"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.25031972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.25031972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 125.63177,1074.8297 -12.7953,0"
-               id="path5067"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             style="fill:none;stroke:#000000;stroke-width:4.48852634;stroke-miterlimit:4;stroke-dasharray:none"
-             id="g5069"
-             transform="matrix(0.51204404,-0.51204404,0.51204404,0.51204404,-482.34989,595.83715)">
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.48852634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 139.37785,1044.7464 0,12.0666"
-               id="path5071"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5073"
-               d="m 139.37785,1092.8461 0,12.0668"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.48852634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.48852634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 169.4609,1074.8297 -12.0668,0"
-               id="path5075"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5077"
-               d="m 121.3616,1074.8297 -12.0668,0"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.48852634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-          </g>
-        </g>
-      </g>
-      <g
-         id="g5031"
-         transform="translate(-788.09706,-112.35151)">
-        <g
-           id="g5033"
-           transform="matrix(1.8459723,0,0,1.8459723,-85.215047,-910.35311)">
-          <g
-             id="g5035">
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75842905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 139.37785,1048.2882 0,12.795"
-               id="path5037"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5039"
-               d="m 139.37785,1088.5759 0,12.7953"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 165.91923,1074.8297 -12.7953,0"
-               id="path5041"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5043"
-               d="m 125.63177,1074.8297 -12.7953,0"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-          </g>
-          <g
-             transform="matrix(0.51204404,-0.51204404,0.51204404,0.51204404,-482.34989,595.83715)"
-             id="g5045">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5047"
-               d="m 139.37785,1044.7464 0,12.0666"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.4283011;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 139.37785,1092.8461 0,12.0668"
-               id="path5049"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5051"
-               d="m 169.4609,1074.8297 -12.0668,0"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 121.3616,1074.8297 -12.0668,0"
-               id="path5053"
-               inkscape:connector-curvature="0" />
-          </g>
-        </g>
-      </g>
-    </g>
-    <g
-       transform="matrix(2.0464629,0,0,2.0464629,-198.57886,-2081.2158)"
-       id="g5127"
-       inkscape:export-filename="ui/hotspotpointer.png"
-       inkscape:export-xdpi="100"
-       inkscape:export-ydpi="100">
-      <g
-         transform="matrix(1.8459723,0,0,1.8459723,-85.215047,-910.35311)"
-         id="g5129">
-        <g
-           id="g5131">
-          <path
-             inkscape:connector-curvature="0"
-             id="path5133"
-             d="m 139.37785,1048.2882 0,12.795"
-             style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75842905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-          <path
-             style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-             d="m 139.37785,1088.5759 0,12.7953"
-             id="path5135"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5137"
-             d="m 165.91923,1074.8297 -12.7953,0"
-             style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-          <path
-             style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-             d="m 125.63177,1074.8297 -12.7953,0"
-             id="path5139"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           id="g5141"
-           transform="matrix(0.51204404,-0.51204404,0.51204404,0.51204404,-482.34989,595.83715)">
-          <path
-             style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.4283011;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-             d="m 139.37785,1044.7464 0,12.0666"
-             id="path5143"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5145"
-             d="m 139.37785,1092.8461 0,12.0668"
-             style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-          <path
-             style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-             d="m 169.4609,1074.8297 -12.0668,0"
-             id="path5147"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5149"
-             d="m 121.3616,1074.8297 -12.0668,0"
-             style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-        </g>
-      </g>
-    </g>
-    <g
-       id="g5377"
-       inkscape:export-filename="images/hotspotpointer.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       transform="matrix(2.0464629,0,0,2.0464629,1628.3475,-390.36985)">
-      <g
-         id="g5151"
-         transform="translate(-889.12575,-569.8113)"
-         style="fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none">
-        <g
-           id="g5153"
-           transform="matrix(1.8459723,0,0,1.8459723,-85.215047,-910.35311)"
-           style="fill:none;stroke:#000000;stroke-width:2.16687965;stroke-miterlimit:4;stroke-dasharray:none">
-          <g
-             id="g5155"
-             style="fill:none;stroke:#000000;stroke-width:2.16687965;stroke-miterlimit:4;stroke-dasharray:none">
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.16687965;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 139.37785,1048.2882 0,12.795"
-               id="path5157"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5159"
-               d="m 139.37785,1088.5759 0,12.7953"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.16687965;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.16687965;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 165.91923,1074.8297 -12.7953,0"
-               id="path5161"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5163"
-               d="m 125.63177,1074.8297 -12.7953,0"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.16687965;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-          </g>
-          <g
-             transform="matrix(0.51204404,-0.51204404,0.51204404,0.51204404,-482.34989,595.83715)"
-             id="g5165"
-             style="fill:none;stroke:#000000;stroke-width:2.99235082;stroke-miterlimit:4;stroke-dasharray:none">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5167"
-               d="m 139.37785,1044.7464 0,12.0666"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.99235082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.99235082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 139.37785,1092.8461 0,12.0668"
-               id="path5169"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5171"
-               d="m 169.4609,1074.8297 -12.0668,0"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.99235082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.99235082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 121.3616,1074.8297 -12.0668,0"
-               id="path5173"
-               inkscape:connector-curvature="0" />
-          </g>
-        </g>
-      </g>
-      <g
-         transform="translate(-891.12575,-571.8113)"
-         id="g5175">
-        <g
-           transform="matrix(1.8459723,0,0,1.8459723,-85.215047,-910.35311)"
-           id="g5177">
-          <g
-             id="g5179">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5181"
-               d="m 139.37785,1048.2882 0,12.795"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75842905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 139.37785,1088.5759 0,12.7953"
-               id="path5183"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5185"
-               d="m 165.91923,1074.8297 -12.7953,0"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.75844634;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 125.63177,1074.8297 -12.7953,0"
-               id="path5187"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             id="g5189"
-             transform="matrix(0.51204404,-0.51204404,0.51204404,0.51204404,-482.34989,595.83715)">
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.4283011;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 139.37785,1044.7464 0,12.0666"
-               id="path5191"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5193"
-               d="m 139.37785,1092.8461 0,12.0668"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-            <path
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-               d="m 169.4609,1074.8297 -12.0668,0"
-               id="path5195"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5197"
-               d="m 121.3616,1074.8297 -12.0668,0"
-               style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.42832494;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-          </g>
-        </g>
-      </g>
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:62.85743713px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.05579388px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="177.64467"
-       y="-45.114437"
-       id="text5201"
-       sodipodi:linespacing="125%"
-       transform="scale(1.0062662,0.99377283)"><tspan
-         sodipodi:role="line"
-         id="tspan5203"
-         x="177.64467"
-         y="-45.114437"
-         style="stroke-width:1.05579388">POINTERS</tspan></text>
-    <g
-       id="g5324"
-       inkscape:export-filename="ui/leave4.png"
-       inkscape:export-xdpi="100"
-       inkscape:export-ydpi="100"
-       transform="matrix(3.4416962,0,0,3.4762375,2454.3948,-1305.8684)">
-      <path
-         inkscape:export-ydpi="100"
-         inkscape:export-xdpi="100"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path5284"
-         d="m -574.20971,652.27404 -0.72214,-15.88695 30.32962,0 0,-11.19306 19.13656,19.1366 c 0,0 -19.41875,11.67993 -19.82454,11.44568 -0.40581,-0.23432 0.36107,-10.00145 0.36107,-10.00145 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;filter:url(#filter5310);enable-background:accumulate" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-         d="m -574.20971,652.27404 -0.72214,-15.88695 30.32962,0 0,-11.19306 19.13656,19.1366 c 0,0 -19.41875,11.67993 -19.82454,11.44568 -0.40581,-0.23432 0.36107,-10.00145 0.36107,-10.00145 z"
-         id="path5274"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="ui/leave4.png"
-         inkscape:export-xdpi="100"
-         inkscape:export-ydpi="100" />
-    </g>
-    <g
-       id="g5328"
-       inkscape:export-filename="images/leave.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       transform="matrix(3.8357604,0,0,3.8066758,2667.9662,-1272.3561)">
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-         d="m -570.68648,512.61444 -0.72214,-15.88695 30.32962,0 0,-11.19306 19.13656,19.1366 c 0,0 -19.41875,11.67993 -19.82454,11.44568 -0.40581,-0.23432 0.36107,-10.00145 0.36107,-10.00145 z"
-         id="path5282"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         inkscape:export-xdpi="100"
-         inkscape:export-ydpi="100" />
-      <path
-         inkscape:export-ydpi="100"
-         inkscape:export-xdpi="100"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path5276"
-         d="m -572.68648,510.61444 -0.72214,-15.88695 30.32962,0 0,-11.19306 19.13656,19.1366 c 0,0 -19.41875,11.67993 -19.82454,11.44568 -0.40581,-0.23432 0.36107,-10.00145 0.36107,-10.00145 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-    </g>
-    <g
-       id="g5332"
-       inkscape:export-filename="ui/leave2.png"
-       inkscape:export-xdpi="100"
-       inkscape:export-ydpi="100"
-       transform="matrix(3.5617598,0,0,3.5347533,2518.9137,-932.19141)">
-      <path
-         inkscape:export-ydpi="100"
-         inkscape:export-xdpi="100"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path5280"
-         d="m -575.07806,382.90166 -0.79407,-18.26053 33.35055,0 0,-12.86536 21.04263,21.99571 c 0,0 -21.35292,13.42497 -21.79913,13.15571 -0.44623,-0.26932 0.39703,-11.49571 0.39703,-11.49571 z"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-         d="m -572.68649,381.14061 -0.72214,-15.88695 30.32962,0 0,-11.19306 19.13656,19.1366 c 0,0 -19.41875,11.67993 -19.82454,11.44568 -0.40581,-0.23432 0.36107,-10.00145 0.36107,-10.00145 z"
-         id="path5278"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
-         inkscape:export-xdpi="100"
-         inkscape:export-ydpi="100" />
-    </g>
-    <path
-       inkscape:export-ydpi="73.497986"
-       inkscape:export-xdpi="73.497986"
-       inkscape:export-filename="ui/bubblepointer2.png"
-       inkscape:connector-curvature="0"
-       id="path5314"
-       d="m 1705.7701,937.82614 0,59.61042 42.3169,-59.61042 z"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-       sodipodi:nodetypes="cccc" />
-    <text
-       transform="scale(1.0062662,0.99377283)"
-       sodipodi:linespacing="125%"
-       id="text4921"
-       y="118.94839"
-       x="1415.8615"
-       style="font-style:normal;font-weight:normal;font-size:89.52292633px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.50368452px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="stroke-width:1.50368452"
-         y="118.94839"
-         x="1415.8615"
-         id="tspan4923"
-         sodipodi:role="line">ICONS</tspan></text>
-    <g
-       id="g5090"
-       transform="translate(3.5359567,-3.886188)"
-       inkscape:export-filename="images/circle_button.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <circle
-         transform="matrix(-1.0393108,0,0,-0.9986916,-35.620277,6.7090372)"
-         id="circle4953"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.17700004;fill:#000000;fill-opacity:1;stroke:none;stroke-width:4.33588934;marker:none;filter:url(#filter5028);enable-background:accumulate"
-         cx="-906.11835"
-         cy="-541.91296"
-         r="150"
-         d="m -756.11835,-541.91296 a 150,150 0 0 1 -150,150 150,150 0 0 1 -149.99995,-150 150,150 0 0 1 149.99995,-150 150,150 0 0 1 150,150 z" />
-      <g
-         id="g5097">
-        <rect
-           y="362.54102"
-           x="739.05347"
-           height="341.20163"
-           width="341.20163"
-           id="rect5094"
-           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.17700004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           transform="translate(-3.5359567,3.886188)" />
-        <circle
-           transform="scale(-1,-1)"
-           id="circle4951"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.33588934;marker:none;enable-background:accumulate"
-           cx="-906.11829"
-           cy="-537.02802"
-           r="150" />
-      </g>
-    </g>
-    <g
-       id="g5032"
-       transform="matrix(1.6179987,0,0,1.6179987,987.34994,-2662.8353)"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       inkscape:export-filename="images/lookat.png">
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-         d="m 442.86429,1754.1491 c 10.78295,-2.0415 22.63506,-3.5484 31.72963,-6.4341 17.41543,4.5145 34.8732,6.2578 52.61828,9.7833 l -0.79324,5.6408 c -13.94799,-3.6905 -30.86751,-7.0314 -52.79456,-9.7833 -14.53933,2.2933 -27.21975,5.5161 -39.92644,8.7257 z"
-         id="path5034"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
-         d="m 469.53272,1756.2959 c -12.32701,5.3522 -23.74909,10.1265 -35.83835,9.8143 l -0.76134,5.3571 c 8.03045,0.5053 15.01189,3.1755 19.07502,11.9461 0,0 -2.79705,8.0239 -3.50216,9.7867 -0.40755,1.0188 10.0109,4.9058 17.9261,9.2745 5.7789,3.1895 9.70362,7.3365 9.70362,7.3365 l -14.9361,-26.7161 c 30.24932,16.4667 62.28535,27.4255 70.27709,9.4129 4.42574,-9.9751 -6.88933,-18.2849 -10.71262,-10.1604 0,0 5.16501,-2.3834 6.00766,1.4396 4.44189,20.1524 -29.73454,11.8551 -43.36869,0.2354 -1.49294,-1.2724 46.44174,-11.7994 46.44174,-10.1189 l 1.61958,-5.8001 c -18.13025,4.301 -40.95965,-10.4622 -61.93155,-11.8076 z m 2.9623,9.4544 c 11.19809,-0.067 24.28852,1.3987 36.94576,6.0077 0.93698,0.3412 -27.67125,6.6029 -27.67125,6.6029 l -32.91758,-9.9667 c 5.34462,-1.3315 13.7624,-2.5851 23.64307,-2.6439 z"
-         id="path5036"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccssccscsscccssccs" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate"
-         d="m 470.73702,1761.8052 c -0.83593,1.3734 -1.3012,2.9024 -1.3012,4.5265 0,5.8124 5.99006,10.5342 13.38574,10.5342 7.39568,0 13.38574,-4.7218 13.38574,-10.5342 0,-0.3491 -0.027,-0.684 -0.0692,-1.0244 -7.51389,-0.9914 -19.42592,-2.5902 -25.40108,-3.5021 z"
-         id="path5038"
-         inkscape:connector-curvature="0" />
-    </g>
-    <ellipse
-       ry="178.28075"
-       rx="173.90331"
-       cy="549.35583"
-       cx="353.77585"
-       transform="matrix(0.38589124,0,0,0.37641613,1635.0402,166.76077)"
-       id="ellipse5040"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d9d;stroke-width:4.13543987;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       clip-path="url(#clipPath5598-8-0-5)"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       inkscape:export-filename="images/pickup.png" />
-    <g
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="images/talkto.png"
-       transform="matrix(1.095589,0,0,1.095589,605.39365,-445.82119)"
-       id="g5042">
-      <rect
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-         id="rect5044"
-         width="114.06322"
-         height="69.5979"
-         x="1009.1696"
-         y="853.23486"
-         rx="25"
-         ry="25" />
-      <path
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
-         d="m 1051.7016,917.03294 9.6664,30.93239 13.5329,-36.73222 z"
-         id="path5046"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g5072"
-       transform="matrix(1.0877031,0,0,1.0877031,-119.2331,1.463599)">
-      <g
-         style="stroke:none"
-         transform="matrix(0,2.0151222,-2.0151222,0,3187.6188,-1189.7262)"
-         id="g5050">
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.69999981;marker:none;enable-background:accumulate"
-           id="rect5052"
-           width="17.496616"
-           height="60.558113"
-           x="743.29565"
-           y="793.34363" />
-        <rect
-           y="793.34363"
-           x="786.35712"
-           height="60.558113"
-           width="17.496616"
-           id="rect5054"
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.69999981;marker:none;enable-background:accumulate" />
-        <rect
-           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.69999981;marker:none;enable-background:accumulate"
-           id="rect5056"
-           width="17.496616"
-           height="60.558113"
-           x="765.16809"
-           y="793.34363" />
-      </g>
-      <rect
-         transform="matrix(0,1,-1,0,0,0)"
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:none;stroke-width:1.51912594;marker:none;enable-background:accumulate"
-         id="rect5058"
-         width="150"
-         height="150"
-         x="294.12137"
-         y="-1602.9185" />
-    </g>
-    <ellipse
-       ry="71.390732"
-       rx="71.379379"
-       cy="590.57764"
-       cx="1356.749"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:5.29951572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="ellipse5086"
-       inkscape:export-xdpi="90.23893"
-       inkscape:export-ydpi="90.23893"
-       inkscape:export-filename="images/circle.png" />
-    <g
-       id="g4513"
-       inkscape:export-filename="images/inventory.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90">
-      <g
-         transform="matrix(1.6889701,0,0,1.6889701,648.56242,-1578.0385)"
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="images/inventory.png"
-         clip-path="url(#clipPath4578)"
-         id="g4548">
-        <rect
-           style="fill:#000000;fill-opacity:0.23529412;stroke:none;filter:url(#filter4025)"
-           id="rect3973"
-           width="65.697525"
-           height="39.037659"
-           x="495.07474"
-           y="1042.5717"
-           rx="5.5319223"
-           ry="5.5319223"
-           transform="matrix(1.3934058,0,0,1.3934058,-207.68815,-416.30595)" />
-        <path
-           style="fill:#000000;fill-opacity:0.23529412;stroke:none;filter:url(#filter4029)"
-           d="m 518.21861,1034.8109 c -1.08868,0 -1.96229,0.8735 -1.96229,1.9622 l 0,9.9386 c 0,1.0886 0.87361,1.9621 1.96229,1.9621 l 19.40461,0 c 1.08867,0 1.96227,-0.8735 1.96227,-1.9621 l 0,-9.9386 c 0,-1.0887 -0.8736,-1.9622 -1.96227,-1.9622 l -19.40461,0 z m 2.90706,2.0711 13.59049,0 c 0.76262,0 1.38086,0.6182 1.38086,1.381 l 0,6.9587 c 0,0.7626 -0.61824,1.3809 -1.38086,1.3809 l -13.59049,0 c -0.76264,0 -1.38087,-0.6183 -1.38087,-1.3809 l 0,-6.9587 c 0,-0.7628 0.61823,-1.381 1.38087,-1.381 z"
-           id="path3975"
-           inkscape:connector-curvature="0"
-           transform="matrix(1.3934058,0,0,1.3934058,-207.68815,-416.30595)" />
-        <rect
-           ry="6.6437721"
-           rx="6.6437721"
-           y="1039.4285"
-           x="488.4725"
-           height="46.883755"
-           width="78.901939"
-           id="rect3969"
-           style="fill:#ffffff;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path3971"
-           d="m 516.26803,1030.1079 c -1.30749,0 -2.35667,1.0491 -2.35667,2.3566 l 0,11.9361 c 0,1.3074 1.04918,2.3565 2.35667,2.3565 l 23.30472,0 c 1.30747,0 2.35665,-1.0491 2.35665,-2.3565 l 0,-11.9361 c 0,-1.3075 -1.04918,-2.3566 -2.35665,-2.3566 l -23.30472,0 z m 3.49135,2.4873 16.32202,0 c 0.91591,0 1.65839,0.7426 1.65839,1.6587 l 0,8.3573 c 0,0.9159 -0.74248,1.6584 -1.65839,1.6584 l -16.32202,0 c -0.91591,0 -1.65841,-0.7425 -1.65841,-1.6584 l 0,-8.3573 c 0,-0.9161 0.7425,-1.6587 1.65841,-1.6587 z"
-           style="fill:#ffffff;stroke:none" />
-      </g>
-      <rect
-         ry="8.9077101"
-         rx="7.5856199"
-         y="125.67384"
-         x="1454.6765"
-         height="170.601"
-         width="170.601"
-         id="rect4510"
-         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.17700004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-    </g>
-    <rect
-       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#7f7f7f;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect5363"
-       width="27.828896"
-       height="27.828896"
-       x="1660.2157"
-       y="-262.49307"
-       inkscape:export-filename="images/border_rect4.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <rect
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="images/border_rect2.png"
-       y="-264.46313"
-       x="1622.165"
-       height="29.769049"
-       width="29.769049"
-       id="rect5365"
-       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#7f7f7f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-    <rect
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="images/border_black_rect4.png"
-       y="-300.10809"
-       x="1660.7013"
-       height="26.687319"
-       width="26.687319"
-       id="rect5367"
-       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-    <circle
-       transform="scale(-1,-1)"
-       id="circle5369"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#777777;stroke-width:12;marker:none;enable-background:accumulate;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       cx="-1237.8591"
-       cy="-867.97528"
-       r="150"
-       inkscape:export-filename="images/circle_border.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-</svg>
diff --git a/adventure-composer/build.gradle b/adventure-composer/build.gradle
deleted file mode 100644
index 1fd5fcf4e..000000000
--- a/adventure-composer/build.gradle
+++ /dev/null
@@ -1,47 +0,0 @@
-apply plugin: "java"
-apply plugin: 'application'
-
-    group = 'com.bladecoder.engineeditor'
-
-mainClassName = 'com.bladecoder.engineeditor.Main'
-
-// java
-    sourceCompatibility = 1.7
-    [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-
-jar {
-	manifest.attributes += [
-			'github': 'https://github.com/bladecoder/bladecoder-adventure-engine/',
-			'license': 'Apache-2.0',
-			'group': project.group,
-			'version': project.version,
-			'libgdx': gdxVersion,
-			'java': targetCompatibility,
-			'timestamp': System.currentTimeMillis()
-	]
-}
-
-    javadoc {
-	title = "Adventure Composer"
-	options {
-		memberLevel = JavadocMemberLevel.PUBLIC
-		author true
-		setUse true
-    		encoding "UTF-8"
-	}
-    }
-
-dependencies {
-  compile "com.badlogicgames.gdx:gdx:$gdxVersion"
-  compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
-  compile "com.badlogicgames.gdx:gdx-tools:$gdxVersion"
-  compile fileTree(dir: 'libs', include: '*.jar')
-  compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
-  compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
-  compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
-  compile "commons-io:commons-io:2.1"
-  compile "com.badlogicgames.packr:packr:1.2"
-  
-  //compile "com.bladecoder.engine:blade-engine:$bladeEngineVersion"
-  compile project(":blade-engine")
-}
diff --git a/adventure-composer/dist.ant.properties b/adventure-composer/dist.ant.properties
deleted file mode 100644
index be43df3ec..000000000
--- a/adventure-composer/dist.ant.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-name=AdventureComposer
-main.class=com.bladecoder.engineeditor.ui.Main
-version=0.1.0
-icon=./package-files/icon.ico
\ No newline at end of file
diff --git a/adventure-composer/dist.ant.xml b/adventure-composer/dist.ant.xml
deleted file mode 100644
index 1987e359a..000000000
--- a/adventure-composer/dist.ant.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="dist" name="Create dist packages for Desktop">
-	<property file="dist.ant.properties"/> 
-	<property name="jres.dir" location="../engine-dist"/>
-	<property name="launch4j.dir" location="${jres.dir}/launch4j" />
-
-	<target name="clean">
-	    <mkdir dir="dist"/>
-	    
-		<delete>
-			<fileset dir="dist" includes="**/*.zip" />
-			<fileset dir="dist" includes="**/*.jar" />
-			<fileset dir="dist" includes="**/*.exe" />
-			<fileset dir="dist" includes="**/*.sh" />
-			<fileset dir="dist" includes="**/*.tgz" />
-		</delete>
-	</target>
-
-	<target name="jar" depends="clean">
-		<jar destfile="dist/${name}.jar" filesetmanifest="mergewithoutmain">
-			<manifest>
-				<attribute name="Main-Class" value="${main.class}" />
-				<attribute name="Class-Path" value="." />
-				<attribute name="Version" value="${version}" />
-			</manifest>
-			
-			<fileset dir="./bin"/>
-            <zipfileset excludes="META-INF/*.SF" src="./lib/commons-io-2.1.jar"/>
-            <fileset dir="../engine/bin"/>
-            <zipfileset excludes="META-INF/*.SF" src="../engine/libs/gdx.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../engine/libs/tween-engine-api.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="../engine/libs/gdx-freetype.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="./lib/gdx-backend-lwjgl-natives.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="./lib/gdx-backend-lwjgl.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="./lib/gdx-freetype-natives.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="./lib/gdx-natives.jar"/>
-            <zipfileset excludes="META-INF/*.SF" src="./lib/gdx-tools.jar"/>
-		</jar>
-	</target>
-
-	<target name="exe" depends="jar">
-		<taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask"
-			classpath="${launch4j.dir}/launch4j.jar
-		    :${launch4j.dir}/lib/xstream.jar" />
-		<launch4j>
-			<config headerType="gui" outfile="dist/${name}.exe" errTitle="${name}"
-				chdir="." icon="${icon}" jarPath="${name}.jar"
-				dontWrapJar="true">
-				<jre minVersion="1.6.0" path="jre-win">
-<!-- 					<opt>-server</opt> -->
-				</jre>
-			</config>
-		</launch4j>
-	</target>
-
-	<target name="win" depends="exe">
-		<zip destfile="dist/${name}-win.zip">
-		    <zipfileset file="dist/${name}.exe" prefix="${name}/"/>
-			<zipfileset file="dist/${name}.jar"  prefix="${name}/"/>
-			<zipfileset dir="${jres.dir}/jre-win" prefix="${name}/jre-win"/>
-		</zip>
-	</target>
-
-	<target name="dist" depends="exe">
-		<echo file="dist/${name}-linux64.sh" append="false">#!/bin/sh
-cd "`dirname \"$0\"`"
-./jre-linux64/bin/java -server -Xmx1024M -jar ${name}.jar "${@}"
-		</echo>
-		
-		<echo file="dist/${name}-linux32.sh" append="false">#!/bin/sh
-cd "`dirname \"$0\"`"
-./jre-linux32/bin/java -server -Xmx1024M -jar ${name}.jar "${@}"
-		</echo> 	    
-			    
-		<tar destfile="dist/${name}.tgz" compression="gzip">
-			<tarfileset file="dist/${name}-linux64.sh" filemode="755" prefix="${name}/"/>
-			<tarfileset file="dist/${name}-linux32.sh" filemode="755" prefix="${name}/"/>
-			<tarfileset file="dist/${name}.jar" filemode="755" prefix="${name}/"/>
-					
-			<mappedresources>
-				<fileset dir="${jres.dir}/jre-linux64" excludes="bin/java"/>
-				<globmapper from="*" to="${name}/jre-linux64/*" />
-			</mappedresources>
-			
-			<tarfileset file="${jres.dir}/jre-linux64/bin/java" filemode="755" prefix="${name}/jre-linux64/bin/"/>
-			
-			<mappedresources>
-				<fileset dir="${jres.dir}/jre-linux32" excludes="bin/java"/>
-				<globmapper from="*" to="${name}/jre-linux32/*" />
-			</mappedresources>
-			
-			<tarfileset file="${jres.dir}/jre-linux32/bin/java" filemode="755" prefix="${name}/jre-linux32/bin/"/>
-			
-			<tarfileset file="dist/${name}.exe" prefix="${name}/"/>
-			<tarfileset dir="${jres.dir}/jre-win" prefix="${name}/jre-win"/>
-			
-			<tarfileset dir="package-files" prefix="${name}/package-files"/>			
-		</tar>
-		
-		<delete file="dist/${name}-linux32.sh"/>
-		<delete file="dist/${name}-linux64.sh"/>
-		<delete file="dist/${name}.exe"/>
-	</target>
-</project>
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/Editor.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/Editor.java
deleted file mode 100644
index c759eff90..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/Editor.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.xml.transform.TransformerException;
-
-import com.badlogic.gdx.ApplicationListener;
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Input.Keys;
-import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
-import com.badlogic.gdx.scenes.scene2d.ui.Image;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.SplitPane;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.utils.Align;
-import com.badlogic.gdx.utils.Scaling;
-import com.badlogic.gdx.utils.viewport.ScreenViewport;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.scneditor.ScnEditor;
-import com.bladecoder.engineeditor.ui.ActorPanel;
-import com.bladecoder.engineeditor.ui.AssetPanel;
-import com.bladecoder.engineeditor.ui.ProjectPanel;
-import com.bladecoder.engineeditor.ui.ProjectToolbar;
-import com.bladecoder.engineeditor.ui.ScenePanel;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-import com.bladecoder.engineeditor.utils.Message;
-
-//TODO: Show COPYRIGHT_STR + VERSION_STR
-//TODO: Set TITLE in window bar. Set '*' in the title when modified
-//TODO: Query if save project when exit
-
-public class Editor implements ApplicationListener {
-	public static final String VERSION_STR = "0.1.0 (Beta)";
-	public static final String COPYRIGHT_STR = "2013 - Rafael García\nhttp://bladecoder.blogspot.com";
-	public static final String TITLE = "Adventure Composer";	
-	
-//	public static final String SKIN = "skin/HoloSkin/Holo-dark-ldpi.json";
-	// public static final String SKIN = "skin/uiskin.json";
-	public static final String SKIN = "skin/BladeSkin/BladeSkin-ldpi.json";
-
-	Stage stage;
-	ScnEditor scnEditor;
-	Skin skin;
-
-	@Override
-	public void create() {
-		skin = new Skin(Gdx.files.internal(SKIN));
-
-		EditorLogger.setDebug();
-		EditorLogger.debug("CREATE");
-		Ctx.project = new Project();
-		Ctx.msg = new Message(skin);
-		Ctx.assetManager = new EditorAssetManager();
-
-		scnEditor = new ScnEditor(skin);
-
-		/*** STAGE SETUP ***/
-		stage = new Stage(new ScreenViewport());
-		Gdx.input.setInputProcessor(stage);
-
-		// RIGHT PANEL
-		ScenePanel scenePanel = new ScenePanel(skin);
-		ActorPanel actorPanel = new ActorPanel(skin);
-
-		Table rightPanel = new Table();
-		rightPanel.top().left();
-		rightPanel.add(scenePanel).expand().fill();
-		rightPanel.row();
-		rightPanel.add(actorPanel).expand().fill();
-
-		SplitPane splitPaneRight = new SplitPane(scnEditor, rightPanel,
-				false, skin);
-
-		// LEFT PANEL
-		ProjectPanel projectPanel = new ProjectPanel(skin);
-		AssetPanel assetPanel = new AssetPanel(skin);
-		Image img = new Image(Ctx.assetManager.getIcon("title"));
-		img.setScaling(Scaling.none);
-		img.setAlign(Align.left);
-
-		Table leftPanel = new Table();
-		leftPanel.top().left().padLeft(10);
-		leftPanel.add(img).expandX().fill().padBottom(20).padTop(20).padLeft(20);
-		leftPanel.row();
-		leftPanel.add(new ProjectToolbar(skin)).expandX().fill();
-		leftPanel.row();
-		leftPanel.add(projectPanel).expand().fill();
-		leftPanel.row();
-		leftPanel.add(assetPanel).expand().fill();
-
-		SplitPane splitPaneLeft = new SplitPane(leftPanel, splitPaneRight,
-				false, skin);
-		splitPaneLeft.setFillParent(true);
-		splitPaneLeft.setSplitAmount(0.3f);
-		stage.addActor(splitPaneLeft);
-
-		// LOAD LAST OPEN PROJECT
-		String lastProject = Ctx.project.getConfig().getProperty(
-				Project.LAST_PROJECT_PROP, "");
-
-		if (!lastProject.isEmpty() && new File(lastProject).exists()) {
-			try {
-				EditorLogger.debug("Loading last project: " + lastProject);
-				Ctx.project.loadProject(new File(lastProject));
-			} catch (Exception e) {
-				EditorLogger.debug("Error loading last project: "
-						+ e.getMessage());
-				Ctx.project.closeProject();
-				e.printStackTrace();
-			}
-		}
-		
-		stage.setScrollFocus(scnEditor.getScnWidget());
-	}
-
-	@Override
-	public void render() {
-		Gdx.gl.glClearColor(0, 0, 0, 1);
-		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-
-		stage.act(Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f));
-		stage.draw();
-//		Table.drawDebug(stage);
-	}
-
-	@Override
-	public void resize(int width, int height) {
-		EditorLogger.debug("RESIZE - w:" + width + " h:" + height);
-
-		stage.getViewport().update(width, height, true);
-	}
-
-	@Override
-	public void pause() {
-
-	}
-
-	@Override
-	public void resume() {
-
-	}
-
-	@Override
-	public void dispose() {
-		scnEditor.dispose();
-		stage.dispose();
-		
-		Ctx.project.saveConfig();
-		
-//		try {
-//			Ctx.project.saveProject();
-//		} catch (Exception ex) {
-//			System.out.println("Something went wrong while saving the project.\n");
-//			ex.printStackTrace();
-//		}
-	}
-
-	public void exit() {
-		if (Ctx.project.getWorld().isModified()
-				|| Ctx.project.getSelectedChapter().isModified()) {
-			new Dialog("Save Project", skin) {
-				protected void result(Object object) {
-					if (((Boolean) object).booleanValue()) {
-						try {
-							Ctx.project.saveProject();
-						} catch (TransformerException | IOException e1) {
-							String msg = "Something went wrong while saving the actor.\n\n"
-									+ e1.getClass().getSimpleName()
-									+ " - "
-									+ e1.getMessage();
-							Ctx.msg.show(getStage(), msg, 2);
-
-							e1.printStackTrace();
-						}
-					}
-
-					((Main)Gdx.app).exitSaved();	
-				}
-			}.text("Save changes to project?").button("Yes", true)
-					.button("No", false).key(Keys.ENTER, true)
-					.key(Keys.ESCAPE, false).show(stage);
-		} else {
-			((Main)Gdx.app).exitSaved();	
-		}
-	
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/Main.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/Main.java
deleted file mode 100644
index f12e4136d..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/Main.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor;
-
-import java.io.File;
-
-import com.badlogic.gdx.Files.FileType;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
-
-public class Main extends LwjglApplication {
-
-	public static void main(final String[] args) {
-		LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration();
-
-		cfg.title = "Adventure Composer";
-		cfg.width = 1920 / 2;
-		cfg.height = 1080 / 2;
-
-		cfg.resizable = true;
-		// cfg.samples = 2;
-		// cfg.useGL30 = true;
-
-		if (Main.class.getResource("/res/images/ic_app64.png") != null)
-			cfg.addIcon("images/ic_app64.png", FileType.Internal);
-
-		if (Main.class.getResource("/res/images/ic_app32.png") != null)
-			cfg.addIcon("images/ic_app32.png", FileType.Internal);
-
-		if (Main.class.getResource("/res/images/ic_app16.png") != null)
-			cfg.addIcon("images/ic_app16.png", FileType.Internal);
-
-		parseArgs(args);
-
-		new Main(new Editor(), cfg);
-	}
-
-	private static void parseArgs(String[] args) {
-		for (int i = 1; i < args.length; i++) {
-			if (args[i - 1].equals("-f")) {
-				try {
-					File file = new File(args[i]).getCanonicalFile();
-					Ctx.project.loadProject(file);
-				} catch (Exception ex) {
-					ex.printStackTrace();
-				}
-			}
-		}
-	}
-	
-	public Main(Editor editor, LwjglApplicationConfiguration cfg) {
-		super(editor,cfg);
-	}
-	
-	@Override
-	public void exit() {
-		((Editor) listener).exit();
-	}
-	
-	public void exitSaved() {
-		super.exit();
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/BaseDocument.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/BaseDocument.java
deleted file mode 100644
index 260b9c841..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/BaseDocument.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.model;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Properties;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import com.bladecoder.engine.util.EngineLogger;
-
-public abstract class BaseDocument extends PropertyChange {
-	public static final String NOTIFY_ELEMENT_DELETED = "ELEMENT_DELETED";
-	public static final String NOTIFY_ELEMENT_CREATED = "ELEMENT_CREATED";
-	
-	public static final String NOTIFY_DOCUMENT_SAVED = "DOCUMENT_SAVED";
-
-	Document doc;
-	private String filename;
-	protected String modelPath;
-
-	protected Properties i18n;
-
-	protected boolean modified = false;
-
-	public abstract String getRootTag();
-
-	public void create() throws ParserConfigurationException {
-		DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-		DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-
-		doc = dBuilder.newDocument();
-
-		Element rootElement = doc.createElement(getRootTag());
-
-		doc.appendChild(rootElement);
-
-		i18n = new Properties();
-
-		modified = true;
-		firePropertyChange();
-	}
-
-	protected String getI18NFilename() {
-		String name = getAbsoluteName();
-
-		return name.substring(0, name.lastIndexOf('.')) + ".properties";
-	}
-
-	private void loadI18N() {
-		String i18nFilename = getI18NFilename();
-
-		i18n = new Properties();
-		try {
-			i18n.load(new FileInputStream(i18nFilename));
-			;
-		} catch (IOException e) {
-			EngineLogger.error("ERROR LOADING BUNDLE: " + i18nFilename);
-		}
-	}
-
-	public String getTranslation(String key) {
-		if (key.isEmpty() || key.charAt(0) != '@' || i18n == null)
-			return key;
-
-		return i18n.getProperty(key.substring(1), key);
-	}
-
-	public void setTranslation(String key, String value) {
-		i18n.setProperty(key, value);
-	}
-
-	private void saveI18N() {
-		String i18nFilename = getI18NFilename();
-
-		try {
-			i18n.store(new FileOutputStream(i18nFilename), filename);
-		} catch (IOException e) {
-			EngineLogger.error("ERROR WRITING BUNDLE: " + i18nFilename);
-		}
-	}
-
-	public void load() throws ParserConfigurationException, SAXException, IOException {
-		File fXmlFile = new File(getAbsoluteName());
-		DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-		DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-		doc = dBuilder.parse(fXmlFile);
-
-		loadI18N();
-
-		modified = false;
-	}
-
-	public void save() throws TransformerException, FileNotFoundException {
-
-		if (!modified)
-			return;
-
-		TransformerFactory transformerFactory = TransformerFactory.newInstance();
-		Transformer transformer = transformerFactory.newTransformer();
-		transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-		DOMSource source = new DOMSource(doc);
-		StreamResult result = new StreamResult(new FileOutputStream(getAbsoluteName()));
-		transformer.transform(source, result);
-
-		saveI18N();
-
-		modified = false;
-		firePropertyChange(NOTIFY_DOCUMENT_SAVED);
-	}
-
-	public boolean isModified() {
-		return modified;
-	}
-
-	public String getFilename() {
-		return filename;
-	}
-
-	public void setFilename(String filename) {
-		this.filename = filename;
-	}
-
-	public String getAbsoluteName() {
-		return modelPath + "/" + filename;
-	}
-	
-	public void setModelPath(String p) {
-		modelPath = p;
-	}
-
-	public String getRootAttr(String attr) {
-		return doc.getDocumentElement().getAttribute(attr);
-	}
-
-	public String getElementAttr(String tag, String attr) {
-		NodeList nl = doc.getDocumentElement().getElementsByTagName(tag);
-
-		if (nl.getLength() == 0)
-			return "";
-		else
-			return ((Element) nl.item(0)).getAttribute(attr);
-	}
-
-	public void setElementAttr(String tag, String attr, String value) {
-		NodeList nl = doc.getDocumentElement().getElementsByTagName(tag);
-
-		Element e = null;
-
-		if (nl.getLength() == 0) {
-			e = doc.createElement(tag);
-
-			doc.getDocumentElement().appendChild(e);
-		} else {
-			e = (Element) nl.item(0);
-		}
-
-		e.setAttribute(attr, value);
-		modified = true;
-	}
-
-	public void setModified(boolean b) {
-		modified = b;
-		firePropertyChange(DOCUMENT_CHANGED, null, doc.getDocumentElement());
-	}
-
-	public Element getRootElement() {
-		return doc.getDocumentElement();
-	}
-
-	public Document getDocument() {
-		return doc;
-	}
-
-	public Element cloneNode(Element parent, Element e) {
-		Element cloned;
-
-		if (e.getOwnerDocument() != doc) {
-			cloned = (Element) doc.importNode(e, true);
-		} else {
-			cloned = (Element) e.cloneNode(true);
-		}
-		
-		parent.appendChild(cloned);
-		
-		if (cloned.getAttribute("id") != null && !cloned.getAttribute("id").isEmpty()) {
-			cloned.setAttribute("id", getCheckedId(cloned, cloned.getAttribute("id")));
-		}
-		
-		setModified(cloned);
-
-		return cloned;
-	}
-
-	public void setModified(Element e) {
-		setModified(e.getTagName(), e);
-	}
-
-	public void setModified(String property, Element e) {
-		modified = true;
-		firePropertyChange(property, null, e);
-	}
-
-	public String getRootAttr(Element e, String a) {
-		return e.getAttribute(a);
-	}
-
-	public void setRootAttr(Element e, String attr, String value) {
-		String old = e.getAttribute(attr);
-
-		if (value != null && !value.isEmpty())
-			e.setAttribute(attr, value);
-		else
-			e.removeAttribute(attr);
-
-		modified = true;
-		firePropertyChange(attr, old, e);
-	}
-	
-	public void setRootAttr(String attr, String value) {
-		String old = getRootAttr(getRootElement(), attr);
-
-		if (value != null && !value.isEmpty())
-			getRootElement().setAttribute(attr, value);
-		else
-			getRootElement().removeAttribute(attr);
-
-		modified = true;
-		firePropertyChange(attr, old, getRootElement());
-	}
-
-	public void deleteElement(Element e) {
-		e.getParentNode().removeChild(e);
-
-		modified = true;
-		firePropertyChange(NOTIFY_ELEMENT_DELETED, e);
-	}
-
-	public Element createVerb(Element e, String id, String state, String target) {
-		Element ev = doc.createElement("verb");
-		ev.setAttribute("id", id);
-		if (state != null && !state.isEmpty())
-			ev.setAttribute("state", state);
-		if (target != null && !target.isEmpty())
-			ev.setAttribute("target", target);
-
-		e.appendChild(ev);
-
-		modified = true;
-		firePropertyChange("verb", null, e);
-
-		return ev;
-	}
-
-	public Element createAction(Element verb, String action, String actor,
-			HashMap<String, String> params) {
-		Element e = doc.createElement(action);
-		if (actor != null && !actor.isEmpty())
-			e.setAttribute("actor", actor);
-
-		if (params != null) {
-			for (String k : params.keySet()) {
-				String v = params.get(k);
-				e.setAttribute(k, v);
-			}
-		}
-
-		verb.appendChild(e);
-
-		modified = true;
-		firePropertyChange("action", null, e);
-
-		return e;
-	}
-
-	public String getType(Element e) {
-		return e.getAttribute("type");
-	}
-
-	public NodeList getVerbs(Element e) {
-		// return e.getElementsByTagName("verb");
-
-		XPathFactory xpathFactory = XPathFactory.newInstance();
-		XPath xpath = xpathFactory.newXPath();
-
-		try {
-			return (NodeList) xpath.evaluate("./verb", e, XPathConstants.NODESET);
-		} catch (XPathExpressionException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		}
-
-		return null;
-	}
-
-	public NodeList getChildrenByTag(Element e, String tag) {
-
-		XPathFactory xpathFactory = XPathFactory.newInstance();
-		XPath xpath = xpathFactory.newXPath();
-
-		try {
-			return (NodeList) xpath.evaluate("./" + tag, e, XPathConstants.NODESET);
-		} catch (XPathExpressionException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		}
-
-		return null;
-	}
-
-	public Element getElement() {
-		return doc.getDocumentElement();
-	}
-
-	/**
-	 * Sets the element id avoiding duplicated ids
-	 * 
-	 * @param e
-	 * @param id
-	 */
-	public void setId(Element e, String id) {
-		String idChecked = getCheckedId(e, id);
-
-		setRootAttr(e, "id", idChecked);
-	}
-	
-	public String getCheckedId(Element e, String id) {
-		String idChecked = id;
-
-		if (e.getParentNode() instanceof Element) {
-
-			NodeList nl = ((Element) e.getParentNode()).getElementsByTagName(e.getTagName());
-			boolean checked = false;
-
-			int i = 1;
-
-			while (!checked) {
-				checked = true;
-
-				for (int j = 0; j < nl.getLength(); j++) {
-					Element e2 = (Element) nl.item(j);
-					if (e2.getAttribute("id").equals(idChecked) && e != e2) {
-						i++;
-						idChecked = id + i;
-						checked = false;
-						break;
-					}
-				}
-			}
-		}
-		
-		return idChecked;
-	}
-
-	public String getId(Element e) {
-		return e.getAttribute("id");
-	}
-
-	public Element createElement(Element parent, String type) {
-		Element es = doc.createElement(type);
-		parent.appendChild(es);
-
-		return es;
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/ChapterDocument.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/ChapterDocument.java
deleted file mode 100644
index 8d211db61..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/ChapterDocument.java
+++ /dev/null
@@ -1,648 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.model;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import com.badlogic.gdx.math.Polygon;
-import com.badlogic.gdx.math.Vector2;
-import com.bladecoder.engine.actions.Param;
-import com.bladecoder.engine.anim.AtlasFrameAnimation;
-import com.bladecoder.engine.anim.FrameAnimation;
-import com.bladecoder.engine.anim.Tween;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.AtlasRenderer;
-import com.bladecoder.engine.model.ImageRenderer;
-import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.model.SpineRenderer;
-import com.bladecoder.engine.model.Sprite3DRenderer;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.SpriteRenderer;
-import com.bladecoder.engine.model.BaseActor.ActorLayer;
-import com.bladecoder.engine.model.SpriteActor.DepthType;
-import com.bladecoder.engine.polygonalpathfinder.PolygonalNavGraph;
-import com.bladecoder.engine.util.EngineLogger;
-
-public class ChapterDocument extends BaseDocument {
-
-	public static final String NO_RENDERER_ACTOR_TYPE = "no_renderer";
-	public static final String ATLAS_ACTOR_TYPE = "atlas";
-	public static final String SPRITE3D_ACTOR_TYPE = "3d";
-	public static final String SPINE_ACTOR_TYPE = "spine";
-	public static final String IMAGE_ACTOR_TYPE = "image";
-	
-	public static final String BACKGROUND_LAYER = "background";
-	public static final String FOREGROUND_LAYER = "foreground";
-	public static final String DYNAMIC_LAYER = "dynamic";
-
-	public static final String ACTOR_TYPES[] = { NO_RENDERER_ACTOR_TYPE,
-			ATLAS_ACTOR_TYPE, SPINE_ACTOR_TYPE, SPRITE3D_ACTOR_TYPE, IMAGE_ACTOR_TYPE};
-	
-	public static final String ACTOR_LAYERS[] = { BACKGROUND_LAYER,
-		FOREGROUND_LAYER, DYNAMIC_LAYER};
-
-	public static final String ANIMATION_TYPES[] = { "no_repeat", "repeat",
-			"yoyo", "reverse" };
-
-	public ChapterDocument(String modelPath) {
-		super();
-		setModelPath(modelPath);
-	}
-
-	@Override
-	public String getRootTag() {
-		return "chapter";
-	}
-
-	public void setFilenameFromId() {
-		setFilename(getId() + ".chapter");
-	}
-
-	public Element getActor(Element scn, String id) {
-		NodeList actorsNL = getActors(scn);
-		for (int j = 0; j < actorsNL.getLength(); j++) {
-			Element e = (Element) actorsNL.item(j);
-			if (id.equals(e.getAttribute("id"))) {
-				return e;
-			}
-		}
-
-		return null;
-	}
-
-	public NodeList getActors(Element scn) {
-		NodeList actors = scn
-				.getElementsByTagName("actor");
-
-		return actors;
-	}
-	
-	public NodeList getActions(Element verb) {
-		NodeList actions = verb
-				.getElementsByTagName("action");
-
-		return actions;
-	}
-	
-	public NodeList getScenes() {
-		NodeList s = getElement()
-				.getElementsByTagName("scene");
-
-		return s;
-	}
-
-	public void addActor(Element scn, Element e) {
-
-		scn.appendChild(e);
-
-		modified = true;
-		firePropertyChange(ChapterDocument.NOTIFY_ELEMENT_CREATED, e);
-	}
-
-	public void removeActor(Element scn, String id) {
-		Element e = getActor(scn, id);
-
-		deleteElement(e);
-	}
-
-	public Element getPlayer(Element scn) {
-		NodeList nl = scn.getElementsByTagName("player");
-
-		if (nl.getLength() == 0)
-			return null;
-		else
-			return (Element) nl.item(0);
-	}
-
-	public void setRootAttr(Element e, String attr, String value) {
-
-		String old = e.getAttribute(attr);
-
-		if (value != null && !value.isEmpty())
-			e.setAttribute(attr, value);
-		else
-			e.removeAttribute(attr);
-
-		modified = true;
-		firePropertyChange(attr, old, value);
-	}
-
-	public String getMusic(Element scn) {
-		return scn.getAttribute("music");
-	}
-
-	public void setMusic(Element scn, String filename, String loopMusic,
-			String initialMusicDelay, String repeatMusicDelay) {
-		if (filename != null && !filename.isEmpty())
-			scn.setAttribute("music", filename);
-		else
-			scn.removeAttribute("music");
-
-		if (loopMusic != null && !loopMusic.isEmpty())
-			scn.setAttribute("loop_music", loopMusic);
-		else
-			scn.removeAttribute("loop_music");
-
-		if (initialMusicDelay != null && !initialMusicDelay.isEmpty())
-			scn.setAttribute("initial_music_delay",
-					initialMusicDelay);
-		else
-			scn.removeAttribute("initial_music_delay");
-
-		if (repeatMusicDelay != null && !repeatMusicDelay.isEmpty())
-			scn.setAttribute("repeat_music_delay",
-					repeatMusicDelay);
-		else
-			scn.removeAttribute("repeat_music_delay");
-
-		modified = true;
-		firePropertyChange("music", scn);
-	}
-
-	public String getBackground(Element scn) {
-		return scn.getAttribute("background");
-	}
-
-	public String getLightmap(Element scn) {
-		return doc.getDocumentElement().getAttribute("lightmap");
-	}
-
-	public void setBackground(Element scn, String value) {
-		setRootAttr(scn, "background", value);
-	}
-
-	public void setLightmap(Element scn, String value) {
-		setRootAttr(scn, "lightmap", value);
-	}
-
-	public Scene getEngineScene(Element s, int wWidth, int wHeight) {
-		Scene scn = new Scene();
-
-		scn.setId(getId());
-
-		scn.getCamera().create(wWidth, wHeight);
-
-		String background = getBackground(s);
-		if (background != null && !background.isEmpty()) {
-			scn.setBackground(background, getLightmap(s));
-		}
-
-		String depthVector = s.getAttribute("depth_vector");
-		if (!depthVector.isEmpty())
-			scn.setDepthVector(Param.parseVector2(depthVector));
-
-		// GET ACTORS
-		NodeList actors = getActors(s);
-		for (int i = 0; i < actors.getLength(); i++) {
-			Element a = (Element) actors.item(i);
-			BaseActor actor = getEngineActor(a);
-			scn.addActor(actor);
-
-			if (getId(a).equals(getRootAttr("player"))) {
-				scn.setPlayer((SpriteActor) actor);
-			}
-		}
-		
-		// WALK ZONE
-		Element wz = getWalkZone(s);
-		
-		if(wz != null) {
-			PolygonalNavGraph polygonalPathFinder = new PolygonalNavGraph();
-			polygonalPathFinder.setWalkZone(Param.parsePolygon(wz.getAttribute("polygon"), wz.getAttribute("pos")));
-			
-			scn.setPolygonalNavGraph(polygonalPathFinder);
-			
-			NodeList obstacles = wz.getElementsByTagName("obstacle");
-			for (int i = 0; i < obstacles.getLength(); i++) {
-				Element o = (Element) obstacles.item(i);
-					
-				polygonalPathFinder.addObstacle(Param.parsePolygon(o.getAttribute("polygon"), o.getAttribute("pos")));
-			}
-		}
-
-		return scn;
-	}
-
-	public void create(String id) throws ParserConfigurationException,
-			FileNotFoundException, TransformerException {
-		create();
-		setId(id);
-		setFilenameFromId();
-		save();
-	}
-
-	public void rename(String newId) throws FileNotFoundException,
-			TransformerException {
-
-		deleteFiles();
-
-		setId(newId);
-		setFilenameFromId();
-
-		save();
-	}
-
-	public void deleteFiles() {
-		File f = new File(getAbsoluteName());
-
-		f.delete();
-
-		// TODO delete all .properties
-		f = new File(getI18NFilename());
-		f.delete();
-	}
-
-	public String getId() {
-		return doc.getDocumentElement().getAttribute("id");
-	}
-
-	public void setId(String id) {
-		setRootAttr(doc.getDocumentElement(), "id", id);
-	}
-
-	public String toString() {
-		return getId();
-	}
-
-	/*********************** ELEMENT METHODS *************************/
-
-	/**
-	 * Sets the actor id avoiding duplicated ids
-	 * 
-	 * @param e
-	 * @param id
-	 */
-	public void setActorId(Element scn, Element e, String id) {
-		NodeList actors = getActors(scn);
-
-		boolean checked = false;
-
-		int i = 1;
-
-		String idChecked = id;
-
-		while (!checked) {
-			checked = true;
-
-			for (int j = 0; j < actors.getLength(); j++) {
-				Element ae = (Element) actors.item(j);
-				String id2 = ae.getAttribute("id");
-
-				if (id2.equals(idChecked) && e != ae) {
-					i++;
-					idChecked = id + i;
-					checked = false;
-					break;
-				}
-			}
-		}
-
-		setRootAttr(e, "id", idChecked);
-	}
-
-	public String getDesc(Element e) {
-		return getTranslation(e.getAttribute("desc"));
-	}
-
-	public NodeList getFrameAnimations(Element e) {
-		return e.getElementsByTagName("frame_animation");
-	}
-
-	public Polygon getBBox(Element e) {
-		if (e.getAttribute("bbox").isEmpty())
-			return null;
-		
-		return Param.parsePolygon(e.getAttribute("bbox"));
-	}
-
-	public BaseActor getEngineActor(Element e) {
-		BaseActor a = null;
-
-		String type = getType(e);
-
-		if (type.equals(ATLAS_ACTOR_TYPE)) {
-			a = new SpriteActor();
-			((SpriteActor) a).setRenderer(new AtlasRenderer());
-		} else if (type.equals(SPRITE3D_ACTOR_TYPE)) {
-			a = new SpriteActor();
-			Sprite3DRenderer r = new Sprite3DRenderer();
-			((SpriteActor) a).setRenderer(r);
-			r.setSpriteSize(Param.parseVector2(e
-					.getAttribute("sprite_size")));
-			
-		} else if (type.equals(SPINE_ACTOR_TYPE)) {
-			a = new SpriteActor();
-			((SpriteActor) a).setRenderer(new SpineRenderer());
-		} else if (type.equals(IMAGE_ACTOR_TYPE)) {
-			a = new SpriteActor();
-			((SpriteActor) a).setRenderer(new ImageRenderer());			
-		} else if (type.equals(NO_RENDERER_ACTOR_TYPE)) {
-			a = new BaseActor();
-		} else {
-			EngineLogger.error(" Wrong actor Type defined in XML");
-			return null;
-		}
-		
-		
-		String layer = e.getAttribute("layer");
-		if (layer.equals(BACKGROUND_LAYER)) {
-			a.setLayer(ActorLayer.BACKGROUND);
-		} else if (layer.equals(FOREGROUND_LAYER)) {
-			a.setLayer(ActorLayer.FOREGROUND);
-		} else {
-			a.setLayer(ActorLayer.DYNAMIC);
-		}
-		
-		
-		a.setId(getId(e));
-		Polygon bbox = getBBox(e);
-		a.setBbox(bbox);
-		
-		if(bbox == null) {
-			bbox = new Polygon();
-			a.setBbox(bbox);
-			
-			if(a instanceof SpriteActor)
-				((SpriteActor) a).setBboxFromRenderer(true);
-		}
-		
-		Vector2 pos = getPos(e);
-		if(pos != null)
-			a.setPosition(pos.x, pos.y);
-			
-		a.setDesc(e.getAttribute("desc"));
-
-		if (a instanceof SpriteActor) {
-			SpriteRenderer r = ((SpriteActor) a).getRenderer();
-
-			NodeList faList = getFrameAnimations(e);
-
-			for (int i = 0; i < faList.getLength(); i++) {
-				Element faElement = (Element) faList.item(i);
-
-				FrameAnimation fa = getEngineFA(type, faElement);
-
-				r.addFrameAnimation(fa);
-			}
-
-			if (!e.getAttribute("init_frame_animation").isEmpty()) {
-				((SpriteActor) a).getRenderer().setInitFrameAnimation(
-						e.getAttribute("init_frame_animation"));
-
-			}
-			
-			if(e.getAttribute("obstacle").equals("true"))
-				a.setWalkObstacle(true);
-
-			// PARSE DEPTH TYPE
-			String depthType = e.getAttribute("depth_type");
-			((SpriteActor) a).setDepthType(DepthType.NONE);
-
-			if (!depthType.isEmpty()) {
-				if (depthType.equals("vector"))
-					((SpriteActor) a).setDepthType(DepthType.VECTOR);
-			}
-		}
-
-		return a;
-	}
-
-	public FrameAnimation getEngineFA(String type, Element faElement) {
-		FrameAnimation fa;
-
-		if(type.equals(ATLAS_ACTOR_TYPE)) {
-			fa = new AtlasFrameAnimation();	
-		} else {
-			fa = new FrameAnimation();
-		}
-			
-		fa.id = faElement.getAttribute("id");
-		fa.source = faElement.getAttribute("source");
-
-		if (faElement.getAttribute("animation_type").isEmpty()
-				|| faElement.getAttribute("animation_type").equalsIgnoreCase(
-						"repeat")) {
-			fa.animationType = Tween.REPEAT;
-		} else if (faElement.getAttribute("animation_type").equalsIgnoreCase(
-				"yoyo")) {
-			fa.animationType = Tween.PINGPONG;
-		} else {
-			fa.animationType = Tween.NO_REPEAT;
-		}
-
-		if (!faElement.getAttribute("speed").isEmpty())
-			fa.duration = Float.parseFloat(faElement.getAttribute("speed"));
-
-		if (!faElement.getAttribute("delay").isEmpty())
-			fa.delay = Float.parseFloat(faElement.getAttribute("delay"));
-
-		if (!faElement.getAttribute("count").isEmpty())
-			fa.count = Integer.parseInt(faElement.getAttribute("count"));
-		else
-			fa.count = Tween.INFINITY;
-
-		if (!faElement.getAttribute("sound").isEmpty())
-			fa.sound = faElement.getAttribute("sound");
-
-		if (!faElement.getAttribute("inD").isEmpty()) {
-			fa.inD = Param.parseVector2(faElement.getAttribute("inD"));
-		}
-
-		if (!faElement.getAttribute("outD").isEmpty()) {
-			fa.outD = Param.parseVector2(faElement.getAttribute("outD"));
-		}
-		
-		if (!faElement.getAttribute("preload").isEmpty()) {
-			fa.outD = Param.parseVector2(faElement.getAttribute("preload"));
-		}
-		
-		if (!faElement.getAttribute("dispose_when_played").isEmpty()) {
-			fa.outD = Param.parseVector2(faElement.getAttribute("dispose_when_played"));
-		}
-
-		return fa;
-	}
-
-	public Vector2 getPos(Element e) {
-		return Param.parseVector2(e.getAttribute("pos"));
-	}
-
-	public void setPos(Element e, Vector2 pos) {
-		if (pos == null) {
-			e.removeAttribute("pos");
-		} else {
-			e.setAttribute("pos", Param.toStringParam(pos));
-		}
-
-		modified = true;
-		firePropertyChange("pos", e);
-	}
-
-	public NodeList getDialogs(Element e) {
-		return e.getElementsByTagName("dialog");
-	}
-
-	public void setBbox(Element e, Polygon p) {
-		if (p == null) {
-			p = new Polygon();
-			
-			float[] verts = new float[8];
-			
-			verts[0] = 0f;
-			verts[1] = 0f;
-			verts[2] = 0f;
-			verts[3] = 200;
-			verts[4] = 200;
-			verts[5] = 200;
-			verts[6] = 200;
-			verts[7] = 0f;
-			
-			p.setVertices(verts);
-		}
-		
-		e.setAttribute("bbox", Param.toStringParam(p));
-
-		modified = true;
-		firePropertyChange("bbox", e);
-	}
-
-	public Element createDialogOption(Element parent, String text,
-			String responseText, String verb, String next, String visible) {
-		Element e = doc.createElement("option");
-		e.setAttribute("text", text);
-		if (responseText != null && !responseText.isEmpty())
-			e.setAttribute("responseText", responseText);
-		if (verb != null && !verb.isEmpty())
-			e.setAttribute("verb", verb);
-		if (next != null && !next.isEmpty())
-			e.setAttribute("next", next);
-		if (visible != null && !visible.isEmpty())
-			e.setAttribute("visible", visible);
-
-		parent.appendChild(e);
-
-		modified = true;
-		firePropertyChange("option", e);
-
-		return e;
-	}
-
-	public Element createWalkZone(Element scn, Polygon poly) {
-		Element e = doc.createElement("walk_zone");
-		e.setAttribute("polygon", Param.toStringParam(poly));
-		e.setAttribute("pos", Param.toStringParam(new Vector2(poly.getX(), poly.getY())));
-		
-		scn.appendChild(e);
-
-		modified = true;
-		firePropertyChange("walk_zone", e);
-
-		return e;
-	}
-	
-	public void setWalkZonePolygon(Element scn, Polygon poly) {
-		Element e = getWalkZone(scn);
-		
-		if(e == null)
-			e = createWalkZone(scn, poly);
-		else {
-			e.setAttribute("polygon", Param.toStringParam(poly));
-			e.setAttribute("pos", Param.toStringParam(new Vector2(poly.getX(), poly.getY())));
-		}
-		
-		modified = true;
-		firePropertyChange("walk_zone", e);
-			
-	}
-	
-	public Element getWalkZone(Element scn) {
-		NodeList nl = scn.getElementsByTagName("walk_zone");
-		Element e = null;
-		
-		if(nl.getLength() > 0) {
-			e = (Element) nl.item(0);
-		}
-		
-		return e;
-	}
-
-	public void deleteWalkZone(Element scn) {
-		Element e = getWalkZone(scn);
-		
-		if(e != null) {
-			deleteElement(e);
-		}
-		
-		modified = true;
-		firePropertyChange("walk_zone", e);
-	}
-
-	public Element createObstacle(Element scn, Polygon poly) {
-		Element e = doc.createElement("obstacle");
-		e.setAttribute("polygon", Param.toStringParam(poly));
-		e.setAttribute("pos", Param.toStringParam(new Vector2(poly.getX(), poly.getY())));
-		
-		getWalkZone(scn).appendChild(e);
-
-		modified = true;
-		firePropertyChange("obstacle", e);
-
-		return e;
-	}
-	
-	public Element getObstacle(Element scn, int i) {
-		Element wz = getWalkZone(scn);
-		Element e = null;
-		
-		NodeList nl = wz.getElementsByTagName("obstacle");
-		
-		e = (Element) nl.item(i);
-		
-		return e;
-	}
-
-	public void setObstaclePolygon(Element scn, int i, Polygon poly) {
-		Element e = getObstacle(scn, i);
-		
-		if(e == null)
-			return;
-		
-		
-		e.setAttribute("polygon", Param.toStringParam(poly));
-		e.setAttribute("pos", Param.toStringParam(new Vector2(poly.getX(), poly.getY())));
-		
-		modified = true;
-		firePropertyChange("obstacle", e);
-	}
-
-	public void deleteObstacle(Element scn, int i) {
-		Element e = getObstacle(scn, i);
-		
-		if(e != null) {
-			deleteElement(e);
-		}
-		
-		modified = true;
-		firePropertyChange("obstacle", e);
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/Project.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/Project.java
deleted file mode 100644
index b944d3746..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/Project.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.model;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Properties;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.bladecoder.engine.util.Config;
-import com.bladecoder.engineeditor.setup.BladeEngineSetup;
-import com.bladecoder.engineeditor.setup.Dependency;
-import com.bladecoder.engineeditor.setup.DependencyBank;
-import com.bladecoder.engineeditor.setup.ProjectBuilder;
-import com.bladecoder.engineeditor.setup.DependencyBank.ProjectDependency;
-import com.bladecoder.engineeditor.setup.DependencyBank.ProjectType;
-import com.bladecoder.engineeditor.utils.DinamicClassPath;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-
-public class Project extends PropertyChange {
-	public static final String PROP_PROJECTFILE = "projectFile";
-	public static final String NOTIFY_SCENE_SELECTED = "SCENE_SELECTED";
-	public static final String NOTIFY_ACTOR_SELECTED = "ACTOR_SELECTED";
-	public static final String NOTIFY_FA_SELECTED = "FA_SELECTED";
-	public static final String NOTIFY_VERB_SELECTED = "VERB_SELECTED";
-	public static final String NOTIFY_PROJECT_LOADED = "PROJECT_LOADED";
-
-	public static final String ASSETS_PATH = "/android/assets";
-	public static final String MODEL_PATH = ASSETS_PATH + "/model";
-	public static final String ATLASES_PATH = ASSETS_PATH + "/atlases";
-	public static final String BACKGROUNDS_PATH = ASSETS_PATH + "/backgrounds";
-	public static final String FONTS_PATH = ASSETS_PATH + "/fonts";
-	public static final String MUSIC_PATH = ASSETS_PATH + "/music";
-	public static final String SOUND_PATH = ASSETS_PATH + "/sounds";
-	public static final String IMAGE_PATH = ASSETS_PATH + "/images";
-	public static final String SPRITE3D_PATH = ASSETS_PATH + "/3d";
-	public static final String SPINE_PATH = ASSETS_PATH + "/spine";
-	public static final String UI_PATH = ASSETS_PATH + "/ui";
-
-	private static final String CONFIG_DIR = System.getProperty("user.home") + "/.AdventureComposer";
-	private static final String CONFIG_FILENAME = "config.properties";
-	
-	public static final String LAST_PROJECT_PROP = "last_project";
-
-	private final Properties editorConfig = new Properties();
-
-	private File projectFile;
-
-	private final WorldDocument world = new WorldDocument();	
-	private Properties projectConfig;
-
-	private ChapterDocument selectedChapter;
-	private Element selectedScene;
-	private Element selectedActor;
-	private String selectedFA;
-	
-	private HashMap<String, TextureRegion> bgIconCache = new HashMap<String, TextureRegion>();
-
-	final PropertyChangeListener modelChangeListener = new PropertyChangeListener() {
-		@Override
-		public void propertyChange(PropertyChangeEvent evt) {
-			firePropertyChange(evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
-		}
-
-	};
-
-	public Project() {
-		world.addPropertyChangeListener(modelChangeListener);
-		loadConfig();
-	}
-	
-	public TextureRegion getBgIcon(String s) {
-		TextureRegion icon = bgIconCache.get(s);
-		
-		if(icon == null) {
-			try {
-				bgIconCache.put(s, createBgIcon(s));
-			} catch (Exception e) {
-				return null;
-			}
-			
-			icon = bgIconCache.get(s);
-		}
-		
-		return icon;
-	}
-	
-	private TextureRegion createBgIcon(String bg) {
-		return new TextureRegion(new Texture(Gdx.files.absolute(getProjectPath() + "/" + BACKGROUNDS_PATH + 
-				"/1/" + bg)));
-	}
-
-	private void loadConfig() {
-		File dir = new File(CONFIG_DIR);
-		File f = new File(CONFIG_DIR + "/" + CONFIG_FILENAME);
-
-		if (!dir.exists())
-			dir.mkdirs();
-
-		try {
-			if (!f.exists()) {
-				f.createNewFile();
-			} else {
-				editorConfig.load(new FileInputStream(f));
-			}
-		} catch (IOException e) {
-			EditorLogger.error(e.getMessage());
-		}
-	}
-	
-	public void saveConfig() {
-		File f = new File(CONFIG_DIR + "/" + CONFIG_FILENAME);
-		
-		try {
-			editorConfig.store(new FileOutputStream(f), null);
-		} catch (IOException e) {
-			EditorLogger.error(e.getMessage());
-		}
-	}
-	
-	public Properties getConfig() {
-		return editorConfig;
-	}
-
-	public void setSelectedScene(Element scn) {
-		Element old = null;
-
-		old = selectedScene;
-
-		selectedScene = scn;
-		selectedActor = null;
-		selectedFA = null;
-		
-		firePropertyChange(NOTIFY_SCENE_SELECTED, old, selectedScene);
-	}
-
-	public void setSelectedActor(Element a) {
-		Element old = null;
-
-		old = selectedActor;
-
-		selectedActor = a;
-
-		selectedFA = null;
-		
-		firePropertyChange(NOTIFY_ACTOR_SELECTED, old, selectedActor);
-	}
-	
-	public ChapterDocument getSelectedChapter() {
-		return selectedChapter;
-	}
-
-	public Element getSelectedScene() {
-		return selectedScene;
-	}
-
-	public Element getSelectedActor() {
-		return selectedActor;
-	}
-
-	public String getSelectedFA() {
-		return selectedFA;
-	}
-
-	public void setSelectedFA(String id) {
-		String old = selectedFA;
-
-		selectedFA = id;
-
-		firePropertyChange(NOTIFY_FA_SELECTED, old, selectedFA);
-	}
-
-	public String getModelPath() {
-		return projectFile.getAbsolutePath() + MODEL_PATH;
-	}
-
-	public String getProjectPath() {
-		return projectFile.getAbsolutePath();
-	}
-
-	public File getProjectDir() {
-		return projectFile;
-	}
-	
-	public String getTitle() {
-		if(projectConfig == null) return null;
-		
-		return projectConfig.getProperty(Config.TITLE_PROP, getProjectDir().getName());
-	}
-	
-	public String getPackageTitle() {
-		return getTitle().replace(" ", "").replace("'", "");
-	}
-
-	public void createProject(String projectDir, String name, String sdkLocation) throws ParserConfigurationException,
-			TransformerException, IOException, SAXException {
-		createLibGdxProject(projectDir, name, "com.bladecoder.engine", "BladeEngine", sdkLocation);
-		
-		projectFile = new File(projectDir + "/" + name);
-		
-//		loadProject(projectFile);
-	}
-	
-	private void createLibGdxProject(String projectDir, String name, String pkg, String mainClass, String sdkLocation) throws IOException {
-		String sdk = "";
-		if (System.getenv("ANDROID_HOME") != null && sdkLocation == null) {
-			sdk = System.getenv("ANDROID_HOME");
-		} else {
-			sdk = sdkLocation;
-		}
-
-		DependencyBank bank = new DependencyBank();
-		ProjectBuilder builder = new ProjectBuilder(bank);
-		List<ProjectType> projects = new ArrayList<ProjectType>();
-		projects.add(ProjectType.CORE);
-		projects.add(ProjectType.DESKTOP);
-		projects.add(ProjectType.ANDROID);
-		projects.add(ProjectType.IOS);
-		projects.add(ProjectType.HTML);
-
-		List<Dependency> dependencies = new ArrayList<Dependency>();
-		dependencies.add(bank.getDependency(ProjectDependency.GDX));
-		dependencies.add(bank.getDependency(ProjectDependency.FREETYPE));
-
-		builder.buildProject(projects, dependencies);
-		builder.build();
-		new BladeEngineSetup().build(builder, projectDir + "/" + name, name, pkg,mainClass,
-			sdk, null);
-	}
-
-	public void saveProject() throws IOException, TransformerException {
-		if (projectFile != null) {
-			world.save();
-			selectedChapter.save();
-			
-			projectConfig.store(new FileOutputStream(projectFile.getAbsolutePath()+ "/" + ASSETS_PATH + "/" + Config.PROPERTIES_FILENAME), null);
-		}
-	}
-	
-	public void closeProject() {
-		this.projectFile = null;
-	}
-
-	public void loadProject(File projectFile) throws IOException, ParserConfigurationException,
-			SAXException {
-		this.projectFile = projectFile;
-
-		if (checkProjectStructure()) {
-			
-			
-			// Add 'bin' dir from project directory to classpath so we can get custom actions desc and params
-			// WARNING: Previous 'bin' folders are not deleted from the classpath
-			// That can not be a problem if the package of the custom actions is different
-			// in the loaded project.
-			try {
-				DinamicClassPath.addFile(projectFile.getAbsolutePath() + "/bin");
-				DinamicClassPath.addFile(projectFile.getAbsolutePath() + "/out");
-				DinamicClassPath.addFile(projectFile.getAbsolutePath() + "/desktop/build/classes/main");
-			} catch (IOException e) {
-				e.printStackTrace();
-				System.exit(0);
-			}
-			
-			world.setModelPath(projectFile.getAbsolutePath() + "/" + MODEL_PATH);
-			world.load();
-			selectedChapter = world.loadChapter(world.getInitChapter());
-			editorConfig.setProperty(LAST_PROJECT_PROP, projectFile.getAbsolutePath());
-						
-			projectConfig = new Properties();
-			projectConfig.load(new FileInputStream(projectFile.getAbsolutePath()+ ASSETS_PATH + "/" + Config.PROPERTIES_FILENAME));
-			firePropertyChange(NOTIFY_PROJECT_LOADED);
-		} else {
-			this.projectFile = null;
-			throw new IOException("Project not found.");
-		}	
-	}
-
-	public boolean checkProjectStructure() {
-		if (!new File(getModelPath()).exists()) {
-			projectFile = projectFile.getParentFile();
-			if (new File(getModelPath()).exists())
-				return true;
-			else
-				return false;
-		}
-
-		return true;
-	}
-
-	public WorldDocument getWorld() {
-		return world;
-	}
-
-	public Element getActor(String id) {
-		return selectedChapter.getActor(selectedScene, id);
-	}
-
-	public List<String> getResolutions() {
-		File atlasesPath = new File(projectFile.getAbsolutePath() + ATLASES_PATH);
-		ArrayList<String> l = new ArrayList<String>();
-
-		File[] list = atlasesPath.listFiles();
-
-		for (int i = 0; i < list.length; i++) {
-			String name = list[i].getName();
-
-			if (list[i].isDirectory()) {
-				try {
-					Float.parseFloat(name);
-				
-					l.add(name);
-				} catch (Exception e) {
-					
-				}
-			}
-		}
-
-		return l;
-	}
-
-	public String getResDir() {
-		return "1";
-	}
-
-	public void loadChapter(String selChapter) throws ParserConfigurationException, SAXException, IOException {
-		selectedChapter = world.loadChapter(selChapter);
-		
-//		if(selectedChapter != null) {
-//			NodeList scenes = selectedChapter.getScenes();
-//			if(scenes.getLength()>0)
-//				setSelectedScene((Element)scenes.item(0));
-//			else
-//				setSelectedScene(null);
-//		}
-	}
-	
-	public void dispose() {
-		for(TextureRegion r:bgIconCache.values())
-			r.getTexture().dispose();
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/WorldDocument.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/WorldDocument.java
deleted file mode 100644
index 319a32889..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/WorldDocument.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.model;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.xml.sax.SAXException;
-
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-
-public class WorldDocument extends  BaseDocument {
-	public static final int DEFAULT_WIDTH = 1920;
-	public static final int DEFAULT_HEIGHT = 1080;
-	
-	public static final String NOTIFY_DOCUMENT_MODIFIED = "DOCUMENT_MODIFIED";
-	
-    private PropertyChangeListener documentModifiedListener = new PropertyChangeListener() {	
-		@Override
-		public void propertyChange(PropertyChangeEvent evt) {
-//			if(!evt.getPropertyName().equals(NOTIFY_DOCUMENT_MODIFIED))
-			firePropertyChange(evt);
-			EditorLogger.debug("WorldDocument Listener: " +  evt.getPropertyName());
-		}
-	};
-	
-	public WorldDocument() {
-		setFilename("world.xml");
-	}
-	
-	@Override
-	public String getRootTag() {
-		return "world";
-	}
-
-	@Override
-	public void create() throws ParserConfigurationException {
-		super.create();
-		
-		setDimensions(DEFAULT_WIDTH, DEFAULT_HEIGHT);
-	}
-	
-	public void setDimensions(int width, int height) {
-		doc.getDocumentElement().setAttribute("width", Integer.toString(width));
-		doc.getDocumentElement().setAttribute("height", Integer.toString(height));
-		modified = true;
-		firePropertyChange();
-	}
-	
-	public String[] getChapters() {
-		String dir = Ctx.project.getProjectPath() + Project.MODEL_PATH;
-		
-		String[] chapters = new File(dir).list(new FilenameFilter() {
-			@Override
-			public boolean accept(File arg0, String arg1) {
-				if (!arg1.endsWith(".chapter"))
-					return false;
-
-				return true;
-			}
-		});
-		
-		for(int i = 0; i < chapters.length; i++)
-			chapters[i] = chapters[i].substring(0, chapters[i].lastIndexOf('.'));
-		
-		return chapters;
-	}
-
-	public int getWidth() {
-		return Integer.parseInt(doc.getDocumentElement().getAttribute("width"));
-	}
-	
-	public int getHeight() {
-		return  Integer.parseInt(doc.getDocumentElement().getAttribute("height"));		
-	}
-
-	public void setWidth(String value) {
-		doc.getDocumentElement().setAttribute("width", value);
-		modified = true;
-		firePropertyChange();
-	}
-	
-	public void setHeight(String value) {
-		doc.getDocumentElement().setAttribute("height", value);
-		modified = true;
-		firePropertyChange();
-	}
-	
-	public ChapterDocument loadChapter(String id) throws ParserConfigurationException, SAXException, IOException {
-			ChapterDocument chapter = new ChapterDocument(modelPath);
-			chapter.setFilename(id + ".chapter");
-			chapter.load();
-			chapter.addPropertyChangeListener(documentModifiedListener);
-			
-			return chapter;
-	}
-	
-	public String getInitChapter() {
-		String init = getRootAttr("init_chapter");
-		
-		if(init == null || init.isEmpty()) {
-			init = getChapters()[0];
-			
-			setRootAttr("init_chapter", init);
-		}
-		
-		return init;
-	}
-	
-	public void setInitChapter(String value) {
-		doc.getDocumentElement().setAttribute("init_chapter", value);
-		modified = true;
-		firePropertyChange();
-	}
-	
-	public ChapterDocument createChapter(String id) throws FileNotFoundException, TransformerException, ParserConfigurationException {
-		ChapterDocument chapter = new ChapterDocument(modelPath);	
-		String checkedId = getChapterCheckedId(id);
-		
-		chapter.create(checkedId);
-		firePropertyChange("chapter");
-		
-		return chapter;
-	}
-	
-	public String getChapterCheckedId(String id) {
-		boolean checked = false;
-		int i = 1;
-		
-		String idChecked = id;
-		
-		String [] nl = getChapters();
-
-		while (!checked) {
-			checked = true;
-
-			for (int j = 0; j < nl.length; j++) {
-				String id2 = nl[j];
-						
-				if (id2.equals(idChecked)) {
-					i++;
-					idChecked = id + i;
-					checked = false;
-					break;
-				}
-			}
-		}
-		
-		return idChecked;
-	}
-		
-	public void renameChapter(String oldId, String newId) throws TransformerException, ParserConfigurationException, SAXException, IOException {
-		
-		ChapterDocument chapter = new ChapterDocument(modelPath);
-		chapter.setFilename(oldId + ".chapter");
-		chapter.load();
-		chapter.rename(newId);
-		firePropertyChange("chapter");
-	}
-	
-	public void removeChapter(String id) throws FileNotFoundException, TransformerException {
-		
-		ChapterDocument chapter = new ChapterDocument(modelPath);
-		chapter.setFilename(id + ".chapter");
-		chapter.deleteFiles();
-		firePropertyChange("chapter");
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnEditor.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnEditor.java
deleted file mode 100644
index cd03feab6..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnEditor.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.scneditor;
-
-import java.io.IOException;
-
-import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.utils.RunProccess;
-
-public class ScnEditor extends Table {
-	ScnWidget scnWidget;
-	CheckBox inSceneCb;
-	CheckBox animCb;
-	TextButton testButton;
-	TextButton walkZoneButton;
-	
-	public ScnEditor(Skin skin) {
-		super(skin);
-		
-		scnWidget = new ScnWidget(skin);
-		
-		inSceneCb = new CheckBox("In Scene Sprites", skin);
-		inSceneCb.setChecked(false);
-		animCb = new CheckBox("Animation", skin);
-		animCb.setChecked(true);
-		testButton = new TextButton("Test", skin);
-		walkZoneButton = new TextButton("Walk Zone", skin);
-		
-		add(scnWidget).expand().fill();
-		row();
-
-		Table bottomTable = new Table(skin);
-		bottomTable.left();
-		// bottomTable.setBackground("background");
-		add(bottomTable).fill();
-
-		bottomTable.add(walkZoneButton);
-		bottomTable.add(inSceneCb);
-		bottomTable.add(animCb);
-		bottomTable.add(testButton);
-		
-		walkZoneButton.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event,
-					com.badlogic.gdx.scenes.scene2d.Actor actor) {
-				if(walkZoneButton.isChecked())
-					getScnWidget().showEditWalkZoneWindow();
-				else
-					getScnWidget().hideEditWalkZoneWindow();
-			}
-		});
-
-
-		inSceneCb.addListener(new ChangeListener() {
-
-			@Override
-			public void changed(ChangeEvent event,
-					com.badlogic.gdx.scenes.scene2d.Actor actor) {
-				scnWidget.setInSceneSprites(inSceneCb.isChecked());
-			}
-		});
-
-		animCb.addListener(new ChangeListener() {
-
-			@Override
-			public void changed(ChangeEvent event,
-					com.badlogic.gdx.scenes.scene2d.Actor actor) {
-				scnWidget.setAnimation(animCb.isChecked());
-			}
-		});
-
-		testButton.addListener(new ChangeListener() {
-
-			@Override
-			public void changed(ChangeEvent event,
-					com.badlogic.gdx.scenes.scene2d.Actor actor) {
-				test();
-				event.cancel();
-			}
-		});
-	}
-	
-	public ScnWidget getScnWidget() {
-		return scnWidget;
-	}	
-	
-	private void test() {
-		
-		if(Ctx.project.getSelectedScene() == null) {
-			String msg = "There are no scenes in this chapter.";
-			Ctx.msg.show(getStage(),msg, 3);
-			return;
-		}
-		
-		try {
-			try {
-				Ctx.project.saveProject();
-			} catch (Exception ex) {
-				String msg = "Something went wrong while saving the project.\n\n"
-						+ ex.getClass().getSimpleName() + " - " + ex.getMessage();
-				Ctx.msg.show(getStage(),msg, 2);
-			}
-			
-			if(!RunProccess.runBladeEngine(
-					Ctx.project.getProjectDir(),
-					Ctx.project.getSelectedChapter().getId(),
-					Ctx.project.getSelectedChapter().getId(Ctx.project.getSelectedScene())))
-				Ctx.msg.show(getStage(),"There was a problem running the project", 3);
-		} catch (IOException e) {
-			String msg = "Something went wrong while testing the scene.\n\n"
-					+ e.getClass().getSimpleName() + " - " + e.getMessage();
-			Ctx.msg.show(getStage(),msg, 3);
-		}
-	}
-
-	public void dispose() {
-		scnWidget.dispose();
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidget.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidget.java
deleted file mode 100644
index a0df5db94..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidget.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.scneditor;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.math.Polygon;
-import com.badlogic.gdx.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.math.Vector3;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.Widget;
-import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack;
-import com.badlogic.gdx.scenes.scene2d.utils.TiledDrawable;
-import com.bladecoder.engine.anim.FrameAnimation;
-import com.bladecoder.engine.anim.Tween;
-import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.SpriteRenderer;
-import com.bladecoder.engine.util.RectangleRenderer;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.model.ChapterDocument;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-
-public class ScnWidget extends Widget {
-	private static final Color BLACK_TRANSPARENT = new Color(0f, 0f, 0f, 0.5f);
-
-	// TMPs to avoid GC calls
-	private final Vector3 tmpV3 = new Vector3();
-	private final Vector2 tmpV2 = new Vector2();
-
-	private final SpriteBatch sceneBatch = new SpriteBatch();
-	private final CanvasDrawer drawer = new CanvasDrawer();
-	private final SpriteDrawer faRenderer = new SpriteDrawer();
-	private final ScnWidgetInputListener inputListner = new ScnWidgetInputListener(
-			this);
-
-	private final Rectangle bounds = new Rectangle();
-	private final Rectangle scissors = new Rectangle();
-
-	private Scene scn;
-	private BaseActor selectedActor = null;
-	private boolean inScene = false;
-	private boolean animation = true;
-
-	private static final int[] zoomLevels = { 5, 10, 16, 25, 33, 50, 66, 100,
-			150, 200, 300, 400, 600, 800, 1000 };
-	private int zoomLevel = 100;
-
-	private BitmapFont bigFont;
-	private BitmapFont defaultFont;
-	private TiledDrawable tile;
-
-	private boolean loading = false;
-	private boolean loadingError = false;
-
-	private WalkZoneWindow walkZoneWindow;
-
-	private boolean showWalkZone;
-	
-	/**
-	 * The NOTIFY_PROJECT_LOADED listener is called from other thread.
-	 * This flag is to recreate the scene in the OpenGL thread. 
-	 */
-	private boolean projectLoadedFlag = false;
-
-	public ScnWidget(Skin skin) {
-		bigFont = skin.get("big-font", BitmapFont.class);
-		defaultFont = skin.get("default-font", BitmapFont.class);
-
-		setSize(150, 150);
-
-		tile = new TiledDrawable(Ctx.assetManager.getIcon("transparent-light"));
-
-		faRenderer.setViewport(getWidth(), getHeight());
-
-		setLayoutEnabled(true);
-
-		addListener(inputListner);
-
-		Ctx.project.addPropertyChangeListener(new PropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent e) {
-				EditorLogger.debug("ScnWidget (Project Listener): "
-						+ e.getPropertyName());
-				
-				if (e.getPropertyName().equals(Project.NOTIFY_SCENE_SELECTED)) {
-					if(!projectLoadedFlag)
-						setSelectedScene(Ctx.project.getSelectedScene());
-				} else if (e.getPropertyName().equals(
-						Project.NOTIFY_ACTOR_SELECTED)) {
-					if(!projectLoadedFlag)
-						setSelectedActor(Ctx.project.getSelectedActor());
-				} else if (e.getPropertyName().equals(
-						Project.NOTIFY_FA_SELECTED)) {
-					if(!projectLoadedFlag)
-						setSelectedFA(Ctx.project.getSelectedFA());
-				} else if (e.getPropertyName().equals(
-						Project.NOTIFY_PROJECT_LOADED)) {
-					projectLoadedFlag = true;
-				}
-			}
-		});
-
-		Ctx.project.getWorld().addPropertyChangeListener(
-				new PropertyChangeListener() {
-					@Override
-					public void propertyChange(PropertyChangeEvent e) {
-						EditorLogger.debug("ScnWidget (World Listener): "
-								+ e.getPropertyName());
-						ChapterDocument doc = Ctx.project.getSelectedChapter();
-
-						if (e.getPropertyName().equals("scene")) {
-							setSelectedScene(Ctx.project.getSelectedScene());
-							setSelectedActor(Ctx.project.getSelectedActor());
-						} else if (e.getPropertyName().equals("bbox")) {
-							Element selActor = (Element) e.getNewValue();
-							String id = doc.getId(selActor);
-							BaseActor a = scn.getActor(id, false);
-							if (a == null)
-								return;
-
-							a.setBbox(doc.getBBox(selActor));
-							Vector2 p = doc.getPos(selActor);
-							a.setPosition(p.x, p.y);
-						} else if (e.getPropertyName().equals("pos")) {
-							Element selActor = (Element) e.getNewValue();
-							String id = doc.getId(selActor);
-							BaseActor a = scn.getActor(id, false);
-							if (a == null)
-								return;
-							Vector2 p = doc.getPos(selActor);
-							a.setPosition(p.x, p.y);
-						} else if (e.getPropertyName().equals("id")) {
-							String id = (String) e.getOldValue();
-
-							if (selectedActor == null
-									|| !selectedActor.getId().equals(id))
-								return;
-
-							scn.removeActor(scn.getActor(id, false));
-							setSelectedActor(null);
-						} else if (e.getPropertyName()
-								.equals("frame_animation")) {
-							createAndSelectActor(Ctx.project.getSelectedActor());
-							setSelectedFA(null);
-						} else if (e.getPropertyName().equals(
-								"init_frame_animation")) {
-							String initFA = (String) e.getNewValue();
-							((SpriteActor) selectedActor).getRenderer()
-									.setInitFrameAnimation(initFA);
-							setSelectedFA(null);
-						} else if (e.getPropertyName().equals("actor")) {
-							createAndSelectActor((Element) e.getNewValue());
-						} else if (e.getPropertyName().equals(
-								BaseDocument.NOTIFY_ELEMENT_DELETED)) {
-							if (((Element) e.getNewValue()).getTagName()
-									.equals("actor"))
-								removeActor(doc, (Element) e.getNewValue());
-							else if (((Element) e.getNewValue()).getTagName()
-									.equals("frame_animation"))
-								setSelectedFA(null);
-						}
-					}
-				});
-
-		walkZoneWindow = new WalkZoneWindow(skin, inputListner);
-	}
-
-	@Override
-	public void act(float delta) {
-		if(projectLoadedFlag) {
-			projectLoadedFlag = false;
-			
-			if (scn != null) {
-				scn.dispose();
-				EngineAssetManager.getInstance().dispose();
-				scn = null;
-			}
-
-			EngineAssetManager.createEditInstance(Ctx.project
-					.getProjectDir().getAbsolutePath() + Project.ASSETS_PATH, Ctx.project.getWorld().getWidth(), Ctx.project.getWorld().getHeight());
-			
-			setSelectedScene(Ctx.project.getSelectedScene());
-			setSelectedActor(Ctx.project.getSelectedActor());
-			setSelectedFA(Ctx.project.getSelectedFA());
-		}
-		
-		if (scn != null && animation && !loading && !loadingError) {
-			faRenderer.update(delta);
-			scn.update(delta);
-		}
-	}
-
-	@Override
-	public void draw(Batch batch, float parentAlpha) {
-		validate();
-
-		Color tmp = batch.getColor();
-		batch.setColor(Color.WHITE);
-
-		// BACKGROUND
-		batch.disableBlending();
-		tile.draw(batch, getX(), getY(), getWidth(), getHeight());
-		batch.enableBlending();
-
-		if (scn != null && !loading && !loadingError) {
-			Vector3 v = new Vector3(getX(), getY(), 0);
-			v = v.prj(batch.getTransformMatrix());
-
-			batch.end();
-
-			// System.out.println("X: " + v.x+ " Y:" + v.y);
-			Gdx.gl.glViewport((int) v.x, (int) v.y, (int) getWidth(),
-					(int) (getHeight()));
-
-			getStage().calculateScissors(bounds, scissors);
-
-			if (ScissorStack.pushScissors(scissors)) {
-				// WORLD CAMERA
-				sceneBatch.setProjectionMatrix(scn.getCamera().combined);
-				sceneBatch.begin();
-				scn.draw(sceneBatch);
-				sceneBatch.end();
-				ScissorStack.popScissors();
-			}
-
-			drawer.drawBGBounds();
-			
-			if (showWalkZone && scn.getPolygonalNavGraph() != null) {
-				drawer.drawBBoxWalkZone(scn, false);
-				
-				drawer.drawPolygonVertices(scn.getPolygonalNavGraph().getWalkZone(),
-						Color.GREEN);
-
-				ArrayList<Polygon> obstacles = scn.getPolygonalNavGraph()
-						.getObstacles();
-
-				for (Polygon p : obstacles) {
-					drawer.drawPolygonVertices(p, Color.RED);
-				}
-			}
-
-			drawer.drawBBoxActors(scn);
-
-			if (selectedActor != null) {
-				drawer.drawSelectedActor(selectedActor);
-			}
-
-			getStage().getViewport().apply();
-
-			// SCREEN CAMERA
-			batch.begin();
-
-			if (!inScene) {
-				faRenderer.draw((SpriteBatch) batch);
-			}
-
-			// DRAW COORDS
-			Vector2 coords = new Vector2(Gdx.input.getX(), Gdx.input.getY());
-			screenToWorldCoords(coords);
-			String str = MessageFormat.format("({0}, {1})", (int) coords.x,
-					(int) coords.y);
-
-			TextBounds bounds2 = defaultFont.getBounds(str);
-			RectangleRenderer.draw((SpriteBatch) batch, 0f, getY()
-					+ getHeight() - bounds2.height - 15, bounds2.width + 10,
-					bounds2.height + 10, BLACK_TRANSPARENT);
-			defaultFont.draw(batch, str, 5, getHeight() + getY() - 10);
-
-			batch.setColor(tmp);
-
-		} else {
-			RectangleRenderer.draw((SpriteBatch) batch, getX(), getY(),
-					getWidth(), getHeight(), Color.BLACK);
-
-			String s;
-
-			if (loading) {
-				s = "LOADING...";
-
-				try {
-					if (!EngineAssetManager.getInstance().isLoading()) {
-						loading = false;
-
-						scn.retrieveAssets();
-
-						drawer.setCamera(scn.getCamera());
-
-						invalidate();
-					}
-				} catch (Exception e) {
-					Ctx.msg.show(getStage(), "Could not load assets for scene",
-							4);
-					e.printStackTrace();
-					loadingError = true;
-					loading = false;
-				}
-
-			} else if (loadingError) {
-				s = "ERROR IN SCENE DATA. CANNOT DISPLAY SCENE";
-			} else if (Ctx.project.getProjectDir() == null) {
-				s = "CREATE OR LOAD A PROJECT";
-			} else {
-				s = "THERE ARE NO SCENES IN THIS CHAPTER YET";
-			}
-
-			bigFont.draw(batch, s,
-					(getWidth() - bigFont.getBounds(s).width) / 2, getHeight()
-							/ 2 + bigFont.getLineHeight() * 3);
-
-		}
-
-	}
-
-	public void setInSceneSprites(boolean v) {
-		inScene = v;
-	}
-
-	public void setAnimation(boolean v) {
-		animation = v;
-	}
-
-	public void setFrameAnimation(FrameAnimation fa) {
-		try {
-			faRenderer.setFrameAnimation(fa);
-		} catch (Exception e) {
-			Ctx.msg.show(getStage(), "Could not retrieve assets for sprite: "
-					+ fa.id, 4);
-			e.printStackTrace();
-
-			faRenderer.setFrameAnimation(null);
-		}
-	}
-
-	public void showEditWalkZoneWindow() {
-		getParent().addActor(walkZoneWindow);
-		showWalkZone = true;
-	}
-
-	public void hideEditWalkZoneWindow() {
-		getParent().removeActor(walkZoneWindow);
-		showWalkZone = false;
-	}
-	
-	public boolean getShowWalkZone() {
-		return showWalkZone;
-	}
-
-	@Override
-	public void layout() {
-		EditorLogger.debug("LAYOUT SIZE CHANGED - X: " + getX() + " Y: "
-				+ getY() + " Width: " + getWidth() + " Height: " + getHeight());
-		EditorLogger.debug("Last Point coords - X: " + (getX() + getWidth())
-				+ " Y: " + (getY() + getHeight()));
-		localToScreenCoords(tmpV2
-				.set(getX() + getWidth(), getY() + getHeight()));
-		EditorLogger.debug("Screen Last Point coords:  " + tmpV2);
-
-		faRenderer.setViewport(getWidth(), getHeight());
-		bounds.set(getX(), getY(), getWidth(), getHeight());
-
-		walkZoneWindow.setPosition(getX() + 5, getY() + 5);
-		walkZoneWindow.invalidate();
-		
-		// SETS WORLD CAMERA
-		if (scn != null) {
-
-			float aspect = getWidth() / getHeight();
-
-			float wWidth = Ctx.project.getWorld().getWidth();
-			float wHeight = Ctx.project.getWorld().getHeight();
-			float aspectWorld = wWidth / wHeight;
-
-			if (aspectWorld > aspect) {
-				wHeight = wWidth / aspect;
-			} else {
-				wWidth = wHeight * aspect;
-			}
-
-			zoomLevel = 100;
-
-			scn.getCamera().setToOrtho(false, wWidth, wHeight);
-			scn.getCamera().zoom = 1f;
-			scn.getCamera().position.set(Ctx.project.getWorld().getWidth() / 2, Ctx.project.getWorld().getHeight() / 2, 0);
-			scn.getCamera().update();
-			zoom(+1);		
-		}			
-	}
-
-	public void zoom(int amount) {
-		if (zoomLevel == zoomLevels[0] && amount < 0) {
-			zoomLevel = zoomLevels[1];
-		} else if (zoomLevel == zoomLevels[zoomLevels.length - 1] && amount > 0) {
-			zoomLevel = zoomLevels[zoomLevels.length - 2];
-		} else {
-			for (int i = 1; i < zoomLevels.length - 1; i++) {
-				if (zoomLevels[i] == zoomLevel) {
-					zoomLevel = amount > 0 ? zoomLevels[i - 1]
-							: zoomLevels[i + 1];
-					break;
-				}
-			}
-		}
-
-		if (scn != null) {
-			scn.getCamera().zoom = 100f / zoomLevel;
-			scn.getCamera().update();
-		}
-	}
-
-	public void translate(Vector2 delta) {
-		// EditorLogger.debug("TRANSLATING - X: " + delta.x + " Y: " + delta.y);
-		if (scn != null) {
-			scn.getCamera().translate(-delta.x, -delta.y, 0);
-			scn.getCamera().update();
-		}
-	}
-
-	public void localToScreenCoords(Vector2 coords) {
-		localToStageCoordinates(coords);
-		getStage().stageToScreenCoordinates(coords);
-	}
-
-	public void localToWorldCoords(Vector2 coords) {
-		localToStageCoordinates(coords);
-		getStage().stageToScreenCoordinates(coords);
-
-		tmpV3.set(coords.x, coords.y, 0);
-		getScene().getCamera().unproject(tmpV3, getX(), getY(), getWidth(),
-				getHeight());
-		coords.set(tmpV3.x, tmpV3.y);
-	}
-
-	public void screenToWorldCoords(Vector2 coords) {
-		tmpV2.set(0, 0);
-		localToStageCoordinates(tmpV2);
-		// getStage().stageToScreenCoordinates(tmpV2);
-		tmpV3.set(coords.x, coords.y, 0);
-		getScene().getCamera().unproject(tmpV3, tmpV2.x, tmpV2.y, getWidth(),
-				getHeight());
-		coords.set(tmpV3.x, tmpV3.y);
-	}
-
-	public Scene getScene() {
-		return scn;
-	}
-
-	public BaseActor getSelectedActor() {
-		return selectedActor;
-	}
-
-	public void setSelectedScene(Element e) {
-		if (scn != null) {
-			scn.dispose();
-			scn = null;
-		}
-
-		loadingError = false;
-
-		setSelectedActor(null);
-
-		if (e != null) {
-			scn = Ctx.project.getSelectedChapter().getEngineScene(e,
-					Ctx.project.getWorld().getWidth(),
-					Ctx.project.getWorld().getHeight());
-
-			scn.loadAssets();
-			loading = true;
-		}
-
-		walkZoneWindow.setScene(scn);	
-		
-		// SETS WORLD CAMERA
-		if (scn != null) {
-
-			float aspect = getWidth() / getHeight();
-
-			float wWidth = Ctx.project.getWorld().getWidth();
-			float wHeight = Ctx.project.getWorld().getHeight();
-			float aspectWorld = wWidth / wHeight;
-
-			if (aspectWorld > aspect) {
-				wHeight = wWidth / aspect;
-			} else {
-				wWidth = wHeight * aspect;
-			}
-
-			zoomLevel = 100;
-
-			scn.getCamera().setToOrtho(false, wWidth, wHeight);
-			scn.getCamera().zoom = 1f;
-			scn.getCamera().update();
-
-//			translate(new Vector2((-getWidth() + wWidth ) / 2 * scn.getCamera().zoom,
-//					(-getHeight() + wHeight) / 2 * scn.getCamera().zoom));
-			
-			translate(new Vector2(0,
-					(-getHeight() + wHeight) / 2));			
-		}		
-	}
-
-	public void setSelectedActor(Element actor) {
-		BaseActor a = null;
-
-		if (scn != null && actor != null) {
-			a = scn.getActor(Ctx.project.getSelectedChapter().getId(actor),
-					false);
-		}
-
-		selectedActor = a;
-		faRenderer.setActor(a);
-		setFrameAnimation(null);
-		walkZoneWindow.setActor(a);
-	}
-
-	public void setSelectedFA(String selFA) {
-		if (selectedActor instanceof SpriteActor) {
-			SpriteRenderer s = ((SpriteActor) selectedActor).getRenderer();
-
-			if (selFA == null || s.getFrameAnimations().get(selFA) == null) {
-				selFA = ((SpriteActor) selectedActor).getRenderer()
-						.getInitFrameAnimation();
-			}
-
-			if (selFA != null && s.getFrameAnimations().get(selFA) != null) {
-
-				setFrameAnimation(s.getFrameAnimations().get(selFA));
-
-				if (inScene
-						|| s.getCurrentFrameAnimation() == null
-						|| ((SpriteActor) selectedActor).getRenderer()
-								.getInitFrameAnimation().equals(selFA)) {
-					try {
-
-						((SpriteActor) selectedActor).startFrameAnimation(
-								selFA, Tween.REPEAT, Tween.INFINITY, null);
-					} catch (Exception e) {
-						setFrameAnimation(null);
-						((SpriteActor) selectedActor).getRenderer()
-								.getFrameAnimations().remove(selFA);
-					}
-				}
-			} else {
-				setFrameAnimation(null);
-			}
-		} else {
-			setFrameAnimation(null);
-		}
-	}
-
-	private void createAndSelectActor(Element actor) {
-		removeActor(Ctx.project.getSelectedChapter(), actor);
-		selectedActor = createActor(Ctx.project.getSelectedChapter(), actor);
-		setSelectedActor(actor);
-	}
-
-	private BaseActor createActor(ChapterDocument doc, Element e) {
-		BaseActor a = doc.getEngineActor(e);
-		scn.addActor(a);
-
-		a.loadAssets();
-		EngineAssetManager.getInstance().finishLoading();
-		a.retrieveAssets();
-
-		return a;
-	}
-
-	private void removeActor(ChapterDocument doc, Element e) {
-		BaseActor a = scn.getActor(doc.getId(e), false);
-		if (a != null) {
-			scn.removeActor(a);
-
-			a.dispose();
-			setSelectedActor(null);
-		}
-	}
-
-	public void dispose() {
-		if (scn != null) {
-			scn.dispose();
-			scn = null;
-		}
-
-		faRenderer.dispose();
-	}
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidgetInputListener.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidgetInputListener.java
deleted file mode 100644
index 902414d24..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidgetInputListener.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.scneditor;
-
-import java.util.ArrayList;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Input.Buttons;
-import com.badlogic.gdx.Input.Keys;
-import com.badlogic.gdx.math.Polygon;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.polygonalpathfinder.PolygonalNavGraph;
-import com.bladecoder.engine.util.PolygonUtils;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-
-public class ScnWidgetInputListener extends ClickListener {
-	private final ScnWidget scnWidget;
-
-	private static enum DraggingModes {
-		NONE, DRAGING_ACTOR, DRAGING_BBOX_POINT, DRAGING_WALKZONE, DRAGING_WALKZONE_POINT, DRAGING_OBSTACLE, DRAGING_OBSTACLE_POINT
-	};
-
-	private DraggingModes draggingMode = DraggingModes.NONE;
-	private BaseActor selActor = null;
-	private Vector2 org = new Vector2();
-	private int vertIndex;
-	private Polygon selPolygon = null;
-	private int selObstacleIndex = 0;
-
-	private boolean deleteObstacle = false;
-
-	public ScnWidgetInputListener(ScnWidget w) {
-		this.scnWidget = w;
-	}
-
-	public void setDeleteObstacle(boolean v) {
-		Ctx.msg.show(scnWidget.getStage(), "Select Obstacle to Delete");
-		deleteObstacle = v;
-	}
-
-	@Override
-	public void clicked(InputEvent event, float x, float y) {
-		Scene scn = scnWidget.getScene();
-		if (scn == null)
-			return;
-
-		Vector2 p = new Vector2(Gdx.input.getX(), Gdx.input.getY());
-		scnWidget.screenToWorldCoords(p);
-
-		if (deleteObstacle) {
-			deleteObstacle = false;
-
-			Ctx.msg.hide();
-			PolygonalNavGraph pf = scn.getPolygonalNavGraph();
-			ArrayList<Polygon> obstacles = scn.getPolygonalNavGraph()
-					.getObstacles();
-
-			// SEARCH FOR OBSTACLE
-			for (int j = 0; j < obstacles.size(); j++) {
-				Polygon o = obstacles.get(j);
-				if (o.contains(p.x, p.y)) {
-					Ctx.project.getSelectedChapter().deleteObstacle(
-							Ctx.project.getSelectedScene(), j);
-					pf.getObstacles().remove(j);
-					return;
-				}
-			}
-		}
-
-		// DOUBLE CLICK TO CREATE OR DELETE POINTS
-		if (getTapCount() == 2) {
-			// Check WALKZONE
-			if (scn.getPolygonalNavGraph() != null
-					&& scnWidget.getShowWalkZone()) {
-				Polygon poly = scn.getPolygonalNavGraph().getWalkZone();
-				ArrayList<Polygon> obstacles = scn.getPolygonalNavGraph()
-						.getObstacles();
-
-				if (Gdx.input.isKeyPressed(Keys.CONTROL_LEFT)) {
-					// Delete the point if selected
-					boolean deleted = PolygonUtils.deletePoint(poly, p.x, p.y,
-							CanvasDrawer.CORNER_DIST);
-
-					if (deleted) {
-						Ctx.project.getSelectedChapter().setWalkZonePolygon(
-								Ctx.project.getSelectedScene(), poly);
-						return;
-					} else { // check obstacles
-						for (int i = 0; i < obstacles.size(); i++) {
-							Polygon o = obstacles.get(i);
-							deleted = PolygonUtils.deletePoint(o, p.x, p.y,
-									CanvasDrawer.CORNER_DIST);
-							if (deleted) {
-								Ctx.project.getSelectedChapter()
-										.setObstaclePolygon(
-												Ctx.project.getSelectedScene(),
-												i, o);
-								return;
-							}
-						}
-					}
-
-				} else {
-
-					boolean created = PolygonUtils.addClampPointIfTolerance(
-							poly, p.x, p.y, CanvasDrawer.CORNER_DIST);
-
-					if (created) {
-						Ctx.project.getSelectedChapter().setWalkZonePolygon(
-								Ctx.project.getSelectedScene(), poly);
-						return;
-					} else {
-						for (int i = 0; i < obstacles.size(); i++) {
-							Polygon o = obstacles.get(i);
-							created = PolygonUtils.addClampPointIfTolerance(o,
-									p.x, p.y, CanvasDrawer.CORNER_DIST);
-							if (created) {
-								Ctx.project.getSelectedChapter()
-										.setObstaclePolygon(
-												Ctx.project.getSelectedScene(),
-												i, o);
-								return;
-							}
-						}
-					}
-				}
-			}
-
-			if (scnWidget.getSelectedActor() != null) {
-
-				Polygon poly = scnWidget.getSelectedActor().getBBox();
-
-				if (!(scnWidget.getSelectedActor() instanceof SpriteActor)
-						|| !((SpriteActor) scnWidget.getSelectedActor())
-								.isBboxFromRenderer()) {
-					if (Gdx.input.isKeyPressed(Keys.CONTROL_LEFT)) {
-
-						// Delete the point if selected
-						boolean deleted = PolygonUtils.deletePoint(poly, p.x,
-								p.y, CanvasDrawer.CORNER_DIST);
-
-						if (deleted) {
-							Ctx.project.getSelectedChapter().setBbox(
-									Ctx.project.getSelectedActor(), poly);
-							return;
-						}
-					} else {
-						boolean created = PolygonUtils
-								.addClampPointIfTolerance(poly, p.x, p.y,
-										CanvasDrawer.CORNER_DIST);
-
-						if (created) {
-							Ctx.project.getSelectedChapter().setBbox(
-									Ctx.project.getSelectedActor(), poly);
-							return;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public boolean touchDown(InputEvent event, float x, float y, int pointer,
-			int button) {
-
-		super.touchDown(event, x, y, pointer, button);
-		EditorLogger.debug("Touch Down - X: " + x + " Y: " + y);
-
-		Scene scn = scnWidget.getScene();
-		if (scn == null)
-			return false;
-
-		Vector2 p = new Vector2(Gdx.input.getX(), Gdx.input.getY());
-		scnWidget.screenToWorldCoords(p);
-		org.set(p);
-
-		if (button == Buttons.LEFT) {
-			selActor = scnWidget.getSelectedActor();
-
-			if (scn.getPolygonalNavGraph() != null
-					&& scnWidget.getShowWalkZone()) { // Check WALKZONE
-
-				// CHECK WALKZONE VERTEXS
-				Polygon wzPoly = scn.getPolygonalNavGraph().getWalkZone();
-				float verts[] = wzPoly.getTransformedVertices();
-
-				for (int i = 0; i < verts.length; i += 2) {
-					if (p.dst(verts[i], verts[i + 1]) < CanvasDrawer.CORNER_DIST) {
-						draggingMode = DraggingModes.DRAGING_WALKZONE_POINT;
-						vertIndex = i;
-						return true;
-					}
-				}
-
-				// CHECK OBSTACLE VERTEXS
-				ArrayList<Polygon> obstacles = scn.getPolygonalNavGraph()
-						.getObstacles();
-
-				for (int j = 0; j < obstacles.size(); j++) {
-					Polygon o = obstacles.get(j);
-					verts = o.getTransformedVertices();
-
-					for (int i = 0; i < verts.length; i += 2) {
-						if (p.dst(verts[i], verts[i + 1]) < CanvasDrawer.CORNER_DIST) {
-							draggingMode = DraggingModes.DRAGING_OBSTACLE_POINT;
-							selPolygon = o;
-							vertIndex = i;
-							selObstacleIndex = j;
-							return true;
-						}
-					}
-				}
-
-				// CHECK FOR OBSTACLE DRAGGING
-				for (int j = 0; j < obstacles.size(); j++) {
-					Polygon o = obstacles.get(j);
-					if (o.contains(p.x, p.y)) {
-						draggingMode = DraggingModes.DRAGING_OBSTACLE;
-						selPolygon = o;
-						selObstacleIndex = j;
-						return true;
-					}
-				}
-
-				// CHECK FOR WALKZONE DRAGGING
-				if (wzPoly.contains(p.x, p.y)) {
-					draggingMode = DraggingModes.DRAGING_WALKZONE;
-					return true;
-				}
-
-			}
-
-			// SELACTOR VERTEXs DRAGGING
-			if (selActor != null
-					&& (!(selActor instanceof SpriteActor) || !((SpriteActor) selActor)
-							.isBboxFromRenderer())) {
-
-				Polygon bbox = selActor.getBBox();
-				float verts[] = bbox.getTransformedVertices();
-				for (int i = 0; i < verts.length; i += 2) {
-					if (p.dst(verts[i], verts[i + 1]) < CanvasDrawer.CORNER_DIST) {
-						draggingMode = DraggingModes.DRAGING_BBOX_POINT;
-						vertIndex = i;
-						return true;
-					}
-				}
-			}
-
-			BaseActor a = scn.getActorAt(p.x, p.y); // CHECK FOR ACTORS
-
-			if (a != null && a != selActor) {
-
-				selActor = a;
-				Element da = Ctx.project.getActor(selActor.getId());
-				Ctx.project.setSelectedActor(da);
-
-				draggingMode = DraggingModes.DRAGING_ACTOR;
-				return true;
-			}
-
-			if (a != null) {
-				draggingMode = DraggingModes.DRAGING_ACTOR;
-				return true;
-			}
-
-		}
-
-		return true;
-	}
-
-	@Override
-	public void touchDragged(InputEvent event, float x, float y, int pointer) {
-		// EditorLogger.debug("Touch Dragged - X: " + Gdx.input.getX() + " Y: "
-		// + Gdx.input.getY());
-
-		super.touchDragged(event, x, y, pointer);
-
-		if (Gdx.input.isButtonPressed(Buttons.LEFT)) {
-			Scene scn = scnWidget.getScene();
-
-			if (scn == null)
-				return;
-
-			Vector2 d = new Vector2(Gdx.input.getX(), Gdx.input.getY());
-			scnWidget.screenToWorldCoords(d);
-
-			d.sub(org);
-			org.add(d);
-
-			if (draggingMode == DraggingModes.DRAGING_ACTOR) {
-				Polygon p = selActor.getBBox();
-				p.translate(d.x, d.y);
-				Ctx.project.getSelectedChapter().setPos(
-						Ctx.project.getSelectedActor(),
-						new Vector2(selActor.getX(), selActor.getY()));
-
-			} else if (draggingMode == DraggingModes.DRAGING_BBOX_POINT) {
-				Polygon poly = selActor.getBBox();
-
-				float verts[] = poly.getVertices();
-				verts[vertIndex] += d.x;
-				verts[vertIndex + 1] += d.y;
-				poly.dirty();
-
-				Ctx.project.getSelectedChapter().setBbox(
-						Ctx.project.getSelectedActor(), poly);
-			} else if (draggingMode == DraggingModes.DRAGING_WALKZONE_POINT) {
-				Polygon poly = scn.getPolygonalNavGraph().getWalkZone();
-
-				float verts[] = poly.getVertices();
-				verts[vertIndex] += d.x;
-				verts[vertIndex + 1] += d.y;
-				poly.dirty();
-
-				Ctx.project.getSelectedChapter().setWalkZonePolygon(
-						Ctx.project.getSelectedScene(), poly);
-			} else if (draggingMode == DraggingModes.DRAGING_OBSTACLE_POINT) {
-				float verts[] = selPolygon.getVertices();
-				verts[vertIndex] += d.x;
-				verts[vertIndex + 1] += d.y;
-				selPolygon.dirty();
-
-				Ctx.project.getSelectedChapter().setObstaclePolygon(
-						Ctx.project.getSelectedScene(), selObstacleIndex,
-						selPolygon);
-			} else if (draggingMode == DraggingModes.DRAGING_OBSTACLE) {
-				selPolygon.translate(d.x, d.y);
-				Ctx.project.getSelectedChapter().setObstaclePolygon(
-						Ctx.project.getSelectedScene(), selObstacleIndex,
-						selPolygon);
-			} else if (draggingMode == DraggingModes.DRAGING_WALKZONE) {
-				Polygon poly = scn.getPolygonalNavGraph().getWalkZone();
-				poly.translate(d.x, d.y);
-				Ctx.project.getSelectedChapter().setWalkZonePolygon(
-						Ctx.project.getSelectedScene(), poly);
-			}
-
-		} else if (Gdx.input.isButtonPressed(Buttons.RIGHT)
-				|| Gdx.input.isButtonPressed(Buttons.MIDDLE)) {
-
-			Vector2 p = new Vector2(Gdx.input.getX(), Gdx.input.getY());
-			scnWidget.screenToWorldCoords(p);
-			p.sub(org);
-
-			scnWidget.translate(p);
-		}
-	}
-
-	@Override
-	public boolean scrolled(InputEvent event, float x, float y, int amount) {
-		super.scrolled(event, x, y, amount);
-//		EditorLogger.debug("SCROLLED - X: " + x + " Y: " + y);
-
-		scnWidget.zoom(amount);
-		return true;
-	}
-
-	@Override
-	public void touchUp(InputEvent event, float x, float y, int pointer,
-			int button) {
-
-		super.touchUp(event, x, y, pointer, button);
-		EditorLogger.debug("Touch Up - X: " + x + " Y: " + y);
-
-		draggingMode = DraggingModes.NONE;
-
-		return;
-	}
-
-	@Override
-	public boolean keyDown(InputEvent event, int keycode) {
-		super.keyDown(event, keycode);
-
-		switch (keycode) {
-		case Keys.ENTER:
-			break;
-		case Keys.BACKSPACE:
-			break;
-		}
-
-		return false;
-	}
-
-	@Override
-	public void enter(InputEvent event, float x, float y, int pointer,
-			com.badlogic.gdx.scenes.scene2d.Actor fromActor) {
-		super.enter(event, x, y, pointer, fromActor);
-		// EditorLogger.debug("ENTER - X: " + x + " Y: " + y);
-		scnWidget.getStage().setScrollFocus(scnWidget);
-	}
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/SpriteDrawer.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/SpriteDrawer.java
deleted file mode 100644
index 01446809e..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/SpriteDrawer.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.scneditor;
-
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.math.Vector2;
-import com.bladecoder.engine.anim.FrameAnimation;
-import com.bladecoder.engine.anim.Tween;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.AtlasRenderer;
-import com.bladecoder.engine.model.ImageRenderer;
-import com.bladecoder.engine.model.SpineRenderer;
-import com.bladecoder.engine.model.Sprite3DRenderer;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.SpriteRenderer;
-import com.bladecoder.engine.util.RectangleRenderer;
-
-/**
- * Frame Animation renderer.
- * 
- * @author rgarcia
- */
-public class SpriteDrawer {
-
-	public static final Color BG_COLOR = Color.MAGENTA;
-	private static final float HEIGHT = 200;
-
-	FrameAnimation currentFrameAnimation;
-	private SpriteRenderer renderer;
-	private float viewportW, viewportH;
-
-	public void setViewport(float w, float h) {
-		viewportW = w;
-		viewportH = h;
-	}
-
-	public void setActor(BaseActor a) {
-		if (renderer != null) {
-			renderer.dispose();
-			renderer = null;
-		}
-
-		if (a instanceof SpriteActor) {
-			SpriteRenderer r = ((SpriteActor) a).getRenderer();
-
-			if (r instanceof Sprite3DRenderer) {
-				renderer = new Sprite3DRenderer();
-				((Sprite3DRenderer) renderer).setSpriteSize(new Vector2(r
-						.getWidth(), r.getHeight()));
-			} else if (r instanceof SpineRenderer) {
-				renderer = new SpineRenderer();
-			} else if (r instanceof ImageRenderer) {
-				renderer = new ImageRenderer();				
-			} else {
-				renderer = new AtlasRenderer();
-			}
-		}
-	}
-
-	public void setFrameAnimation(FrameAnimation fa) {
-		currentFrameAnimation = fa;
-
-		if (renderer != null) {
-
-			renderer.getFrameAnimations().clear();
-
-			if (fa != null) {
-
-				renderer.addFrameAnimation(fa);
-
-				renderer.retrieveAssets();
-
-				renderer.startFrameAnimation(fa.id, Tween.REPEAT, Tween.INFINITY, null);
-			}
-		}
-	}
-
-	public void draw(SpriteBatch batch) {
-		if (renderer != null && currentFrameAnimation != null) {
-
-			float width = HEIGHT / renderer.getHeight() * renderer.getWidth();
-
-			RectangleRenderer.draw(batch, viewportW - width - 5, viewportH
-					- HEIGHT - 55, width + 10, HEIGHT + 10, Color.BLACK);
-			RectangleRenderer.draw(batch, viewportW - width, viewportH - HEIGHT
-					- 50, width, HEIGHT, BG_COLOR);
-
-			float scaleh = width / renderer.getWidth();
-			renderer.draw(batch, viewportW - width / 2,
-					viewportH - HEIGHT - 50, scaleh);
-
-		}
-	}
-
-	public void update(float delta) {
-		if (renderer != null && currentFrameAnimation != null) {
-			renderer.update(delta);
-		}
-	}
-
-	public void dispose() {
-		if (renderer != null)
-			renderer.dispose();
-	}
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/SpriteWidget.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/SpriteWidget.java
deleted file mode 100644
index c70b987c3..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/SpriteWidget.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.scneditor;
-
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.scenes.scene2d.ui.Widget;
-import com.bladecoder.engine.anim.AtlasFrameAnimation;
-import com.bladecoder.engine.anim.FrameAnimation;
-import com.bladecoder.engine.anim.Tween;
-import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.model.AtlasRenderer;
-import com.bladecoder.engine.model.ImageRenderer;
-import com.bladecoder.engine.model.SpineRenderer;
-import com.bladecoder.engine.model.Sprite3DRenderer;
-import com.bladecoder.engine.model.SpriteRenderer;
-import com.bladecoder.engine.util.RectangleRenderer;
-import com.bladecoder.engineeditor.model.ChapterDocument;
-import com.bladecoder.engineeditor.ui.EditSpriteDialog;
-
-public class SpriteWidget extends Widget {
-	private String source;
-	private FrameAnimation fa;
-	private SpriteRenderer renderer;
-	EditSpriteDialog editFADialog;
-	
-
-	public SpriteWidget(EditSpriteDialog createEditFADialog) {
-		this.editFADialog = createEditFADialog;
-	}
-
-	
-	public void setSource(String type, String source) {
-		this.source = source;
-		
-		if(renderer != null) {
-			renderer.dispose();
-			renderer = null;
-		}
-		
-		
-		if(type.equals(ChapterDocument.SPRITE3D_ACTOR_TYPE)) {
-			renderer = new Sprite3DRenderer();
-			((Sprite3DRenderer)renderer).setSpriteSize(new Vector2( Gdx.graphics.getWidth(), Gdx.graphics.getHeight()));
-		} else if(type.equals(ChapterDocument.SPINE_ACTOR_TYPE)) {
-			renderer = new SpineRenderer();
-		} else if(type.equals(ChapterDocument.IMAGE_ACTOR_TYPE)) {
-			renderer = new ImageRenderer();			
-		} else {
-			renderer = new AtlasRenderer();
-		}
-		
-		renderer.loadAssets();
-		EngineAssetManager.getInstance().finishLoading();
-		renderer.retrieveAssets();
-	}
-	
-	public String[] getAnimations() {
-		return renderer.getInternalAnimations(source);
-	}
-	
-	public void setFrameAnimation(String id, String speedStr, String typeStr) {
-		if (source!=null && id != null && !source.isEmpty() && !id.isEmpty()) {
-			
-			int type = Tween.REPEAT;
-			float speed = 2.0f;
-			
-			if(!speedStr.isEmpty())
-				speed = Float.parseFloat(speedStr);
-			
-			if(typeStr.equals("yoyo"))
-				type = Tween.PINGPONG;
-			
-			if(renderer instanceof AtlasRenderer)
-				fa = new AtlasFrameAnimation();
-			else 
-				fa = new FrameAnimation();
-			
-			fa.set(id, source, speed, 0.0f, Tween.INFINITY, type,
-					null, null, null, false, true);
-			
-			renderer.addFrameAnimation(fa);
-			
-			renderer.startFrameAnimation(fa.id, Tween.FROM_FA, 1, null);
-		}
-	}
-	
-	public void draw (Batch batch, float parentAlpha) {
-		super.draw(batch, parentAlpha);
-		
-		if(renderer == null || renderer.getCurrentFrameAnimation() == null)
-			return;
-		
-		Color tmp = batch.getColor();
-		batch.setColor(Color.WHITE);
-		
-		renderer.update(Gdx.graphics.getDeltaTime());
-		
-		RectangleRenderer.draw((SpriteBatch)batch, getX(), getY(), getWidth(), getHeight(), Color.MAGENTA);
-		
-		float scalew =   getWidth() /  renderer.getWidth();
-		float scaleh =   getHeight() /  renderer.getHeight();
-		float scale = scalew>scaleh?scaleh:scalew;
-		renderer.draw((SpriteBatch)batch, getX() + renderer.getWidth() * scale /2, getY(), scale);
-		batch.setColor(tmp);
-	}
-
-	public void dispose() {
-		renderer.dispose();
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/WalkZoneWindow.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/WalkZoneWindow.java
deleted file mode 100644
index c323e7f53..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/WalkZoneWindow.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.scneditor;
-
-import com.badlogic.gdx.math.Polygon;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Container;
-import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
-import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.polygonalpathfinder.PolygonalNavGraph;
-import com.bladecoder.engineeditor.Ctx;
-
-public class WalkZoneWindow extends Container<Table> {
-	private static final String DELETE_WALK_ZONE_TEXT = "Delete Walk Zone";
-	private static final String CREATE_WALK_ZONE_TEXT = "Create Walk Zone";
-	private static final String SET_ACTOR_AS_OBSTACLE_TEXT = "Set BaseActor as Obstacle";
-	private static final String REMOVE_ACTOR_AS_OBSTACLE_TEXT = "Remove BaseActor as Obstacle";
-	private static final float OBSTACLE_WIDTH = 200;
-
-	TextButton createZoneBtn;
-	TextButton createObstacleBtn;
-	TextButton deleteObstacleBtn;
-	TextButton addObstacleActorBtn;
-	Scene scn;
-	com.bladecoder.engine.model.BaseActor actor;
-
-	private final ScnWidgetInputListener scnIL;
-
-	public WalkZoneWindow(Skin skin, ScnWidgetInputListener sIL) {
-		this.scnIL = sIL;
-
-		Table table = new Table(skin);
-		createZoneBtn = new TextButton(CREATE_WALK_ZONE_TEXT, skin);
-		createObstacleBtn = new TextButton("Create Obstacle", skin);
-		deleteObstacleBtn = new TextButton("Delete Obstacle", skin);
-		addObstacleActorBtn = new TextButton(SET_ACTOR_AS_OBSTACLE_TEXT, skin);
-
-		createZoneBtn.setDisabled(true);
-		createObstacleBtn.setDisabled(true);
-		deleteObstacleBtn.setDisabled(true);
-		addObstacleActorBtn.setDisabled(true);
-
-		table.top();
-		table.add(new Label("Walk Zone", skin, "big")).center();
-
-		Drawable drawable = skin.getDrawable("trans");
-		setBackground(drawable);
-		table.row();
-		table.add(createZoneBtn).expandX().fill();
-		table.row();
-		table.add(createObstacleBtn).expandX().fill();
-		table.row();
-		table.add(deleteObstacleBtn).expandX().fill();
-		table.row();
-		table.add(addObstacleActorBtn).expandX().fill();
-		setActor(table);
-
-		createZoneBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-
-				if (scn.getPolygonalNavGraph() == null) {
-					float[] verts = new float[8];
-
-					float width = scn.getCamera().getScrollingWidth();
-					float height = scn.getCamera().getScrollingHeight();
-
-					verts[3] = height;
-					verts[4] = width;
-					verts[5] = height;
-					verts[6] = width;
-
-					Polygon poly = new Polygon(verts);
-					PolygonalNavGraph pf = new PolygonalNavGraph();
-					pf.setWalkZone(poly);
-					scn.setPolygonalNavGraph(pf);
-					createZoneBtn.setText(DELETE_WALK_ZONE_TEXT);
-					createObstacleBtn.setDisabled(false);
-					addObstacleActorBtn.setDisabled(false);
-					Ctx.project.getSelectedChapter().createWalkZone(
-							Ctx.project.getSelectedScene(), poly);
-				} else {
-					createZoneBtn.setText(CREATE_WALK_ZONE_TEXT);
-					createObstacleBtn.setDisabled(true);
-					deleteObstacleBtn.setDisabled(true);
-					addObstacleActorBtn.setDisabled(true);
-					scn.setPolygonalNavGraph(null);
-					Ctx.project.getSelectedChapter().deleteWalkZone(
-							Ctx.project.getSelectedScene());
-				}
-
-				event.cancel();
-			}
-
-		});
-
-		createObstacleBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				float[] verts = new float[8];
-
-				verts[3] = OBSTACLE_WIDTH;
-				verts[4] = OBSTACLE_WIDTH;
-				verts[5] = OBSTACLE_WIDTH;
-				verts[6] = OBSTACLE_WIDTH;
-
-				Polygon poly = new Polygon(verts);
-				PolygonalNavGraph pf = scn.getPolygonalNavGraph();
-				pf.addObstacle(poly);
-				Ctx.project.getSelectedChapter().createObstacle(
-						Ctx.project.getSelectedScene(), poly);
-				deleteObstacleBtn.setDisabled(false);
-
-				event.cancel();
-			}
-		});
-
-		deleteObstacleBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				PolygonalNavGraph pf = scn.getPolygonalNavGraph();
-
-				if (pf.getObstacles().size() > 0)
-					scnIL.setDeleteObstacle(true);
-				else
-					Ctx.msg.show(getStage(),
-							"There are no obstacles to delete", 3);
-
-				// if(pf.getObstacles().size() == 0)
-				// deleteObstacleBtn.setDisabled(true);
-
-				event.cancel();
-			}
-		});
-
-		addObstacleActorBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor a) {
-				if (actor.isWalkObstacle()) {
-					actor.setWalkObstacle(false);
-					Ctx.project.getSelectedChapter().setRootAttr(Ctx.project.getSelectedActor(), "obstacle", "false");
-					addObstacleActorBtn.setText(SET_ACTOR_AS_OBSTACLE_TEXT);
-				} else {
-					actor.setWalkObstacle(true);
-					Ctx.project.getSelectedChapter().setRootAttr(Ctx.project.getSelectedActor(), "obstacle", "true");
-					addObstacleActorBtn.setText(REMOVE_ACTOR_AS_OBSTACLE_TEXT);
-				}
-
-				event.cancel();
-			}
-		});
-
-		prefSize(200, 200);
-		setSize(200, 200);
-	}
-
-	public void setScene(Scene scn) {
-		this.scn = scn;
-		this.actor = null;
-
-		if (scn == null) {
-			createZoneBtn.setDisabled(true);
-			createObstacleBtn.setDisabled(true);
-			deleteObstacleBtn.setDisabled(true);
-			return;
-		}
-
-		createZoneBtn.setDisabled(false);
-
-		if (scn.getPolygonalNavGraph() == null) {
-			createZoneBtn.setText(CREATE_WALK_ZONE_TEXT);
-			createObstacleBtn.setDisabled(true);
-		} else {
-			createZoneBtn.setText(DELETE_WALK_ZONE_TEXT);
-			createObstacleBtn.setDisabled(false);
-		}
-
-		if (scn.getPolygonalNavGraph() != null
-				&& scn.getPolygonalNavGraph().getObstacles().size() > 0) {
-			deleteObstacleBtn.setDisabled(false);
-		} else {
-			deleteObstacleBtn.setDisabled(true);
-		}
-	}
-
-	public void setActor(com.bladecoder.engine.model.BaseActor a) {
-		this.actor = a;
-		
-		if(a == null) {
-			addObstacleActorBtn.setDisabled(true);			
-		} else {
-			addObstacleActorBtn.setDisabled(false);
-			
-			if(!a.isWalkObstacle()) {
-				addObstacleActorBtn.setText(SET_ACTOR_AS_OBSTACLE_TEXT);
-			} else {
-				addObstacleActorBtn.setText(SET_ACTOR_AS_OBSTACLE_TEXT);
-			}
-		}
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/BladeEngineSetup.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/BladeEngineSetup.java
deleted file mode 100644
index 96a8148c4..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/BladeEngineSetup.java
+++ /dev/null
@@ -1,645 +0,0 @@
-/*******************************************************************************
- * Copyright 2011 See AUTHORS file.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-package com.bladecoder.engineeditor.setup;
-
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.io.FileUtils;
-
-import com.bladecoder.engineeditor.setup.DependencyBank.ProjectDependency;
-import com.bladecoder.engineeditor.setup.DependencyBank.ProjectType;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-import com.bladecoder.engineeditor.utils.RunProccess;
-import com.bladecoder.engineeditor.utils.Versions;
-import com.esotericsoftware.spine.Skeleton;
-
-/** Command line tool to generate libgdx projects
- * @author badlogic
- * @author Tomski 
- * @author rgarcia*/
-public class BladeEngineSetup {
-	public static boolean isSdkLocationValid (String sdkLocation) {
-		return new File(sdkLocation, "tools").exists() && new File(sdkLocation, "platforms").exists();
-	}
-
-	public static boolean isEmptyDirectory (String destination) {
-		if (new File(destination).exists()) {
-			return new File(destination).list().length == 0;
-		} else {
-			return true;
-		}
-	}
-
-	public static boolean isSdkUpToDate (String sdkLocation) {
-		File buildTools = new File(sdkLocation, "build-tools");
-		if (!buildTools.exists()) {
-			EditorLogger.error("You have no build tools!\nUpdate your Android SDK with build tools version: "
-				+ Versions.getBuildToolsVersion());
-			return false;
-		}
-
-		File apis = new File(sdkLocation, "platforms");
-		if (!apis.exists()) {
-			EditorLogger.error("You have no Android APIs!\nUpdate your Android SDK with API level: "
-				+ Versions.getAndroidAPILevel());
-			return false;
-		}
-		String newestLocalTool = getLatestTools(buildTools);
-		int[] localToolVersion = convertTools(newestLocalTool);
-		int[] targetToolVersion = convertTools(Versions.getBuildToolsVersion());
-		if (compareVersions(targetToolVersion, localToolVersion)) {
-//			int value = JOptionPane.showConfirmDialog(null,
-//				"You have a more recent version of android build tools than the recommended.\nDo you want to use this version?",
-//				"Warning!", JOptionPane.YES_NO_OPTION);
-			
-			int value = 0; // ALWAYS USE THE CURRENT BUILD TOOLS
-			if(value == 0) {
-				Versions.setBuildToolsVersion(newestLocalTool);
-			}
-			
-			EditorLogger.error("Using build tools: " + Versions.getBuildToolsVersion());
-		} else {
-			if (!hasFileInDirectory(buildTools, Versions.getBuildToolsVersion())) {
-				EditorLogger.error("Please update your Android SDK, you need build tools: "
-					+ Versions.getBuildToolsVersion());
-				return false;
-			}
-		}
-
-		int newestLocalApi = getLatestApi(apis);
-		if (newestLocalApi > Integer.valueOf(Versions.getAndroidAPILevel())) {
-//			int value = JOptionPane.showConfirmDialog(null,
-//			"You have a more recent version of android build tools than the recommended.\nDo you want to use this version?",
-//			"Warning!", JOptionPane.YES_NO_OPTION);
-		
-			int value = 0; // ALWAYS USE THE CURRENT API
-			
-			if(value == 0) {
-				Versions.setAndroidAPILevel(Integer.toString(newestLocalApi));
-			}
-			
-			EditorLogger.error("Using API level: " + Versions.getAndroidAPILevel());
-		} else {
-			if (!hasFileInDirectory(apis, "android-" + Versions.getAndroidAPILevel())) {
-				EditorLogger.error("Please update your Android SDK, you need the Android API: "
-					+ Versions.getAndroidAPILevel());
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static boolean hasFileInDirectory (File file, String fileName) {
-		for (String name : file.list()) {
-			if (name.equals(fileName)) return true;
-		}
-		return false;
-	}
-
-	private static int getLatestApi (File apis) {
-		int apiLevel = 0;
-		for (File api : apis.listFiles()) {
-			int level = readAPIVersion(api);
-			if (level > apiLevel) apiLevel = level;
-		}
-		return apiLevel;
-	}
-
-	private static String getLatestTools (File buildTools) {
-		String version = null;
-		int[] versionSplit = new int[3];
-		int[] testSplit = new int[3];
-		for (File toolsVersion : buildTools.listFiles()) {
-			if (version == null) {
-				version = readBuildToolsVersion(toolsVersion);
-				versionSplit = convertTools(version);
-				continue;
-			}
-			testSplit = convertTools(readBuildToolsVersion(toolsVersion));
-			if (compareVersions(versionSplit, testSplit)) {
-				version = readBuildToolsVersion(toolsVersion);
-			}
-		}
-		if (version != null) {
-			return version;
-		} else {
-			return "0.0.0";
-		}
-	}
-
-	private static int readAPIVersion (File parentFile) {
-		File properties = new File(parentFile, "source.properties");
-		FileReader reader;
-		BufferedReader buffer;
-		try {
-			reader = new FileReader(properties);
-			buffer = new BufferedReader(reader);
-
-			String line = null;
-
-			while ((line = buffer.readLine()) != null) {
-				if (line.contains("AndroidVersion.ApiLevel")) {
-
-					String versionString = line.split("\\=")[1];
-					int apiLevel = Integer.parseInt(versionString);
-
-					buffer.close();
-					reader.close();
-
-					return apiLevel;
-				}
-			}
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} catch (NumberFormatException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-
-	private static String readBuildToolsVersion (File parentFile) {
-		File properties = new File(parentFile, "source.properties");
-		FileReader reader;
-		BufferedReader buffer;
-		try {
-			reader = new FileReader(properties);
-			buffer = new BufferedReader(reader);
-
-			String line = null;
-
-			while ((line = buffer.readLine()) != null) {
-				if (line.contains("Pkg.Revision")) {
-
-					String versionString = line.split("\\=")[1];
-					int count = versionString.split("\\.").length;
-					for (int i = 0; i < 3 - count; i++) {
-						versionString += ".0";
-					}
-
-					buffer.close();
-					reader.close();
-
-					return versionString;
-				}
-			}
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return "0.0.0";
-	}
-	
-	private static boolean compareVersions(int[] version, int[] testVersion) {
-		if (testVersion[0] > version[0]) {
-			return true;
-		} else if (testVersion[0] == version[0]) {
-			if (testVersion[1] > version[1]) {
-				return true;
-			} else if (testVersion[1] == version[1]) {
-				return testVersion[2] > version[2];
-			}
-		}
-		return false;
-	}
-
-	private static int[] convertTools (String toolsVersion) {
-		String[] stringSplit = toolsVersion.split("\\.");
-		int[] versionSplit = new int[3];
-		if (stringSplit.length == 3) {
-			try {
-				versionSplit[0] = Integer.parseInt(stringSplit[0]);
-				versionSplit[1] = Integer.parseInt(stringSplit[1]);
-				versionSplit[2] = Integer.parseInt(stringSplit[2]);
-				return versionSplit;
-			} catch (NumberFormatException nfe) {
-				return new int[] {0, 0, 0};
-			}
-		} else {
-			return new int[] {0, 0, 0};
-		}
-	}
-
-	public void build (ProjectBuilder builder, String outputDir, String appName, String packageName, String mainClass,
-		String sdkLocation, List<String> gradleArgs) throws IOException {
-		Project project = new Project();
-
-		String packageDir = packageName.replace('.', '/');
-		String sdkPath = sdkLocation.replace('\\', '/');
-
-		if (!isSdkLocationValid(sdkLocation)) {
-			System.out.println("Android SDK location '" + sdkLocation + "' doesn't contain an SDK");
-		}
-
-		// root dir/gradle files
-		project.files.add(new ProjectFile("gitignore", ".gitignore", false));
-		project.files.add(new TemporaryProjectFile(builder.settingsFile, "settings.gradle", false));
-		project.files.add(new TemporaryProjectFile(builder.buildFile, "build.gradle", true));
-		project.files.add(new ProjectFile("gradlew", false));
-		project.files.add(new ProjectFile("gradlew.bat", false));
-		project.files.add(new ProjectFile("gradle/wrapper/gradle-wrapper.jar", false));
-		project.files.add(new ProjectFile("gradle/wrapper/gradle-wrapper.properties", false));
-		project.files.add(new ProjectFile("gradle.properties"));
-
-		// core project
-		project.files.add(new ProjectFile("core/build.gradle"));
-//		project.files.add(new ProjectFile("core/src/MainClass", "core/src/" + packageDir + "/" + mainClass + ".java", true));
-		if (builder.modules.contains(ProjectType.HTML)) {
-			project.files.add(new ProjectFile("core/CoreGdxDefinition", "core/src/" + mainClass + ".gwt.xml", true));
-		}
-
-		// desktop project
-		if (builder.modules.contains(ProjectType.DESKTOP)) {
-			project.files.add(new ProjectFile("desktop/build.gradle"));
-			project.files.add(new ProjectFile("desktop/src/DesktopLauncher", "desktop/src/" + packageDir + "/desktop/DesktopLauncher.java", true));
-			
-			project.files.add(new ProjectFile("desktop/src/icons/icon16.png", false));
-			project.files.add(new ProjectFile("desktop/src/icons/icon32.png", false));
-			project.files.add(new ProjectFile("desktop/src/icons/icon128.png", false));
-		}
-
-		// Assets
-		String assetPath = builder.modules.contains(ProjectType.ANDROID) ? "android/assets" : "core/assets";
-		
-		// CREATE ASSETS EMPTY FOLDERS
-		new File(outputDir + "/" + assetPath + "/3d").mkdirs();
-		new File(outputDir + "/" + assetPath + "/atlases/1").mkdirs();
-		new File(outputDir + "/" + assetPath + "/backgrounds/1").mkdirs();
-		new File(outputDir + "/" + assetPath + "/images/1").mkdirs();
-		new File(outputDir + "/" + assetPath + "/model").mkdirs();
-		new File(outputDir + "/" + assetPath + "/music").mkdirs();
-		new File(outputDir + "/" + assetPath + "/sounds").mkdirs();
-		new File(outputDir + "/" + assetPath + "/test").mkdirs();
-		new File(outputDir + "/" + assetPath + "/ui/1").mkdirs();
-
-		
-		project.files.add(new ProjectFile("android/assets/model/00.chapter", assetPath + "/model/00.chapter", false));
-		project.files.add(new ProjectFile("android/assets/model/world.properties", assetPath + "/model/world.properties", false));
-		project.files.add(new ProjectFile("android/assets/model/world.xml", assetPath + "/model/world.xml", false));
-		project.files.add(new ProjectFile("android/assets/model/world_es.properties", assetPath + "/model/world_es.properties", false));
-		
-		project.files.add(new ProjectFile("android/assets/ui/ArchitectsDaughter_fix.ttf", assetPath + "/ui/ArchitectsDaughter_fix.ttf", false));
-		project.files.add(new ProjectFile("android/assets/ui/credits.txt", assetPath + "/ui/credits.txt", false));
-		project.files.add(new ProjectFile("android/assets/ui/Roboto-Black.ttf", assetPath + "/ui/Roboto-Black.ttf", false));
-		project.files.add(new ProjectFile("android/assets/ui/Roboto-Regular.ttf", assetPath + "/ui/Roboto-Regular.ttf", false));
-		project.files.add(new ProjectFile("android/assets/ui/Roboto-Thin.ttf", assetPath + "/ui/Roboto-Thin.ttf", false));
-		project.files.add(new ProjectFile("android/assets/ui/Ubuntu-M.ttf", assetPath + "/ui/Ubuntu-M.ttf", false));
-		project.files.add(new ProjectFile("android/assets/ui/ui.json", assetPath + "/ui/ui.json", false));
-		
-		project.files.add(new ProjectFile("android/assets/ui/1/blade_logo.png", assetPath + "/ui/1/blade_logo.png", false));
-		project.files.add(new ProjectFile("android/assets/ui/1/helpDesktop.png", assetPath + "/ui/1/helpDesktop.png", false));
-		project.files.add(new ProjectFile("android/assets/ui/1/helpDesktop_es.png", assetPath + "/ui/1/helpDesktop_es.png", false));
-		project.files.add(new ProjectFile("android/assets/ui/1/helpPie.png", assetPath + "/ui/1/helpPie.png", false));
-		project.files.add(new ProjectFile("android/assets/ui/1/helpPie_es.png", assetPath + "/ui/1/helpPie_es.png", false));
-		project.files.add(new ProjectFile("android/assets/ui/1/libgdx_logo.png", assetPath + "/ui/1/libgdx_logo.png", false));
-		project.files.add(new ProjectFile("android/assets/ui/1/ui.atlas", assetPath + "/ui/1/ui.atlas", false));
-		project.files.add(new ProjectFile("android/assets/ui/1/ui.png", assetPath + "/ui/1/ui.png", false));
-		
-		project.files.add(new ProjectFile("android/assets/BladeEngine.properties", assetPath + "/BladeEngine.properties", false));
-
-		// android project
-		if (builder.modules.contains(ProjectType.ANDROID)) {
-			project.files.add(new ProjectFile("android/res/values/strings.xml"));
-			project.files.add(new ProjectFile("android/res/values/styles.xml", false));
-			project.files.add(new ProjectFile("android/res/drawable-hdpi/ic_launcher.png", false));
-			project.files.add(new ProjectFile("android/res/drawable-mdpi/ic_launcher.png", false));
-			project.files.add(new ProjectFile("android/res/drawable-xhdpi/ic_launcher.png", false));
-			project.files.add(new ProjectFile("android/res/drawable-xxhdpi/ic_launcher.png", false));
-			project.files.add(new ProjectFile("android/src/AndroidLauncher", "android/src/" + packageDir + "/android/AndroidLauncher.java", true));
-			project.files.add(new ProjectFile("android/AndroidManifest.xml"));
-			project.files.add(new ProjectFile("android/build.gradle", true));
-			project.files.add(new ProjectFile("android/ic_launcher-web.png", false));
-			project.files.add(new ProjectFile("android/proguard-project.txt", false));
-			project.files.add(new ProjectFile("android/project.properties", false));
-			project.files.add(new ProjectFile("local.properties", true));
-		}
-
-		// html project
-		if (builder.modules.contains(ProjectType.HTML)) {
-			project.files.add(new ProjectFile("html/build.gradle"));
-			project.files.add(new ProjectFile("html/src/HtmlLauncher", "html/src/" + packageDir + "/client/HtmlLauncher.java", true));
-			project.files.add(new ProjectFile("html/GdxDefinition", "html/src/" + packageDir + "/GdxDefinition.gwt.xml", true));
-			project.files.add(new ProjectFile("html/GdxDefinitionSuperdev", "html/src/" + packageDir + "/GdxDefinitionSuperdev.gwt.xml", true));
-			project.files.add(new ProjectFile("html/war/index", "html/webapp/index.html", true));
-			project.files.add(new ProjectFile("html/war/styles.css", "html/webapp/styles.css", false));
-			project.files.add(new ProjectFile("html/war/refresh.png", "html/webapp/refresh.png", false));
-			project.files.add(new ProjectFile("html/war/soundmanager2-jsmin.js", "html/webapp/soundmanager2-jsmin.js", false));
-			project.files.add(new ProjectFile("html/war/soundmanager2-setup.js", "html/webapp/soundmanager2-setup.js", false));
-			project.files.add(new ProjectFile("html/war/WEB-INF/web.xml", "html/webapp/WEB-INF/web.xml", true));
-		}
-
-		// ios robovm
-		if (builder.modules.contains(ProjectType.IOS)) {
-			project.files.add(new ProjectFile("ios/src/IOSLauncher", "ios/src/" + packageDir + "/ios/IOSLauncher.java", true));
-			project.files.add(new ProjectFile("ios/data/Default.png", false));
-			project.files.add(new ProjectFile("ios/data/Default@2x.png", false));
-			project.files.add(new ProjectFile("ios/data/Default@2x~ipad.png", false));
-			project.files.add(new ProjectFile("ios/data/Default-568h@2x.png", false));
-			project.files.add(new ProjectFile("ios/data/Default~ipad.png", false));
-			project.files.add(new ProjectFile("ios/data/Icon.png", false));
-			project.files.add(new ProjectFile("ios/data/Icon@2x.png", false));
-			project.files.add(new ProjectFile("ios/data/Icon-72.png", false));
-			project.files.add(new ProjectFile("ios/data/Icon-72@2x.png", false));
-			project.files.add(new ProjectFile("ios/build.gradle", true));
-			project.files.add(new ProjectFile("ios/Info.plist.xml", false));
-			project.files.add(new ProjectFile("ios/robovm.properties"));
-			project.files.add(new ProjectFile("ios/robovm.xml", true));
-		}
-
-		Map<String, String> values = new HashMap<String, String>();
-		values.put("%APP_NAME%", appName);
-		values.put("%PACKAGE%", packageName);
-		values.put("%PACKAGE_DIR%", packageDir);
-		values.put("%MAIN_CLASS%", mainClass);
-		values.put("%ANDROID_SDK%", sdkPath);
-		values.put("%ASSET_PATH%", assetPath);
-		values.put("%BUILD_TOOLS_VERSION%", Versions.getBuildToolsVersion());
-		values.put("%API_LEVEL%", Versions.getAndroidAPILevel());
-		values.put("%GWT_VERSION%", Versions.getGwtVersion());
-		if (builder.modules.contains(ProjectType.HTML)) {
-			values.put("%GWT_INHERITS%", parseGwtInherits(builder.bank.gwtInheritances, builder));
-		}
-
-		copyAndReplace(outputDir, project, values);
-		copyLibs(outputDir);
-
-		builder.cleanUp();
-
-		// HACK executable flag isn't preserved for whatever reason...
-		new File(outputDir, "gradlew").setExecutable(true);
-
-		RunProccess.runGradle(new File(outputDir), "clean" + parseGradleArgs(builder.modules, gradleArgs));
-	}
-	
-	/** 
-	 * Copy the blade-engine.jar and libgdx-spine.jar to the output folder
-	 * @param outputDir
-	 * @throws IOException 
-	 */
-	private void copyLibs(String outputDir) throws IOException {
-//		File bladeEngineFile =  new File(BladeEngine.class.getProtectionDomain().getCodeSource().getLocation().getPath());
-		File libSpineFile =  new File(Skeleton.class.getProtectionDomain().getCodeSource().getLocation().getPath());
-		
-		FileUtils.copyFileToDirectory(libSpineFile, new File(outputDir + "/libs"));
-		
-		// blade-engine.jar is in Maven Central now
-//		if(bladeEngineFile.isDirectory()) {
-//			EditorLogger.error("Editor is running inside IDE. Trying to build blade-engine.jar");
-//			RunProccess.runGradle(bladeEngineFile.getParentFile().getParentFile(), ":blade-engine:jar");
-//			
-//			FileUtils.copyDirectory(new File(bladeEngineFile.getParent() + "/build/libs"), new File(outputDir + "/libs"));
-//		} else {
-//			FileUtils.copyFileToDirectory(bladeEngineFile, new File(outputDir + "/libs"));
-//		}
-	}
-
-	private void copyAndReplace (String outputDir, Project project, Map<String, String> values) throws IOException {
-		File out = new File(outputDir);
-		if (!out.exists() && !out.mkdirs()) {
-			throw new RuntimeException("Couldn't create output directory '" + out.getAbsolutePath() + "'");
-		}
-
-		for (ProjectFile file : project.files) {
-			copyFile(file, out, values);
-		}
-	}
-
-	private byte[] readResource (String resource, String path) {
-		InputStream in = null;
-		try {
-			ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-			byte[] buffer = new byte[1024 * 10];
-			in = BladeEngineSetup.class.getResourceAsStream(path + resource);
-			if (in == null) throw new RuntimeException("Couldn't read resource '" + resource + "'");
-			int read = 0;
-			while ((read = in.read(buffer)) > 0) {
-				bytes.write(buffer, 0, read);
-			}
-			return bytes.toByteArray();
-		} catch (IOException e) {
-			throw new RuntimeException("Couldn't read resource '" + resource + "'", e);
-		} finally {
-			if (in != null) try {
-				in.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-
-	private byte[] readResource (File file) throws IOException {
-		InputStream in = null;
-		try {
-			ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-			byte[] buffer = new byte[1024 * 10];
-			in = new FileInputStream(file);
-			int read = 0;
-			while ((read = in.read(buffer)) > 0) {
-				bytes.write(buffer, 0, read);
-			}
-			return bytes.toByteArray();
-		} catch (Exception e) {
-			throw new IOException("Couldn't read resource '" + file.getAbsoluteFile() + "'", e);
-		} finally {
-			if (in != null) try {
-				in.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-
-	private String readResourceAsString (String resource, String path) {
-		try {
-			return new String(readResource(resource, path), "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private String readResourceAsString (File file) throws IOException {
-		try {
-			return new String(readResource(file), "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private void writeFile (File outFile, byte[] bytes) {
-		OutputStream out = null;
-
-		try {
-			out = new BufferedOutputStream(new FileOutputStream(outFile));
-			out.write(bytes);
-		} catch (IOException e) {
-			throw new RuntimeException("Couldn't write file '" + outFile.getAbsolutePath() + "'", e);
-		} finally {
-			if (out != null) try {
-				out.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-
-	private void writeFile (File outFile, String text) {
-		try {
-			writeFile(outFile, text.getBytes("UTF-8"));
-		} catch (UnsupportedEncodingException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private void copyFile (ProjectFile file, File out, Map<String, String> values) throws IOException {
-		File outFile = new File(out, file.outputName);
-		if (!outFile.getParentFile().exists() && !outFile.getParentFile().mkdirs()) {
-			throw new RuntimeException("Couldn't create dir '" + outFile.getAbsolutePath() + "'");
-		}
-
-		boolean isTemp = file instanceof TemporaryProjectFile ? true : false;
-
-		if (file.isTemplate) {
-			String txt;
-			if (isTemp) {
-				txt = readResourceAsString(((TemporaryProjectFile)file).file);
-			} else {
-				txt = readResourceAsString(file.resourceName, file.resourceLoc);
-			}
-			txt = replace(txt, values);
-			writeFile(outFile, txt);
-		} else {
-			if (isTemp) {
-				writeFile(outFile, readResource(((TemporaryProjectFile)file).file));
-			} else {
-				writeFile(outFile, readResource(file.resourceName, file.resourceLoc));
-			}
-		}
-	}
-
-	private String replace (String txt, Map<String, String> values) {
-		for (String key : values.keySet()) {
-			String value = values.get(key);
-			txt = txt.replace(key, value);
-		}
-		return txt;
-	}
-
-	private static void printHelp () {
-		System.out
-			.println("Usage: GdxSetup --dir <dir-name> --name <app-name> --package <package> --mainClass <mainClass> --sdkLocation <SDKLocation>");
-		System.out.println("dir ... the directory to write the project files to");
-		System.out.println("name ... the name of the application");
-		System.out.println("package ... the Java package name of the application");
-		System.out.println("mainClass ... the name of your main ApplicationListener");
-		System.out.println("sdkLocation ... the location of your android SDK. Uses ANDROID_HOME if not specified");
-	}
-
-	private static Map<String, String> parseArgs (String[] args) {
-		if (args.length % 2 != 0) {
-			printHelp();
-			System.exit(-1);
-		}
-
-		Map<String, String> params = new HashMap<String, String>();
-		for (int i = 0; i < args.length; i += 2) {
-			String param = args[i].replace("--", "");
-			String value = args[i + 1];
-			params.put(param, value);
-		}
-		return params;
-	}
-
-	private String parseGwtInherits (HashMap<ProjectDependency, String[]> gwtInheritances, ProjectBuilder builder) {
-		String parsed = "";
-		for (ProjectDependency dep : gwtInheritances.keySet()) {
-			if (containsDependency(builder.dependencies, dep)) {
-				for (String inherit : gwtInheritances.get(dep)) {
-					parsed += "\t<inherits name='" + inherit + "' />\n";
-				}
-			}
-		}
-		return parsed;
-	}
-
-	private String parseGradleArgs (List<ProjectType> modules, List<String> args) {
-		String argString = "";
-		if (args == null) return argString;
-		for (String argument : args) {
-			if (argument.equals("afterEclipseImport") && !modules.contains(ProjectType.DESKTOP)) continue;
-			argString += " " + argument;
-		}
-		return argString;
-	}
-
-	private boolean containsDependency (List<Dependency> dependencyList, ProjectDependency projectDependency) {
-		for (Dependency dep : dependencyList) {
-			if (dep.getName().equals(projectDependency.name())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static void main (String[] args) throws IOException {
-		Map<String, String> params = parseArgs(args);
-		if (!params.containsKey("dir") ||
-			!params.containsKey("name") ||
-			!params.containsKey("package") ||
-			!params.containsKey("mainClass") ||
-			((!params.containsKey("sdkLocation") && System.getenv("ANDROID_HOME") == null))) {
-			printHelp();
-		} else {
-			String sdkLocation = "";
-			if (System.getenv("ANDROID_HOME") != null && !params.containsKey("sdkLocation")) {
-				sdkLocation = System.getenv("ANDROID_HOME");
-			} else {
-				sdkLocation = params.get("sdkLocation");
-			}
-
-			DependencyBank bank = new DependencyBank();
-			ProjectBuilder builder = new ProjectBuilder(bank);
-			List<ProjectType> projects = new ArrayList<ProjectType>();
-			projects.add(ProjectType.CORE);
-			projects.add(ProjectType.DESKTOP);
-			projects.add(ProjectType.ANDROID);
-			projects.add(ProjectType.IOS);
-			projects.add(ProjectType.HTML);
-
-			List<Dependency> dependencies = new ArrayList<Dependency>();
-			dependencies.add(bank.getDependency(ProjectDependency.GDX));
-
-			builder.buildProject(projects, dependencies);
-			builder.build();
-			new BladeEngineSetup().build(builder, params.get("dir"), params.get("name"), params.get("package"), params.get("mainClass"),
-				sdkLocation, null);
-		}
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/BuildScriptHelper.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/BuildScriptHelper.java
deleted file mode 100644
index f6bfba87a..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/BuildScriptHelper.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.bladecoder.engineeditor.setup;
-
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.util.List;
-
-import com.bladecoder.engineeditor.setup.DependencyBank.ProjectType;
-import com.bladecoder.engineeditor.utils.Versions;
-
-public class BuildScriptHelper {
-
-	private static int indent = 0;
-
-	public static void addBuildScript(List<ProjectType> projects, BufferedWriter wr) throws IOException {
-		write(wr, "buildscript {");
-		//repos
-		write(wr, "repositories {");
-		write(wr, DependencyBank.mavenCentral);
-		if (projects.contains(ProjectType.HTML)) {
-			write(wr, DependencyBank.jCenter);
-		}
-		write(wr, "}");
-		//dependencies
-		write(wr, "dependencies {");
-		if (projects.contains(ProjectType.HTML)) {
-			write(wr, "classpath '" + DependencyBank.gwtPluginImport + "'");
-		}
-		if (projects.contains(ProjectType.ANDROID)) {
-			write(wr, "classpath '" + DependencyBank.androidPluginImport + "'");
-		}
-		if (projects.contains(ProjectType.IOS)) {
-			write(wr, "classpath '" + DependencyBank.roboVMPluginImport + "'");
-		}
-		write(wr, "}");
-		write(wr, "}");
-		space(wr);
-	}
-
-	public static void addAllProjects(BufferedWriter wr) throws IOException {
-		write(wr, "allprojects {");
-		write(wr, "apply plugin: \"eclipse\"");
-		write(wr, "apply plugin: \"idea\"");
-		space(wr);
-		write(wr, "version = '1.0'");
-		
-	    write(wr, "if(project.hasProperty('passed_version'))\n        version = passed_version");
-		
-		write(wr, "ext {");
-		write(wr, "appName = '%APP_NAME%'");
-		write(wr, "bladeEngineVersion = '" + Versions.getVersion() + "'");
-		write(wr, "gdxVersion = '" + Versions.getLibgdxVersion() + "'");
-		write(wr, "roboVMVersion = '" + Versions.getRoboVMVersion() + "'");
-		write(wr, "}");
-		space(wr);
-		write(wr, "repositories {");
-		write(wr, DependencyBank.mavenCentral);
-		write(wr, "maven { url \"" + DependencyBank.libGDXSnapshotsUrl + "\" }");
-		write(wr, "maven { url \"" + DependencyBank.libGDXReleaseUrl + "\" }");
-		write(wr, "}");
-		write(wr, "}");
-	}
-
-	public static void addProject(ProjectType project, List<Dependency> dependencies, BufferedWriter wr) throws IOException {
-		space(wr);
-		write(wr, "project(\":" + project.getName() + "\") {");
-		for (String plugin : project.getPlugins()) {
-			write(wr, "apply plugin: \"" + plugin + "\"");
-		}
-		space(wr);
-		addConfigurations(project, wr);
-		space(wr);
-		addDependencies(project, dependencies, wr);
-		write(wr, "}");
-	}
-
-	private static void addDependencies(ProjectType project, List<Dependency> dependencyList, BufferedWriter wr) throws IOException {
-		write(wr, "dependencies {");
-		if (!project.equals(ProjectType.CORE)) {
-			write(wr, "compile project(\":" + ProjectType.CORE.getName() + "\")");
-		}
-		for (Dependency dep : dependencyList) {
-			if (dep.getDependencies(project) == null) continue;
-			for (String moduleDependency : dep.getDependencies(project)) {
-				if (moduleDependency == null) continue;
-				if ((project.equals(ProjectType.ANDROID) || project.equals(ProjectType.IOS)) && moduleDependency.contains("native")) {
-					write(wr, "natives \"" + moduleDependency + "\"");
-				} else {
-					if(moduleDependency.startsWith("fileTree("))
-						write(wr, "compile " + moduleDependency);
-					else
-						write(wr, "compile \"" + moduleDependency + "\"");
-				}
-			}
-		}
-		write(wr, "}");
-	}
-
-	private static void addConfigurations(ProjectType project, BufferedWriter wr) throws IOException {
-		if (project.equals(ProjectType.IOS) || project.equals(ProjectType.ANDROID)) {
-			write(wr, "configurations { natives }");
-		}
-	}
-
-	private static void write(BufferedWriter wr, String input) throws IOException {
-		int delta = StringUtils.countMatches(input, '{') - StringUtils.countMatches(input, '}');
-		indent += delta *= 4;
-		indent = clamp(indent);
-		if (delta > 0) {
-			wr.write(StringUtils.repeat(" ", clamp(indent - 4)) + input + "\n");
-		} else if (delta < 0) {
-			wr.write(StringUtils.repeat(" ", clamp(indent)) + input + "\n");
-		} else {
-			wr.write(StringUtils.repeat(" ", indent) + input + "\n");
-		}
-	}
-
-	private static void space(BufferedWriter wr) throws IOException {
-		wr.write("\n");
-	}
-
-	private static int clamp(int indent) {
-		if (indent < 0) {
-			return 0;
-		}
-		return indent;
-	}
-
-	static class StringUtils {
-
-		public static int countMatches(String input, char match) {
-			int count = 0;
-			for (int i = 0; i < input.length(); i++) {
-				if (input.charAt(i) == match) {
-					count++;
-				}
-			}
-			return count;
-		}
-
-		public static String repeat(String toRepeat, int count) {
-			String repeat = "";
-			for (int i = 0; i < count; i++) {
-				repeat += toRepeat;
-			}
-			return repeat;
-		}
-	}
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/Dependency.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/Dependency.java
deleted file mode 100644
index 8a2b77099..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/Dependency.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.bladecoder.engineeditor.setup;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import com.bladecoder.engineeditor.setup.DependencyBank.ProjectType;
-
-
-public class Dependency {
-
-    private HashMap<ProjectType, String[]> subDependencyMap = new HashMap<ProjectType, String[]>();
-    private String name;
-
-    public Dependency(String name, String[]... subDependencies) {
-        this.name = name;
-        for (ProjectType type : ProjectType.values()) {
-            subDependencyMap.put(type, subDependencies[type.ordinal()]);
-        }
-    }
-
-    public String[] getDependencies(ProjectType type) {
-    	return subDependencyMap.get(type);
-    }
-
-	public List<String> getIncompatibilities(ProjectType type) {
-		List<String> incompat = new ArrayList<String>();
-		String[] subArray = subDependencyMap.get(type);
-		if (subArray == null) {
-			incompat.add("Dependency " + name + " is not compatible with sub module " + type.getName().toUpperCase());
-		}
-		return incompat;
-	}
-
-    public String getName() {
-        return name;
-    }
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/DependencyBank.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/DependencyBank.java
deleted file mode 100644
index 97d886729..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/DependencyBank.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.bladecoder.engineeditor.setup;
-
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-
-public class DependencyBank {
-	//Repositories
-	static String mavenCentral = "mavenCentral()";
-	static String jCenter = "jcenter()";
-	static String libGDXSnapshotsUrl = "https://oss.sonatype.org/content/repositories/snapshots/";
-	static String libGDXReleaseUrl = "https://oss.sonatype.org/content/repositories/releases/";
-
-	//Project plugins
-	static String gwtPluginImport = "de.richsource.gradle.plugins:gwt-gradle-plugin:0.5";
-	static String androidPluginImport = "com.android.tools.build:gradle:0.13+";
-	static String roboVMPluginImport = "org.robovm:robovm-gradle-plugin:1.0.0-alpha-04";
-
-	HashMap<ProjectDependency, Dependency> gdxDependencies = new HashMap<ProjectDependency, Dependency>();
-	LinkedHashMap<ProjectDependency, String[]> gwtInheritances = new LinkedHashMap<ProjectDependency, String[]>();
-
-	public DependencyBank() {
-		for (ProjectDependency projectDep : ProjectDependency.values()) {
-			Dependency dependency = new Dependency(projectDep.name(),
-					projectDep.getDependencies(ProjectType.CORE),
-					projectDep.getDependencies(ProjectType.DESKTOP),
-					projectDep.getDependencies(ProjectType.ANDROID),
-					projectDep.getDependencies(ProjectType.IOS),
-					projectDep.getDependencies(ProjectType.HTML));
-			gdxDependencies.put(projectDep, dependency);
-		}
-		gwtInheritances.put(ProjectDependency.GDX, new String[]{"com.badlogic.gdx.backends.gdx_backends_gwt"});
-		gwtInheritances.put(ProjectDependency.CONTROLLERS, new String[]{"com.badlogic.gdx.controllers.controllers-gwt"});
-		gwtInheritances.put(ProjectDependency.BOX2D, new String[]{"com.badlogic.gdx.physics.box2d.box2d-gwt"});
-		gwtInheritances.put(ProjectDependency.BOX2DLIGHTS, new String[]{"Box2DLights"});
-		gwtInheritances.put(ProjectDependency.ASHLEY, new String[]{"com.badlogic.ashley_gwt"});
-	}
-
-	public Dependency getDependency(ProjectDependency gdx) {
-		return gdxDependencies.get(gdx);
-	}
-
-
-	/**
-	 * This enum will hold all dependencies available for libgdx, allowing the setup to pick the ones needed by default,
-	 * and allow the option to choose extensions as the user wishes.
-	 * <p/>
-	 * These depedency strings can be later used in a simple gradle plugin to manipulate the users project either after/before
-	 * project generation
-	 *
-	 * @see Dependency for the object that handles sub-module dependencies. If no dependency is found for a sub-module, ie
-	 * FreeTypeFont for gwt, an exception is thrown so the user can be notified of incompatability
-	 */
-	public enum ProjectDependency {
-		GDX(
-			new String[]{"com.badlogicgames.gdx:gdx:$gdxVersion", "fileTree(dir: '../libs', include: '*.jar')", "com.bladecoder.engine:blade-engine:$bladeEngineVersion"},
-			new String[]{"com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"},
-			new String[]{"com.badlogicgames.gdx:gdx-backend-android:$gdxVersion", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86", "fileTree(dir: '../libs', include: '*.jar')"},
-			new String[]{"org.robovm:robovm-rt:${roboVMVersion}", "org.robovm:robovm-cocoatouch:${roboVMVersion}", "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion", "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"},
-			new String[]{"com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion", "com.badlogicgames.gdx:gdx:$gdxVersion:sources", "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"},
-			
-			"Core Library for LibGDX"
-		),
-		BULLET(
-			new String[]{"com.badlogicgames.gdx:gdx-bullet:$gdxVersion"},
-			new String[]{"com.badlogicgames.gdx:gdx-bullet-platform:$gdxVersion:natives-desktop"},
-			new String[]{"com.badlogicgames.gdx:gdx-bullet:$gdxVersion", "com.badlogicgames.gdx:gdx-bullet-platform:$gdxVersion:natives-armeabi", "com.badlogicgames.gdx:gdx-bullet-platform:$gdxVersion:natives-armeabi-v7a", "com.badlogicgames.gdx:gdx-bullet-platform:$gdxVersion:natives-x86"},
-			new String[]{"com.badlogicgames.gdx:gdx-bullet-platform:$gdxVersion:natives-ios"},
-			null,
-			
-			"3D Collision Detection and Rigid Body Dynamics"
-		),
-		FREETYPE(
-			new String[]{"com.badlogicgames.gdx:gdx-freetype:$gdxVersion"},
-			new String[]{"com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"},
-			new String[]{"com.badlogicgames.gdx:gdx-freetype:$gdxVersion", "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi", "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a", "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"},
-			new String[]{"com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"},
-			null,
-			
-			"Generate BitmapFonts from .ttf font files"
-		),
-		TOOLS(
-			new String[]{},
-			new String[]{"com.badlogicgames.gdx:gdx-tools:$gdxVersion"},
-			new String[]{},
-			new String[]{},
-			new String[]{},
-			
-			"Collection of tools, including 2D/3D particle editors, texture packers, and file processors"
-		),
-		CONTROLLERS(
-			new String[]{"com.badlogicgames.gdx:gdx-controllers:$gdxVersion"},
-			new String[]{"com.badlogicgames.gdx:gdx-controllers-desktop:$gdxVersion", "com.badlogicgames.gdx:gdx-controllers-platform:$gdxVersion:natives-desktop"},
-			new String[]{"com.badlogicgames.gdx:gdx-controllers:$gdxVersion", "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion"},
-			new String[] {}, // works on iOS but never reports any controllers :)
-			new String[]{"com.badlogicgames.gdx:gdx-controllers:$gdxVersion:sources", "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion", "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion:sources"},
-			
-			"Controller/Gamepad API"
-		),
-		BOX2D(
-			new String[]{"com.badlogicgames.gdx:gdx-box2d:$gdxVersion"},
-			new String[]{"com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"},
-			new String[]{"com.badlogicgames.gdx:gdx-box2d:$gdxVersion", "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi", "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi-v7a", "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86"},
-			new String[]{"com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-ios"},
-			new String[]{"com.badlogicgames.gdx:gdx-box2d:$gdxVersion:sources", "com.badlogicgames.gdx:gdx-box2d-gwt:$gdxVersion:sources"},
-			
-			"2D Physics Library"
-		),	
-		BOX2DLIGHTS(
-			new String[]{"com.badlogicgames.box2dlights:box2dlights:1.2"},
-			new String[]{},
-			new String[]{"com.badlogicgames.box2dlights:box2dlights:1.2"},
-			new String[]{},
-			new String[]{"com.badlogicgames.box2dlights:box2dlights:1.2:sources"},
-			
-			"2D Lighting framework that utilises Box2D"
-		),
-		ASHLEY(
-			new String[]{"com.badlogicgames.ashley:ashley:1.1.0"},
-			new String[]{},
-			new String[]{"com.badlogicgames.ashley:ashley:1.1.0"},
-			new String[]{},
-			new String[]{"com.badlogicgames.ashley:ashley:1.1.0:sources"},
-			
-			"Lightweight Entity framework"
-		);
-
-		private String[] coreDependencies;
-		private String[] desktopDependencies;
-		private String[] androidDependencies;
-		private String[] iosDependencies;
-		private String[] gwtDependencies;
-		private String description;
-
-		ProjectDependency(String[] coreDeps, String[] desktopDeps, String[] androidDeps, String[] iosDeps, String[] gwtDeps, String description) {
-			this.coreDependencies = coreDeps;
-			this.desktopDependencies = desktopDeps;
-			this.androidDependencies = androidDeps;
-			this.iosDependencies = iosDeps;
-			this.gwtDependencies = gwtDeps;
-			this.description = description;
-		}
-
-		public String[] getDependencies(ProjectType type) {
-			switch (type) {
-				case CORE:
-					return coreDependencies;
-				case DESKTOP:
-					return desktopDependencies;
-				case ANDROID:
-					return androidDependencies;
-				case IOS:
-					return iosDependencies;
-				case HTML:
-					return gwtDependencies;
-			}
-			return null;
-		}
-		
-		public String getDescription() {
-			return description;
-		}
-	}
-
-
-	public enum ProjectType {
-		CORE("core", new String[]{"java"}),
-		DESKTOP("desktop", new String[]{"java"}),
-		ANDROID("android", new String[]{"android"}),
-		IOS("ios", new String[]{"java", "robovm"}),
-		HTML("html", new String[]{"gwt", "war"});
-
-		private final String name;
-		private final String[] plugins;
-
-		ProjectType(String name, String plugins[]) {
-			this.name = name;
-			this.plugins = plugins;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public String[] getPlugins() {
-			return plugins;
-		}
-	}
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/ProjectBuilder.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/ProjectBuilder.java
deleted file mode 100644
index 5af578b00..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/ProjectBuilder.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.bladecoder.engineeditor.setup;
-
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.bladecoder.engineeditor.setup.DependencyBank.ProjectType;
-
-public class ProjectBuilder {
-
-	DependencyBank bank;
-	List<ProjectType> modules = new ArrayList<ProjectType>();
-	List<Dependency> dependencies = new ArrayList<Dependency>();
-	File settingsFile;
-	File buildFile;
-
-	public ProjectBuilder(DependencyBank bank) {
-		this.bank = bank;
-	}
-
-	public List<String> buildProject(List<ProjectType> projects, List<Dependency> dependencies) {
-		List<String> incompatibilities = new ArrayList<String>();
-		for (Dependency dep : dependencies) {
-			for (ProjectType type : projects) {
-				dep.getDependencies(type);
-				incompatibilities.addAll(dep.getIncompatibilities(type));
-			}
-		}
-		this.modules = projects;
-		this.dependencies = dependencies;
-		return incompatibilities;
-	}
-
-	public boolean build() throws IOException {
-		settingsFile = File.createTempFile("libgdx-setup-settings", ".gradle");
-		buildFile = File.createTempFile("libgdx-setup-build", ".gradle");
-		if (!settingsFile.exists()) {
-			settingsFile.createNewFile();
-		}
-		if (!buildFile.exists()) {
-			buildFile.createNewFile();
-		}
-		settingsFile.setWritable(true);
-		buildFile.setWritable(true);
-		try {
-			FileWriter settingsWriter = new FileWriter(settingsFile.getAbsoluteFile());
-			BufferedWriter settingsBw = new BufferedWriter(settingsWriter);
-			String settingsContents = "include ";
-			for (ProjectType module : modules) {
-				settingsContents += "'" + module.getName() + "'";
-				if (modules.indexOf(module) != modules.size() - 1) {
-					settingsContents += ", ";
-				}
-			}
-			settingsBw.write(settingsContents);
-			settingsBw.close();
-			settingsWriter.close();
-
-			FileWriter buildWriter = new FileWriter(buildFile.getAbsoluteFile());
-			BufferedWriter buildBw = new BufferedWriter(buildWriter);
-
-			BuildScriptHelper.addBuildScript(modules, buildBw);
-			BuildScriptHelper.addAllProjects(buildBw);
-			for (ProjectType module : modules) {
-				BuildScriptHelper.addProject(module, dependencies, buildBw);
-			}
-
-			//Add task here for now
-			buildBw.write("\n");
-			buildBw.write("tasks.eclipse.doLast {\n");
-			buildBw.write("    delete \".project\"\n");
-			buildBw.write("}");
-
-			buildBw.close();
-			buildWriter.close();
-			return true;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return false;
-		}
-	}
-
-	public void cleanUp() {
-		settingsFile.deleteOnExit();
-		buildFile.deleteOnExit();
-	}
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActorList.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActorList.java
deleted file mode 100644
index 1a90427aa..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActorList.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.ChapterDocument;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.CellRenderer;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.ElementList;
-
-public class ActorList extends ElementList {
-
-	private ImageButton playerBtn;
-
-	public ActorList(Skin skin) {
-		super(skin, true);
-
-		playerBtn = new ImageButton(skin);
-		toolbar.addToolBarButton(playerBtn, "ic_check",
-				"Set player", "Set player");
-		playerBtn.setDisabled(true);
-
-		list.addListener(new ChangeListener() {
-			
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-//				EditorLogger.debug("ACTOR LIST ELEMENT SELECTED");
-				int pos = list.getSelectedIndex();
-
-				if (pos == -1) {
-					Ctx.project.setSelectedActor(null);
-				} else {
-					Element a = list.getItems().get(pos);
-					Ctx.project.setSelectedActor(a);
-				}
-
-				toolbar.disableEdit(pos == -1);
-				playerBtn.setDisabled(pos== -1);
-			}
-		});
-
-		playerBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				setPlayer();
-			}
-		});
-
-		list.setCellRenderer(listCellRenderer);
-
-		Ctx.project.addPropertyChangeListener(Project.NOTIFY_ACTOR_SELECTED,
-				new PropertyChangeListener() {
-					@Override
-					public void propertyChange(PropertyChangeEvent e) {
-						int pos = list.getSelectedIndex();
-
-						// Element newActor = (Element) e.getNewValue();
-						Element newActor = Ctx.project.getSelectedActor();
-
-						if (newActor == null)
-							return;
-
-						if (pos != -1) {
-							Element oldActor = list.getItems().get(pos);
-
-							if (oldActor == newActor) {
-								return;
-							}
-						}
-
-						int i = list.getItems().indexOf(newActor, true);
-						if(i >= 0)
-							list.setSelectedIndex(i);
-					}
-				});
-	}
-
-	@Override
-	protected EditElementDialog getEditElementDialogInstance(
-			Element e) {
-		return new EditActorDialog(skin, doc, parent, e);
-	}
-
-	private void setPlayer() {
-		ChapterDocument scn = (ChapterDocument) doc;
-
-		int pos = list.getSelectedIndex();
-
-		if (pos == -1)
-			return;
-
-		Element e = list.getItems().get(pos);
-
-		if (!e.getAttribute("type").equals(ChapterDocument.NO_RENDERER_ACTOR_TYPE)
-				) {
-			String id = e.getAttribute("id");
-
-			scn.setRootAttr(parent, "player", id);
-		}
-	}
-
-	// -------------------------------------------------------------------------
-	// ListCellRenderer
-	// -------------------------------------------------------------------------
-	private final CellRenderer<Element> listCellRenderer = new CellRenderer<Element>() {
-
-		@Override
-		protected String getCellTitle(Element e) {
-			return e.getAttribute("id");
-		}
-
-		@Override
-		protected String getCellSubTitle(Element e) {
-			return doc.getTranslation(e.getAttribute("desc"));
-		}
-
-		@Override
-		public TextureRegion getCellImage(Element e) {
-			String type = e.getAttribute("type");
-
-			boolean isPlayer = ((Element)e.getParentNode()).getAttribute("player").equals(
-					e.getAttribute("id"));
-
-			String u = null;
-			
-			if (isPlayer) {
-				u = "ic_character_actor";
-			} else if (type.equals(ChapterDocument.IMAGE_ACTOR_TYPE)) {
-				u = "ic_sprite_actor";
-			} else if (type.equals(ChapterDocument.ATLAS_ACTOR_TYPE)) {
-				u = "ic_sprite_actor";
-			} else if (type.equals(ChapterDocument.NO_RENDERER_ACTOR_TYPE)) {
-				u = "ic_base_actor";
-			} else if (type.equals(ChapterDocument.SPINE_ACTOR_TYPE)) {
-				u = "ic_spine";			
-			} else if (type.equals(ChapterDocument.SPRITE3D_ACTOR_TYPE)) {
-				u = "ic_3d";
-			}
-
-			return Ctx.assetManager.getIcon(u);
-		}
-		
-		@Override
-		protected boolean hasSubtitle() {
-			return true;
-		}
-		
-		@Override
-		protected boolean hasImage() {
-			return true;
-		}
-	};
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActorPanel.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActorPanel.java
deleted file mode 100644
index 5265e6d5b..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActorPanel.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.ChapterDocument;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.HeaderPanel;
-import com.bladecoder.engineeditor.ui.components.TabPanel;
-
-public class ActorPanel extends HeaderPanel {
-
-	private TabPanel tabPanel;
-	private VerbList verbList;
-	private DialogList dialogList;
-	private SpriteList faList;
-	private SoundList soundList;
-	private ActorProps props;
-
-	public ActorPanel(Skin skin) {
-		super(skin, "ACTOR");
-		tabPanel = new TabPanel(skin);
-		verbList = new VerbList(skin);
-		dialogList = new DialogList(skin);
-		faList = new SpriteList(skin);
-		props = new ActorProps(skin);
-		soundList = new SoundList(skin);
-		
-		setContent(tabPanel);
-
-		Ctx.project.addPropertyChangeListener(Project.NOTIFY_ACTOR_SELECTED,
-				new PropertyChangeListener() {
-					@Override
-					public void propertyChange(PropertyChangeEvent e) {
-						Element a = (Element) e.getNewValue();
-						ChapterDocument doc = Ctx.project.getSelectedChapter();
-
-						String selTitle = tabPanel.getSelectedIndex() == -1? null: tabPanel.getTitleAt(tabPanel.getSelectedIndex());
-						tabPanel.clear();
-
-						if (a != null) {
-
-							String type = doc.getType(a);
-
-							if (!type.equals(ChapterDocument.NO_RENDERER_ACTOR_TYPE))
-								tabPanel.addTab("Sprites", faList);
-
-							if (!type.equals("foreground")) {
-								tabPanel.addTab("Verbs", verbList);
-								tabPanel.addTab("Sounds", soundList);
-							}
-
-							tabPanel.addTab("Dialogs", dialogList);
-							tabPanel.addTab("Properties", props);
-							setTile("ACTOR " + doc.getId(a));
-
-							// select previous selected tab
-							if (selTitle != null) {
-								for (int i = 0; i < tabPanel.getTabCount(); i++) {
-									if (tabPanel.getTitleAt(i).equals(selTitle)) {
-										tabPanel.setTab(i);
-									}
-								}
-							}
-
-						} else {
-							setTile("ACTOR");
-						}
-						
-						faList.addElements(doc, a, "frame_animation");
-						verbList.addElements(doc, a, "verb");
-						dialogList.addElements(doc, a, "dialog");
-						soundList.addElements(doc, a, "sound");
-						props.setActorDocument(doc, a);
-					}
-
-				});
-		
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActorProps.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActorProps.java
deleted file mode 100644
index 4667438a3..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActorProps.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.bladecoder.engineeditor.model.ChapterDocument;
-import com.bladecoder.engineeditor.ui.components.PropertyTable;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-
-public class ActorProps extends PropertyTable {
-
-	public static final String DESC_PROP = "Description";
-	public static final String POS_X_PROP = "pos X";
-	public static final String POS_Y_PROP = "pos Y";
-	public static final String VISIBLE_PROP = "visible";
-	public static final String ACTIVE_PROP = "active";
-	public static final String STATE_PROP = "state";
-	public static final String WALKING_SPEED_PROP = "Walking Speed";
-
-	private ChapterDocument doc;
-	private Element actor;
-
-//	TableModelListener tableModelListener = new TableModelListener() {
-//		@Override
-//		public void tableChanged(TableModelEvent e) {
-//			if (e.getType() == TableModelEvent.UPDATE) {
-//				int row = e.getFirstRow();
-//				updateModel((String) propertyTable.getModel().getValueAt(row, 0),
-//						(String) propertyTable.getModel().getValueAt(row, 1));
-//			}
-//		}
-//	};
-	
-	PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {		
-		@Override
-		public void propertyChange(PropertyChangeEvent evt) {
-			EditorLogger.debug("Property Listener: " + evt.getPropertyName());
-			setActorDocument(doc, actor);			
-		}
-	};
-
-	public ActorProps(Skin skin) {
-		super(skin);
-	}
-
-	public void setActorDocument(ChapterDocument doc, Element a) {		
-		this.doc = doc;
-		this.actor = a;
-		clear();
-
-		if (a != null) {
-
-			if (!a.getAttribute("type").equals(ChapterDocument.NO_RENDERER_ACTOR_TYPE)) {
-				Vector2 pos = doc.getPos(a);
-				addProperty(POS_X_PROP, Float.toString(pos.x), Types.FLOAT);
-				addProperty(POS_Y_PROP, Float.toString(pos.y), Types.FLOAT);
-			}
-
-			addProperty(DESC_PROP, doc.getRootAttr(a, "desc"));
-
-			addProperty(VISIBLE_PROP, doc.getRootAttr(a, "visible"), Types.BOOLEAN);
-
-			addProperty(ACTIVE_PROP, doc.getRootAttr(a, "active"), Types.BOOLEAN);
-			addProperty(STATE_PROP, doc.getRootAttr(a, "state"));
-			
-			
-			if (!a.getAttribute("type").equals("background") && 
-				!a.getAttribute("type").equals("foreground")) {
-				addProperty(WALKING_SPEED_PROP, doc.getRootAttr(a, "walking_speed"));
-			}
-			
-			doc.addPropertyChangeListener(propertyChangeListener);
-			
-			invalidateHierarchy();
-		}
-	}
-
-	@Override
-	protected void updateModel(String property, String value) {
-		if (property.equals(DESC_PROP)) {
-			doc.setRootAttr(actor, "desc", value);
-		} else if (property.equals(POS_X_PROP)) {
-			Vector2 pos = doc.getPos(actor);
-			pos.x = Float.parseFloat(value);
-			doc.setPos(actor, pos);
-		} else if (property.equals(POS_Y_PROP)) {
-			Vector2 pos = doc.getPos(actor);
-			pos.y = Float.parseFloat(value);
-			doc.setPos(actor, pos);
-		} else if (property.equals(VISIBLE_PROP)) {
-			doc.setRootAttr(actor, "visible", value);
-		} else if (property.equals(ACTIVE_PROP)) {
-			doc.setRootAttr(actor, "active", value);
-		} else if (property.equals(STATE_PROP)) {
-			doc.setRootAttr(actor, "state", value);
-		} else if (property.equals(WALKING_SPEED_PROP)) {
-			doc.setRootAttr(actor, "walking_speed", value);			
-		}
-
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/AssetsList.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/AssetsList.java
deleted file mode 100644
index 878adee93..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/AssetsList.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.awt.Desktop;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.util.List;
-
-import javax.swing.JFileChooser;
-import javax.swing.filechooser.FileNameExtensionFilter;
-
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Container;
-import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.utils.Array;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.CustomList;
-import com.bladecoder.engineeditor.ui.components.EditToolbar;
-import com.bladecoder.engineeditor.utils.ImageUtils;
-
-public class AssetsList extends Table {
-	private static final String[] ASSET_TYPES = { "3d models", "backgrounds",
-			"atlases", "music", "sounds", "images", "spine" };
-
-	private SelectBox<String> assetTypes;
-	protected EditToolbar toolbar;
-    protected CustomList<String> list;
-    protected Skin skin;
-    protected Container<ScrollPane> container;
-
-	private File lastDir;
-
-	public AssetsList(Skin skin) {
-		super(skin);
-		
-		assetTypes = new SelectBox<String>(skin);
-		assetTypes.setItems(ASSET_TYPES);
-		
-		this.skin = skin;	
-		
-		list = new CustomList<String>(skin);
-		
-		Array<String> items = new Array<String>();
-		list.setItems(items);
-			
-		ScrollPane scrollPane = new ScrollPane(list, skin);
-		container = new Container<ScrollPane>(scrollPane);
-		container.fill();
-		container.prefHeight(100);
-		
-		toolbar = new EditToolbar(skin);
-//		debug();
-		add(assetTypes).expandX().fillX();
-		row().fill();
-		add(toolbar).expandX().fillX();
-		row().fill();
-		add(container).expandY().fill();
-		
-		toolbar.addCreateListener(new ChangeListener() {
-
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				create();
-			}
-		});
-		
-		toolbar.addEditListener(new ChangeListener() {
-
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				edit();
-			}
-		});
-		
-		toolbar.addDeleteListener(new ChangeListener() {
-
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				delete();
-			}
-		});
-				
-
-		list.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				toolbar.disableEdit(false);
-			}
-		});
-
-
-		Ctx.project.addPropertyChangeListener(Project.NOTIFY_PROJECT_LOADED,
-				new PropertyChangeListener() {
-					@Override
-					public void propertyChange(PropertyChangeEvent arg0) {
-						toolbar.disableCreate(Ctx.project.getProjectDir() == null);
-						addAssets();
-					}
-				});
-
-		assetTypes.addListener(new ChangeListener() {
-
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				addAssets();
-			}
-		});
-	}
-
-	private void addAssets() {
-		list.getItems().clear();
-
-		if (Ctx.project.getProjectDir() != null) {
-			String type = assetTypes.getSelected();
-			String dir = getAssetDir(type);
-
-			if (type.equals("backgrounds") || type.equals("images") || type.equals("atlases"))
-				dir += "/1";
-
-			String[] files = new File(dir).list(new FilenameFilter() {
-				@Override
-				public boolean accept(File arg0, String arg1) {
-					String type = assetTypes.getSelected();
-
-					if (type.equals("atlases") && !arg1.endsWith(".atlas"))
-						return false;
-
-					return true;
-				}
-			});
-
-			if (files != null)
-				for (String f : files)
-					list.getItems().add(f);
-
-			if (list.getItems().size > 0) {
-				list.setSelectedIndex(0);
-			}
-		}
-
-		toolbar.disableCreate(Ctx.project.getProjectDir() == null);
-	}
-
-	private String getAssetDir(String type) {
-		String dir;
-
-		if (type.equals("backgrounds")) {
-			dir = Ctx.project.getProjectPath() + "/" + Project.BACKGROUNDS_PATH;
-		} else if (type.equals("atlases")) {
-			dir = Ctx.project.getProjectPath() + "/" + Project.ATLASES_PATH;
-		} else if (type.equals("music")) {
-			dir = Ctx.project.getProjectPath() + "/" + Project.MUSIC_PATH;
-		} else if (type.equals("sounds")) {
-			dir = Ctx.project.getProjectPath() + "/" + Project.SOUND_PATH;
-		} else if (type.equals("images")) {
-			dir = Ctx.project.getProjectPath() + "/" + Project.IMAGE_PATH;
-		} else if (type.equals("3d models")) {
-			dir = Ctx.project.getProjectPath() + "/" + Project.SPRITE3D_PATH;
-		} else if (type.equals("spine")) {
-			dir = Ctx.project.getProjectPath() + "/" + Project.SPINE_PATH;			
-		} else {
-			dir = Ctx.project.getProjectPath() + Project.ASSETS_PATH;
-		}
-
-		return dir;
-	}
-
-	private void create() {
-		String type = assetTypes.getSelected();
-
-		if (type.equals("atlases")) {
-			new CreateAtlasDialog(skin).setVisible(true);
-		} else {
-
-			JFileChooser chooser = new JFileChooser(lastDir);
-			chooser.setDialogTitle("Select the '" + type + "' asset files");
-			chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
-			chooser.setMultiSelectionEnabled(true);
-
-			FileNameExtensionFilter filter = null;
-
-			if (type.equals("backgrounds") || type.equals("images"))
-				filter = new FileNameExtensionFilter("Images", "jpg", "png",
-						"etc1");
-			else if (type.equals("music") || type.equals("sounds"))
-				filter = new FileNameExtensionFilter("Music", "wav", "mp3",
-						"ogg");
-			else if (type.equals("3d models"))
-				filter = new FileNameExtensionFilter("3D Models", "g3db", "png");
-			else if (type.equals("spine"))
-				filter = new FileNameExtensionFilter("Spine", "skel", "json");			
-
-			chooser.removeChoosableFileFilter(chooser.getChoosableFileFilters()[0]);
-			chooser.addChoosableFileFilter(filter);
-
-			if (chooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
-				try {
-					File[] files = chooser.getSelectedFiles();
-					String dir = getAssetDir(type);
-					lastDir = chooser.getSelectedFile();
-
-					for (File f : files) {
-						if (type.equals("backgrounds")
-								|| type.equals("images")) {
-							List<String> res = Ctx.project.getResolutions();
-
-							for (String r : res) {
-								File destFile = new File(dir + "/" + r
-										+ "/" + f.getName());
-								float scale = Float.parseFloat(r);
-
-								if (scale != 1.0f) {
-
-									ImageUtils.scaleImageFile(f, destFile,
-											scale);
-								} else {
-									Files.copy(f.toPath(), destFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-								}
-							}
-						} else {
-							File destFile = new File(dir + "/" + f.getName());
-							Files.copy(f.toPath(), destFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-						}
-						
-					}
-
-				} catch (Exception ex) {
-					String msg = "Something went wrong while getting the assets.\n\n"
-							+ ex.getClass().getSimpleName()
-							+ " - "
-							+ ex.getMessage();
-					Ctx.msg.show(getStage(), msg, 4);
-					ex.printStackTrace();
-				}
-			}
-		}
-			
-		addAssets();
-	}
-
-	private void edit() {
-		if (Desktop.isDesktopSupported()) {
-			try {
-				Desktop.getDesktop().open(
-						new File(Ctx.project.getProjectDir().getAbsoluteFile()
-								+ "/assets"));
-			} catch (IOException e1) {
-				String msg = "Something went wrong while opening assets folder.\n\n"
-						+ e1.getClass().getSimpleName()
-						+ " - "
-						+ e1.getMessage();
-				Ctx.msg.show(getStage(), msg, 4);
-			}
-		}
-	}
-
-	private void delete() {
-		String type =  assetTypes.getSelected();
-		String dir = getAssetDir(type);
-
-		String name = list.getSelected();
-		try {
-			if (type.equals("backgrounds") || type.equals("images")
-					|| type.equals("atlases")) {
-				List<String> res = Ctx.project.getResolutions();
-
-				for (String r : res) {
-					File file = new File(dir + "/" + r + "/" + name);
-
-					file.delete();
-
-					// delete pages on atlases
-					if (type.equals("atlases")) {
-						File atlasDir = new File(dir + "/" + r);
-
-						File[] files = atlasDir.listFiles();
-
-						if (files != null)
-							for (File f : files) {
-								String destName = f.getName();
-								String nameWithoutExt = name.substring(0,
-										name.lastIndexOf('.'));
-								String destNameWithoutExt = destName.substring(0,
-										destName.lastIndexOf('.'));
-								
-								if(destNameWithoutExt.length() < nameWithoutExt.length())
-									continue;
-								
-								String suffix = destNameWithoutExt.substring( nameWithoutExt.length());
-								
-								if(!suffix.isEmpty() && !suffix.matches("[0-9]+"))
-									continue;
-
-								if (destName.startsWith(nameWithoutExt)
-										&& destName.toLowerCase().endsWith(".png"))
-									Files.delete(f.toPath());
-							}
-					}
-				}
-			} else {
-				File file = new File(dir + "/" + name);
-				file.delete();
-			}
-
-			addAssets();
-		} catch (Exception ex) {
-			String msg = "Something went wrong while deleting the asset.\n\n"
-					+ ex.getClass().getSimpleName() + " - " + ex.getMessage();
-			Ctx.msg.show(getStage(), msg, 4);
-			ex.printStackTrace();
-		}
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/CreateAtlasDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/CreateAtlasDialog.java
deleted file mode 100644
index 083b1ee15..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/CreateAtlasDialog.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import com.badlogic.gdx.graphics.Pixmap.Format;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.Texture.TextureFilter;
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.tools.texturepacker.TexturePacker;
-import com.badlogic.gdx.tools.texturepacker.TexturePacker.Settings;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.EditDialog;
-import com.bladecoder.engineeditor.ui.components.FileInputPanel;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-import com.bladecoder.engineeditor.utils.DesktopUtils;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-import com.bladecoder.engineeditor.utils.ImageUtils;
-
-public class CreateAtlasDialog extends EditDialog {
-
-	private static final String INFO = "Package all the images in the selected dir to a new atlas";
-
-	private static final String[] FILTERS = { "Linear", "Nearest", "MipMap",
-			"MipMapLinearLinear", "MipMapLinearNearest", "MipMapNearestLinear",
-			"MipMapNearestNearest" };
-	
-	private InputPanel name;
-	private InputPanel dir;
-	private InputPanel filterMin;
-	private InputPanel filterMag;
-
-
-	public CreateAtlasDialog(Skin skin) {
-		super("CREATE ATLAS", skin);
-		
-		name = new InputPanel(skin, "Atlas Name",
-				"The name of the sprite atlas", true);
-		dir = new FileInputPanel(skin, "Input Image Directory",
-				"Select the output directory with the images to create the Atlas",
-				true);
-
-		filterMin = new InputPanel(skin, "Min Filter",
-				"The filter when the texture is scaled down", FILTERS);
-		filterMag = new InputPanel(skin, "Mag Filter",
-				"The filter when the texture is scaled up", FILTERS);
-
-		addInputPanel(name);
-		addInputPanel(dir);
-		addInputPanel(filterMin);
-		addInputPanel(filterMag);
-
-		filterMin.setText(FILTERS[0]);
-		filterMag.setText(FILTERS[1]);
-
-		setInfo(INFO);
-	}
-
-	@Override
-	protected void ok() {
-		new Thread(new Runnable() {
-			Stage stage = getStage();
-			
-			@Override
-			public void run() {
-				Ctx.msg.show(stage, "Generating atlas...", true);
-
-				String msg = genAtlas();
-				
-				Ctx.msg.hide();
-				
-				if(msg != null)
-					Ctx.msg.show(stage, msg, 3);
-			}
-		}).start();
-	}
-
-	@Override
-	protected boolean validateFields() {
-		boolean ok = true;
-
-		if (!dir.validateField())
-			ok = false;
-
-		if (!name.validateField())
-			ok = false;
-
-		return ok;
-	}
-
-	private String genAtlas() {
-		File inDir = new File(dir.getText());
-		String outdir = Ctx.project.getProjectPath() + Project.ATLASES_PATH;
-		List<String> res = Ctx.project.getResolutions();
-		String name = this.name.getText();
-		String fMin = filterMin.getText();
-		String fMag = filterMag.getText();
-
-		Settings settings = new Settings();
-
-		settings.pot = false;
-		settings.paddingX = 2;
-		settings.paddingY = 2;
-		settings.duplicatePadding = true;
-		settings.edgePadding = true;
-		settings.rotation = false;
-		settings.minWidth = 16;
-		settings.minWidth = 16;
-		settings.stripWhitespaceX = false;
-		settings.stripWhitespaceY = false;
-		settings.alphaThreshold = 0;
-
-		if (fMin.equals("Linear"))
-			settings.filterMin = TextureFilter.Linear;
-		else if (fMin.equals("Nearest"))
-			settings.filterMin = TextureFilter.Nearest;
-		else if (fMin.equals("MipMap"))
-			settings.filterMin = TextureFilter.MipMap;
-		else if (fMin.equals("MipMapLinearLinear"))
-			settings.filterMin = TextureFilter.MipMapLinearLinear;
-		else if (fMin.equals("MipMapLinearNearest"))
-			settings.filterMin = TextureFilter.MipMapLinearNearest;
-		else if (fMin.equals("MipMapNearestLinear"))
-			settings.filterMin = TextureFilter.MipMapNearestLinear;
-		else if (fMin.equals("MipMapNearestNearest"))
-			settings.filterMin = TextureFilter.MipMapNearestNearest;
-
-		if (fMag.equals("Linear"))
-			settings.filterMag = TextureFilter.Linear;
-		else if (fMag.equals("Nearest"))
-			settings.filterMag = TextureFilter.Nearest;
-		else if (fMag.equals("MipMap"))
-			settings.filterMag = TextureFilter.MipMap;
-		else if (fMag.equals("MipMapLinearLinear"))
-			settings.filterMag = TextureFilter.MipMapLinearLinear;
-		else if (fMag.equals("MipMapLinearNearest"))
-			settings.filterMag = TextureFilter.MipMapLinearNearest;
-		else if (fMag.equals("MipMapNearestLinear"))
-			settings.filterMag = TextureFilter.MipMapNearestLinear;
-		else if (fMag.equals("MipMapNearestNearest"))
-			settings.filterMag = TextureFilter.MipMapNearestNearest;
-
-		settings.wrapX = Texture.TextureWrap.ClampToEdge;
-		settings.wrapY = Texture.TextureWrap.ClampToEdge;
-		settings.format = Format.RGBA8888;
-		settings.alias = true;
-		settings.outputFormat = "png";
-		settings.jpegQuality = 0.9f;
-		settings.ignoreBlankImages = true;
-		settings.fast = false;
-		settings.debug = false;
-
-		int wWidth = Ctx.project.getWorld().getWidth();
-
-		for (String r : res) {
-			float scale = Float.parseFloat(r);
-			settings.maxWidth = calcPOT((int)(wWidth * scale * 2f));
-			settings.maxHeight = calcPOT((int)(wWidth * scale * 2f));
-
-			EditorLogger.debug("ATLAS MAXWIDTH: " + settings.maxWidth);
-
-			File inTmpDir = inDir;
-			
-			try {
-
-				// Resize images to create atlas for diferent resolutions
-				if (scale != 1.0f) {
-					inTmpDir = DesktopUtils.createTempDirectory();	
-					
-					ImageUtils.scaleDirFiles(inDir, inTmpDir, scale);
-				}
-
-				TexturePacker.process(settings, inTmpDir.getAbsolutePath(),
-						outdir + "/" + r, name + ".atlas");
-
-				if (scale != 1.0f) {
-					DesktopUtils.removeDir(inTmpDir.getAbsolutePath());
-				}
-			} catch (IOException e) {
-				EditorLogger.error(e.getMessage());
-			}
-		}
-
-		return null;
-	}
-
-	private int calcPOT(int v) {
-		v--;
-		v |= v >> 1;
-		v |= v >> 2;
-		v |= v >> 4;
-		v |= v >> 8;
-		v |= v >> 16;
-		v++;
-
-		return v;
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/CreateProjectDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/CreateProjectDialog.java
deleted file mode 100644
index 9921e2b63..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/CreateProjectDialog.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.io.File;
-
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.ui.components.EditDialog;
-import com.bladecoder.engineeditor.ui.components.FileInputPanel;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-
-public class CreateProjectDialog extends EditDialog {
-
-	public static final String INFO = "A project folder with the proper structure will be created in the selected location.";
-	
-	private static final String ANDROID_SDK_PROP = "package.SDK";
-
-	private InputPanel projectName;
-	private FileInputPanel location;
-	private FileInputPanel androidSdk;
-
-	public CreateProjectDialog(Skin skin) {
-		super("CREATE PROJECT", skin);
-
-		setInfo(INFO);
-
-		projectName = new InputPanel(skin, "Project Name",
-				"Select the name of the project");
-
-		location = new FileInputPanel(skin, "Location",
-				"Select the folder location for the project", true);
-		
-		androidSdk = new FileInputPanel(skin, "Android SDK",
-				"Select the Android SDK folder. If empty, the ANDROID_HOME variable will be used", true);
-
-		addInputPanel(projectName);
-		addInputPanel(location);
-		addInputPanel(androidSdk);
-		
-		String sdkprop = Ctx.project.getConfig().getProperty(ANDROID_SDK_PROP);
-		
-		if(sdkprop != null && new File(sdkprop).exists()) {
-			androidSdk.setText(sdkprop);
-		}
-		
-//		getStage().setKeyboardFocus(projectName.getField());
-	}
-
-	@Override
-	protected void ok() {
-		try {
-			Ctx.project.getConfig().setProperty(ANDROID_SDK_PROP, androidSdk.getText());
-			Ctx.project.saveProject();
-		} catch (Exception ex) {
-			String msg = "Something went wrong while saving the current project.\n\n"
-					+ ex.getClass().getSimpleName() + " - " + ex.getMessage();
-			Ctx.msg.show(getStage(), msg, 2);
-		}
-
-		new Thread(new Runnable() {
-			Stage stage = getStage();
-			
-			@Override
-			public void run() {
-				createProject(stage);	
-			}
-		}).start();
-	}
-
-	private void createProject(Stage stage) {
-		Ctx.msg.show(stage, "Creating project...", true);
-
-		try {
-			Ctx.project.createProject(
-					location.getText(), 
-					projectName.getText(),
-					androidSdk.getText());
-			
-			Ctx.project.loadProject(new File(location.getText() + "/"
-					+ projectName.getText()));
-			
-			Ctx.msg.show(stage, "Project successfully created", 3);
-		} catch (Exception e) {
-			String msg = "Something went wrong while creating project.\n\n"
-					+ e.getClass().getSimpleName() + " - " + e.getMessage();
-			Ctx.msg.show(stage, msg, 3);
-			EditorLogger.error(msg);
-			return;
-		}
-	}
-
-	@Override
-	protected boolean validateFields() {
-		boolean isOk = true;
-
-		if (projectName.getText().trim().isEmpty()) {
-			projectName.setError(true);
-			isOk = false;
-		} else
-			projectName.setError(false);
-
-		if (location.getFile() != null) {
-			location.setError(false);
-		} else {
-			location.setError(true);
-			isOk = false;
-		}
-		
-		if (System.getenv("ANDROID_HOME") == null && androidSdk.getFile() == null) {
-			androidSdk.setError(true);
-			isOk = false;
-		} else {
-			androidSdk.setError(false);			
-		}
-
-		return isOk;
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/DialogList.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/DialogList.java
deleted file mode 100644
index 3cfc7751d..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/DialogList.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.ui.components.CellRenderer;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.ElementList;
-
-public class DialogList extends ElementList {	
-	
-    private DialogOptionTree options;
-
-	@Override
-	protected EditElementDialog getEditElementDialogInstance(Element e) {
-		return new EditDialogDialog(skin, doc, parent, e);
-	}
-	
-    public DialogList(Skin skin) {
-    	super(skin, true);
-    	
-    	options = new DialogOptionTree(skin);
-    	row();
-    	add(options).expand().fill();
-
-		list.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				int pos = list.getSelectedIndex();
-				
-				Element v = null;
-				
-				if(pos != -1) {
-					v = list.getItems().get(pos);
-					options.addOptions(doc, parent, v);
-				} else {
-					options.addOptions(doc, parent, null);
-				}
-				
-				toolbar.disableEdit(pos == -1);
-			}
-		});
-		
-		list.setCellRenderer(listCellRenderer);
-    }
-    
-    
-	@Override
-	public void addElements(BaseDocument doc, Element parent, String tag) {
-		options.addOptions(doc, null, null);
-		super.addElements(doc, parent, tag);
-    }	
-
-
-	// -------------------------------------------------------------------------
-	// ListCellRenderer
-	// -------------------------------------------------------------------------
-	private final CellRenderer<Element> listCellRenderer = new CellRenderer<Element>() {
-
-		@Override
-		protected String getCellTitle(Element e) {
-			return e.getAttribute("id");
-		}
-
-		@Override
-		public TextureRegion getCellImage(Element e) {
-			return Ctx.assetManager.getIcon("ic_talkto");
-		}
-		
-		@Override
-		protected boolean hasSubtitle() {
-			return false;
-		}
-		
-		@Override
-		protected boolean hasImage() {
-			return true;
-		}
-	};
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/DialogOptionTree.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/DialogOptionTree.java
deleted file mode 100644
index 8deb3cbab..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/DialogOptionTree.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
-
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup;
-import com.badlogic.gdx.scenes.scene2d.ui.Tree.Node;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.EditTree;
-
-public class DialogOptionTree extends EditTree {
-
-	BaseDocument doc;
-
-	Element dialog;
-	Element actor;
-
-	Element clipboard;
-
-	public DialogOptionTree(Skin skin) {
-		super(skin);
-	}
-
-	public void addOptions(BaseDocument doc, Element a, Element dialog) {
-		this.dialog = dialog;
-		this.actor = a;
-		this.doc = doc;
-
-		tree.clearChildren();
-		
-		if(dialog != null)
-			createTree(dialog);
-
-		toolbar.disableCreate(dialog == null);
-		
-//		if(tree.getRootNodes().size > 0)
-//			tree.getSelection().add(tree.getRootNodes().first());
-	}
-
-	@Override
-	public void create() {
-		Element parent = dialog;
-		
-		if(!tree.getSelection().isEmpty()) {
-			Node sel = tree.getSelection().getLastSelected();
-
-			if(sel.getParent() != null)
-				parent = (Element)sel.getParent().getObject();
-		}
-
-		EditDialogOptionDialog o = new EditDialogOptionDialog(skin, doc,
-				parent, null);
-		o.show(getStage());
-		
-		o.setListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				Node sel = null;
-				if(!tree.getSelection().isEmpty())
-					sel = tree.getSelection().getLastSelected();
-							
-				Element e = ((EditElementDialog)actor).getElement();
-				
-				Node n = createNode(e);
-				if(sel != null) {
-					sel.add(n);
-				} else {
-					tree.add(n);
-				}
-			}			
-		});
-	}
-
-	@Override
-	public void edit() {
-		Node sel = tree.getSelection().getLastSelected();
-		
-		Element parent = dialog;
-				
-		if(sel != null) {
-			parent = (Element)sel.getParent().getObject();
-		}
-		
-		EditDialogOptionDialog o = new EditDialogOptionDialog(skin, doc,
-				parent, (Element)sel.getObject());
-		o.show(getStage());
-	}
-
-	@Override
-	public void delete() {
-		Node sel = tree.getSelection().getLastSelected();
-		Element selElement = (Element)sel.getObject();
-		Node parent = sel.getParent();
-		Element parentElement = (Element)parent.getObject();
-
-		doc.deleteElement(selElement);
-
-		clipboard = selElement;
-		toolbar.disablePaste(false);
-			
-//		Node childBefore = parent.getChildBefore(on);
-//		Node childAfter = parent.getChildAfter(on);
-		
-		parent.remove(sel);
-		
-		Node nextPath = null;
-		
-		// TODO Set NEXT SELECTION
-		
-//		if(childBefore != null) {
-//			nextPath = new TreePath(((DefaultTreeModel) tree.getModel()).getPathToRoot(childBefore));
-//		} else {
-//			nextPath = new TreePath(((DefaultTreeModel) tree.getModel()).getPathToRoot(childAfter));
-//		}
-//				
-//		tree.expandPath(nextPath);
-//		tree.setSelectionPath(nextPath);
-	}
-
-	@Override
-	public void copy() {
-		Node sel = tree.getSelection().getLastSelected();
-		Element selElement = (Element)sel.getObject();
-
-		clipboard = (Element) selElement.cloneNode(true);
-		toolbar.disablePaste(false);
-	}
-
-	@Override
-	public void paste() {
-		Element newElement = (Element) clipboard.cloneNode(true);
-		Node sel = tree.getSelection().getLastSelected();
-		
-		Element parent = dialog;
-		
-		Node parentNode = null;		
-		if(sel != null) {
-			parentNode = sel.getParent();
-		}
-		
-		parent.appendChild(newElement);		
-		doc.setModified(newElement);
-		
-		
-		Node newOption = createNode(newElement);
-		
-		if(parentNode != null)
-			parentNode.add(newOption);
-		else tree.add(newOption);
-		
-		// TODO Insert in the selected position
-//		int idx = -1;
-//		if(path != null)
-//			idx = parentOption.getIndex((OptionNode) path.getLastPathComponent());
-//		parentOption.insert(newOption, idx + 1);
-//		
-//		((DefaultTreeModel) tree.getModel()).reload(parentOption);
-//		
-//		tree.setSelectionPath(new TreePath(((DefaultTreeModel) tree.getModel()).getPathToRoot(newOption)));
-	}
-
-	@Override
-	public void upNode() {
-//		TreePath path = tree.getSelectionPath();
-//		OptionNode on = (OptionNode) path.getLastPathComponent();
-//		
-//		Element e = on.getElement();
-//		
-//		Node n = e.getPreviousSibling();
-//		
-//		while(!(n instanceof Element)){
-//			n = n.getPreviousSibling();
-//		}
-//		
-//		Element e2 = (Element)n;
-//
-//		Node parent = e.getParentNode();
-//		parent.removeChild(e);
-//		parent.insertBefore(e, e2);
-//		doc.setModified(e);
-//		
-////		addOptions(doc, actor, dialog);
-//		
-//		OptionNode parentOption = (OptionNode) on.getParent();
-//		
-//		int idx = parentOption.getIndex(on);
-//		parentOption.insert(on, idx - 1);
-//		
-//		((DefaultTreeModel) tree.getModel()).reload(parentOption);
-//		
-//		tree.setSelectionPath(new TreePath(((DefaultTreeModel) tree.getModel()).getPathToRoot(on)));
-	}
-
-	@Override
-	public void downNode() {
-//		TreePath path = tree.getSelectionPath();
-//		OptionNode on = (OptionNode) path.getLastPathComponent();
-//		
-//		Element e = on.getElement();
-//		Node n = e.getNextSibling();
-//		
-//		while(!(n instanceof Element)){
-//			n = n.getNextSibling();
-//		}
-//		
-//		Element e2 = (Element)n;	
-//
-//		Node parent = e.getParentNode();
-//		parent.removeChild(e2);
-//		parent.insertBefore(e2, e);
-//		doc.setModified(e);
-//		
-//		OptionNode parentOption = (OptionNode) on.getParent();
-//		
-//		int idx = parentOption.getIndex(on);
-//		parentOption.insert(on, idx + 1);
-//		
-//		((DefaultTreeModel) tree.getModel()).reload(parentOption);
-//		
-//		tree.setSelectionPath(new TreePath(((DefaultTreeModel) tree.getModel()).getPathToRoot(on)));
-	}
-
-	@Override
-	public void leftNode() {
-//		TreePath path = tree.getSelectionPath();
-//		OptionNode on = (OptionNode) path.getLastPathComponent();
-//		Element e = on.getElement();
-//		
-//		Node parent = e.getParentNode();
-//		parent.removeChild(e);
-//		
-//		Node grandpa = parent.getParentNode();
-//		grandpa.replaceChild(e, parent);		
-//		grandpa.insertBefore(parent, e);
-//		doc.setModified(e);
-//		
-//		OptionNode parentOption = (OptionNode) on.getParent();
-//		
-//		OptionNode grandpaOption = (OptionNode) parentOption.getParent();
-//		
-//		int idx = grandpaOption.getIndex(parentOption);
-//		grandpaOption.insert(on, idx + 1);
-//		
-//		((DefaultTreeModel) tree.getModel()).reload(grandpaOption);
-//		
-//		tree.setSelectionPath(new TreePath(((DefaultTreeModel) tree.getModel()).getPathToRoot(on)));		
-	}
-
-	@Override
-	public void rightNode() {
-//		TreePath path = tree.getSelectionPath();
-//		OptionNode on = (OptionNode) path.getLastPathComponent();
-//		Element e = on.getElement();
-//		
-//		Node n = e.getPreviousSibling();
-//		
-//		while(!(n instanceof Element)){
-//			n = n.getPreviousSibling();
-//		}
-//		
-//		Element e2 = (Element)n;
-//		
-//		Node parent = e.getParentNode();
-//		parent.removeChild(e);
-//		e2.appendChild(e);
-//		
-//		doc.setModified(e);
-//		
-//		OptionNode parentOption = (OptionNode)((OptionNode) on.getParent()).getChildBefore(on);
-//		
-//		OptionNode grandpaOption = (OptionNode) on.getParent();
-//		
-//		parentOption.add(on);
-//		
-//		((DefaultTreeModel) tree.getModel()).reload(grandpaOption);
-//		
-//		tree.setSelectionPath(new TreePath(((DefaultTreeModel) tree.getModel()).getPathToRoot(on)));		
-	}
-
-	
-	private void createTree(Element dialog) {
-		NodeList childs = dialog.getChildNodes();
-		int n = childs.getLength();
-		for (int i = 0; i < n; i++) {
-			if (childs.item(i) instanceof Element)
-				tree.add(createNode((Element) childs.item(i)));
-		}
-	}
-	
-	private Node createNode(Element e) {
-		Label textLbl = new Label(null, skin);
-		Label infoLbl = new Label(null, skin);
-
-		String text = e.getAttribute("text");
-
-		textLbl.setText(Ctx.project.getSelectedChapter().getTranslation(text));
-
-		StringBuilder sb = new StringBuilder();
-
-		// if(!actor.isEmpty())
-		// sb.append(" actor '").append(actor).append("'");
-
-		NamedNodeMap attr = e.getAttributes();
-
-		String response = e.getAttribute("response_text");
-
-		if (!response.isEmpty())
-			sb.append("R: ")
-					.append(Ctx.project.getSelectedChapter().getTranslation(response)).append(' ');
-
-		for (int i = 0; i < attr.getLength(); i++) {
-			org.w3c.dom.Node n = attr.item(i);
-			String name = n.getNodeName();
-
-			if (name.equals("text") || name.equals("response_text"))
-				continue;
-
-			String v = n.getNodeValue();
-			sb.append(name).append(':')
-					.append(Ctx.project.getSelectedChapter().getTranslation(v)).append(' ');
-		}
-		
-		infoLbl.setText(sb.toString());
-				
-		VerticalGroup vg = new VerticalGroup();
-		vg.left();
-		vg.addActor(textLbl);
-		vg.addActor(infoLbl);
-		
-		Node node = new Node(vg);
-		node.setObject(e);
-		
-		NodeList childs = e.getChildNodes();
-		int n = childs.getLength();
-
-		for (int i = 0; i < n; i++) {
-			if (childs.item(i) instanceof Element) {
-				node.add(createNode((Element) childs.item(i)));				
-			}
-		}
-		
-		
-		return node;		
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditActionDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditActionDialog.java
deleted file mode 100644
index e5f76740b..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditActionDialog.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.util.Arrays;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.TextField;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.scenes.scene2d.utils.FocusListener;
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionFactory;
-import com.bladecoder.engine.actions.Param;
-import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-
-public class EditActionDialog extends EditElementDialog {
-	private static final String CUSTOM_ACTION_STR = "CUSTOM ACTION";
-
-	private static final String CUSTOM_INFO="Custom action definition";
-	
-	private InputPanel actionPanel;
-	private InputPanel actorPanel;
-	private InputPanel classPanel;
-
-	private InputPanel parameters[];	
-
-	@SuppressWarnings("unchecked")
-	public EditActionDialog(Skin skin, BaseDocument doc, Element parent, Element e) {
-		super(skin);
-
-		String[] actions = ActionFactory.getActionList();
-		Arrays.sort(actions);
-		String[] actions2 = new String[actions.length + 1];
-		System.arraycopy(actions, 0, actions2, 0, actions.length);		
-		actions2[actions2.length - 1] = CUSTOM_ACTION_STR;
-
-		actionPanel = new InputPanel(skin, "Action",
-				"Select the action to create.", actions2);
-		
-		actorPanel = new InputPanel(skin, "Target BaseActor",
-				"Select the target actor id. Default is current actor.",Type.ACTOR,false);
-		classPanel = new InputPanel(skin, "Class",
-				"Select the class for the custom action.", true);
-
-		setAction();
-
-		((SelectBox<String>) actionPanel.getField())
-				.addListener(new ChangeListener() {
-
-					@Override
-					public void changed(ChangeEvent event, Actor actor) {
-						setAction();
-					}
-				});
-		
-		((TextField) classPanel.getField()).addListener(new FocusListener() {
-			@Override
-			public void keyboardFocusChanged (FocusEvent event, Actor actor, boolean focused) {
-				if(!event.isFocused())
-					setAction();
-			}
-		});
-
-		if(e != null) {
-			actorPanel.setText(e.getAttribute("actor"));
-			classPanel.setText(e.getAttribute("class"));
-			
-			if(!e.getAttribute("action_name").isEmpty()) {
-				actionPanel.setText(e.getAttribute("action_name"));
-			} 
-			
-			if(!e.getAttribute("class").isEmpty()) {
-				actionPanel.setText(CUSTOM_ACTION_STR);
-			}
-			
-			setAction();
-		}
-		
-		init(parameters, getAttrs(), doc, parent, "action", e);
-	}
-	
-	private String[] getAttrs() {
-		String inputs[] = new String[parameters.length];
-		
-		for (int j = 0; j < parameters.length ; j++) {
-			InputPanel i=  parameters[j];
-			inputs[j] = i.getTitle();
-		}
-		
-		return inputs;
-	}
-
-	private void setAction() {
-		String id = actionPanel.getText();
-
-		getCenterPanel().clear();
-		addInputPanel(actionPanel);
-		addInputPanel(actorPanel);
-
-		Action ac = null;
-		
-		if (id.equals(CUSTOM_ACTION_STR)) {
-			addInputPanel(classPanel);
-			if(!classPanel.getText().trim().isEmpty())
-				ac = ActionFactory.createByClass(classPanel.getText(), null);
-		} else {
-			ac = ActionFactory.create(id, null);			
-		}
-		
-		if (ac != null) {
-			setInfo(ac.getInfo());
-
-			Param[] params = ac.getParams();
-
-			parameters = new InputPanel[params.length];
-
-			for (int i = 0; i < params.length; i++) {
-				parameters[i] = new InputPanel(getSkin(),params[i].name, params[i].desc,
-						params[i].type, params[i].mandatory, params[i].defaultValue, params[i].options);
-				addInputPanel(parameters[i]);
-			}
-			
-			i = parameters;
-			a = getAttrs();
-		} else {
-			setInfo(CUSTOM_INFO);
-			i = new InputPanel[0];
-			a = new String[0];
-		}
-
-	}
-
-	@Override
-	protected void fill() {
-		String actor = actorPanel.getText().trim();
-		
-		// Remove previous params
-		while(e.getAttributes().getLength() > 0) {
-			e.removeAttribute(e.getAttributes().item(0).getNodeName());
-		}
-
-		if (!actor.isEmpty())
-			e.setAttribute("actor", actor);
-		
-		String id = actionPanel.getText();
-		
-		if (id.equals(CUSTOM_ACTION_STR)) {
-			e.setAttribute("class", classPanel.getText());
-		} else {
-			e.setAttribute("action_name", id);			
-		}
-		
-		super.fill();
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditActorDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditActorDialog.java
deleted file mode 100644
index 87ddacb0f..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditActorDialog.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.bladecoder.engine.actions.Param;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.model.ChapterDocument;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-
-public class EditActorDialog extends EditElementDialog {
-
-	public static final String TYPES_INFO[] = {
-			"No renderer actor, only define an interactive area",
-			"Atlas actor allows 2d image and animations",
-			"3d actors allow 3d models and animations",
-			"Spine actors allow Spine 2d skeletal animations",
-			"Image actors show image files"
-			};
-
-	private InputPanel[] inputs = new InputPanel[12];
-	InputPanel typePanel;
-
-	String attrs[] = { "type", "id", "layer", "desc", "state", "interaction", "visible",
-			"walking_speed", "depth_type", "sprite_size", "camera", "fov" };
-
-	@SuppressWarnings("unchecked")
-	public EditActorDialog(Skin skin, BaseDocument doc, Element parent,
-			Element e) {
-		super(skin);
-
-		inputs[0] = new InputPanel(skin, "BaseActor Type",
-				"Actors can be from different types",
-				ChapterDocument.ACTOR_TYPES);
-
-		inputs[1] = new InputPanel(skin, "BaseActor ID",
-				"IDs can not contain '.' or '_' characters.", true);
-
-		inputs[2] = new InputPanel(skin, "BaseActor Layer",
-				"The layer for drawing order",
-				ChapterDocument.ACTOR_LAYERS);
-		
-		inputs[3] = new InputPanel(skin, "Description",
-				"The text showed when the cursor is over the actor.");
-		inputs[4] = new InputPanel(
-				skin,
-				"State",
-				"Initial state of the actor. Actors can be in differentes states during the game.");
-		inputs[5] = new InputPanel(skin, "Interaction",
-				"True when the actor reacts to the user input.",
-				Param.Type.BOOLEAN, false);
-		inputs[6] = new InputPanel(skin, "Visible", "The actor visibility.",
-				Param.Type.BOOLEAN, false);
-		inputs[7] = new InputPanel(skin, "Walking Speed",
-				"The walking speed in pix/sec. Default 700.", Param.Type.FLOAT,
-				false);
-		inputs[8] = new InputPanel(skin, "Depth Type",
-				"Scene fake depth for scaling", new String[] { "none",
-						"vector"});
-		inputs[9] = new InputPanel(skin, "Sprite Dimensions",
-				"The size of the 3d sprite", Param.Type.DIMENSION, true);
-		inputs[10] = new InputPanel(skin, "Camera Name",
-				"The name of the camera in the model", Param.Type.STRING, true,
-				"Camera", null);
-		inputs[11] = new InputPanel(skin, "Camera FOV",
-				"The camera field of view", Param.Type.FLOAT, true, "49.3",
-				null);
-
-		setInfo(TYPES_INFO[0]);
-
-		typePanel = inputs[0];
-
-		((SelectBox<String>) typePanel.getField())
-				.addListener(new ChangeListener() {
-
-					@Override
-					public void changed(ChangeEvent event, Actor actor) {
-						typeChanged();
-					}
-				});
-
-		init(inputs, attrs, doc, parent, "actor", e);
-
-		typeChanged();
-
-	}
-
-	private void typeChanged() {
-		int i = typePanel.getSelectedIndex();
-
-		setInfo(TYPES_INFO[i]);
-
-		setVisible(inputs[9],false);
-		setVisible(inputs[10],false);
-		setVisible(inputs[11],false);
-
-		if (ChapterDocument.ACTOR_TYPES[i]
-				.equals(ChapterDocument.SPRITE3D_ACTOR_TYPE)) {
-			setVisible(inputs[9],true);
-			setVisible(inputs[10],true);
-			setVisible(inputs[11],true);
-		}
-	}
-
-	@Override
-	protected void fill() {
-		int i = typePanel.getSelectedIndex();
-		if (((ChapterDocument)doc).getBBox(e) == null && ChapterDocument.ACTOR_TYPES[i]
-				.equals(ChapterDocument.NO_RENDERER_ACTOR_TYPE)) {
-			((ChapterDocument) doc).setBbox(e, null);
-		}
-		
-		if(((ChapterDocument)doc).getPos(e) == null)
-			((ChapterDocument) doc).setPos(e, new Vector2(0, 0));
-
-		super.fill();
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditDialogOptionDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditDialogOptionDialog.java
deleted file mode 100644
index 45946bc2c..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditDialogOptionDialog.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.bladecoder.engine.actions.Param;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-
-public class EditDialogOptionDialog extends EditElementDialog {
-
-	private InputPanel[] inputs;
-
-	String attrs[] = { "text", "response_text", "verb", "next", "visible" };
-
-	public EditDialogOptionDialog(Skin skin, BaseDocument doc,
-			Element parent, Element e) {
-		super(skin);
-		
-		inputs = new InputPanel[5];
-		
-		inputs[0] = new InputPanel(skin, "Text", "The sentence of the dialog to say by the player");
-		inputs[1] = new InputPanel(skin, "Response Text", "The response by the character");
-		inputs[2] = new InputPanel(skin, "Verb", "The verb to execute when choosing this option");
-		inputs[3] = new InputPanel(skin, "Next Option",
-						"The next option to show when this option is selected");
-		inputs[4] = new InputPanel(skin, "Visible", "The visibility", Param.Type.BOOLEAN, false);
-
-		setInfo("A dialog is composed of an option tree. Each option is a dialog sentence that the user can choose to say");
-
-		init(inputs, attrs, doc, parent, "option", e);
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditSceneDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditSceneDialog.java
deleted file mode 100644
index 2c6c2149d..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditSceneDialog.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Image;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
-import com.badlogic.gdx.utils.Scaling;
-import com.bladecoder.engine.actions.Param;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-
-public class EditSceneDialog extends EditElementDialog {
-
-	public static final String INFO = "An adventure is composed of many scenes (screens).\n" +
-			"Inside a scene there are actors and a 'player'.\nThe player/user can interact with the actors throught 'verbs'.";
-	
-	private String bgList[] = getBgList();
-	private String musicList[] = getMusicList();
-	
-	private InputPanel[] inputs = new InputPanel[8];
-	
-	private Image bgImage;
-					
-	
-	String attrs[] = {"id", "background", "lightmap", "depth_vector", "music", "loop_music", "initial_music_delay", "repeat_music_delay"};
-
-	@SuppressWarnings("unchecked")
-	public EditSceneDialog(Skin skin, BaseDocument doc, Element parent,
-				Element e) {
-		
-		super(skin);
-		
-		inputs[0] = new InputPanel(skin, "Scene ID",
-				"The ID is mandatory for scenes. \nIDs can not contain '.' or '_' characters.");
-		inputs[1] = new InputPanel(skin, "Background",
-				"The background for the scene", bgList);
-		inputs[2] = new InputPanel(skin, "Lightmap",
-						"The lightmap for the scene", bgList);					
-		inputs[3] = new InputPanel(skin, "Depth Vector",
-						"X: the actor scale when y=0, Y: the actor scale when y=scene height .", Param.Type.VECTOR2, false);					
-		inputs[4] = new InputPanel(skin, "Music Filename",
-				"The music for the scene", musicList);
-		inputs[5] = new InputPanel(skin, "Loop Music",
-				"If the music is playing in looping", Param.Type.BOOLEAN, false);
-		inputs[6] = new InputPanel(skin, "Initial music delay",
-				"The time to wait before playing", Param.Type.FLOAT, false);
-		inputs[7] = new InputPanel(skin, "Repeat music delay",
-				"The time to wait before repetitions", Param.Type.FLOAT, false);		
-		
-		bgImage = new Image();
-		bgImage.setScaling(Scaling.fit);
-		setInfo(INFO);
-		
-		inputs[0].setMandatory(true);
-
-		init(inputs, attrs, doc, parent, "scene", e);
-		
-		((SelectBox<String>) inputs[1].getField()).addListener(new ChangeListener() {
-
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				String bg = inputs[1].getText();
-
-				if(!bg.isEmpty())
-					bgImage.setDrawable(new TextureRegionDrawable(Ctx.project.getBgIcon(bg)));
-				
-				setInfoWidget(bgImage);
-			}
-		});		
-	}
-
-	private String[] getBgList() {
-		String bgPath = Ctx.project.getProjectPath() + Project.BACKGROUNDS_PATH + "/"
-				+ Ctx.project.getResDir();
-
-		File f = new File(bgPath);
-
-		String bgs[] = f.list(new FilenameFilter() {
-
-			@Override
-			public boolean accept(File arg0, String arg1) {
-				if ((arg1.matches("_[1-9]\\.")))
-					return false;
-
-				return true;
-			}
-		});
-
-		Arrays.sort(bgs);
-		
-		ArrayList<String> l = new ArrayList<String>(Arrays.asList(bgs));
-		l.add(0,"");
-
-		return l.toArray(new String[bgs.length + 1]);
-	}
-	
-	private String[] getMusicList() {
-		String path = Ctx.project.getProjectPath() + Project.MUSIC_PATH;
-
-		File f = new File(path);
-
-		String musicFiles[] = f.list(new FilenameFilter() {
-
-			@Override
-			public boolean accept(File arg0, String arg1) {
-				if (arg1.endsWith(".ogg") || arg1.endsWith(".mp3"))
-					return true;
-
-				return false;
-			}
-		});
-
-		Arrays.sort(musicFiles);
-		
-		String musicFiles2[] = new String[musicFiles.length + 1];
-		musicFiles2[0] = "";
-		
-		for(int i=0; i < musicFiles.length; i++)
-			musicFiles2[i + 1] = musicFiles[i];
-
-		return musicFiles2;
-	}	
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditSoundDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditSoundDialog.java
deleted file mode 100644
index 9ae9b3bb6..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditSoundDialog.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Arrays;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.bladecoder.engine.actions.Param;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-
-public class EditSoundDialog extends EditElementDialog {
-	
-	private InputPanel[] inputs;
-
-
-	String attrs[] = { "id", "filename", "loop", "volume"};	
-
-	public EditSoundDialog(Skin skin, BaseDocument doc, Element parent, Element e) {
-		super(skin);
-		
-		inputs = new InputPanel [4];
-		inputs[0] = new InputPanel(skin, "Sound ID", "The id of the sound");
-		inputs[1] = new InputPanel(skin, "Filename", "Filename of the sound", getSoundList());
-		inputs[2] = new InputPanel(skin, "Loop", "True if the sound is looping", Param.Type.BOOLEAN, false);
-		inputs[3] = new InputPanel(skin, "Volume", "Select the volume");
-		
-		inputs[0].setMandatory(true);
-		inputs[1].setMandatory(true);
-
-		setInfo("Actors and scenes can have a list of sounds that can be associated to Sprites or played with the 'sound' action");
-
-		init(inputs, attrs, doc, parent, "sound", e);
-	}
-	
-	private String[] getSoundList() {
-		String path = Ctx.project.getProjectPath() + Project.SOUND_PATH;
-
-		File f = new File(path);
-
-		String soundFiles[] = f.list(new FilenameFilter() {
-
-			@Override
-			public boolean accept(File arg0, String arg1) {
-				if (arg1.endsWith(".ogg") || arg1.endsWith(".wav") || arg1.endsWith(".mp3"))
-					return true;
-
-				return false;
-			}
-		});
-
-		Arrays.sort(soundFiles);
-
-		return soundFiles;
-	}	
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditSpriteDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditSpriteDialog.java
deleted file mode 100644
index b609cbd5d..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditSpriteDialog.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Arrays;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.TextField;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent;
-import com.bladecoder.engine.actions.Param;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.model.ChapterDocument;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.scneditor.SpriteWidget;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-
-public class EditSpriteDialog extends EditElementDialog {
-	public static final String INFO = "Define sprites and frame animations";
-
-	private InputPanel[] inputs = new InputPanel[11];
-	InputPanel typePanel;
-
-	String attrs[] = { "source", "id", "animation_type", "speed", "delay",
-			"count", "inD", "outD", "sound", "preload", "disposed_when_played" };
-
-	SpriteWidget spriteWidget = new SpriteWidget(this);
-
-	@SuppressWarnings("unchecked")
-	public EditSpriteDialog(Skin skin, BaseDocument doc, Element p, Element e) {
-		super(skin);
-
-		setInfo(INFO);
-
-		inputs[0] = new InputPanel(skin, "Source",
-				"Select the source where the sprite or animation is defined",
-				new String[0]);
-		inputs[1] = new InputPanel(skin, "ID",
-				"Select the id of the animation", new String[0]);
-		inputs[2] = new InputPanel(skin, "Animation type",
-				"Select the type of the animation",
-				ChapterDocument.ANIMATION_TYPES);
-		inputs[3] = new InputPanel(skin, "Speed",
-				"Select the speed of the animation in secods",
-				Param.Type.FLOAT, true, "1.0");
-		inputs[4] = new InputPanel(skin, "Delay",
-				"Select the delay between repeats in seconds",
-				Param.Type.FLOAT, false);
-		inputs[5] = new InputPanel(skin, "Count", "Select the repeat times",
-				Param.Type.INTEGER, false);
-		inputs[6] = new InputPanel(
-				skin,
-				"In Dist",
-				"Select the distance in pixels to add to the actor position when the sprite is displayed",
-				Param.Type.VECTOR2, false);
-		inputs[7] = new InputPanel(
-				skin,
-				"Out Dist",
-				"Select the distance in pixels to add to the actor position when the sprite is changed",
-				Param.Type.VECTOR2, false);
-		inputs[8] = new InputPanel(skin, "Sound",
-				"Select the sound ID that will be play when displayed");
-		inputs[9] = new InputPanel(skin, "Preload",
-				"Preload the animation when the scene is loaded",
-				Param.Type.BOOLEAN, true, "true", null);
-		inputs[10] = new InputPanel(skin, "Dispose When Played",
-				"Dispose de animation when the animation is played",
-				Param.Type.BOOLEAN, true, "false", null);
-
-		typePanel = inputs[2];
-
-		((SelectBox<String>) typePanel.getField())
-				.addListener(new ChangeListener() {
-
-					@Override
-					public void changed(ChangeEvent event, Actor actor) {
-						String type = typePanel.getText();
-
-						if (type.equals("repeat") || type.equals("yoyo")) {
-							setVisible(inputs[4],true);
-							setVisible(inputs[5],true);
-						} else {
-							setVisible(inputs[4],false);
-							setVisible(inputs[5],false);
-						}
-					}
-				});
-
-		((SelectBox<String>) inputs[0].getField())
-				.addListener(new ChangeListener() {
-					@Override
-					public void changed(ChangeEvent event, Actor actor) {
-						EditorLogger.debug("CreateEditFADialog.setSource():"
-								+ inputs[0].getText());
-
-						spriteWidget.setSource(parent.getAttribute("type"),
-								inputs[0].getText());
-
-						fillAnimations();
-					}
-				});
-
-		((SelectBox<String>) inputs[1].getField())
-				.addListener(new ChangeListener() {
-					@Override
-					public void changed(ChangeEvent event, Actor actor) {
-						setSprite();
-					}
-				});
-
-		((TextField) inputs[3].getField()).addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				setSprite();
-			}
-		});	
-
-		setInfoWidget(spriteWidget);
-		init(inputs, attrs, doc, p, "frame_animation", e);
-		
-		setVisible(inputs[4],false);
-		setVisible(inputs[5],false);
-
-		addSources();
-		if(e !=  null) {
-			inputs[0].setText(e.getAttribute(attrs[0]));
-		}
-
-		if (inputs[0].getText() != null && !inputs[0].getText().isEmpty()) {
-			spriteWidget.setSource(parent.getAttribute("type"),
-					inputs[0].getText());
-
-			fillAnimations();
-			
-			if(e !=  null) {		
-				inputs[1].setText(e.getAttribute(attrs[1]));
-			}
-		}
-	}
-
-	private void setSprite() {
-		String id = inputs[1].getText();
-		String type = typePanel.getText();
-		String speed = inputs[3].getText();
-
-		@SuppressWarnings("unchecked")
-		SelectBox<String> cb = (SelectBox<String>) inputs[1].getField();
-
-		if (e != null || cb.getSelectedIndex() != 0)
-			spriteWidget.setFrameAnimation(id, speed, type);
-	}
-
-	private void fillAnimations() {
-		EditorLogger.debug("CreateEditFADialog.fillAnimations()");
-
-		@SuppressWarnings("unchecked")
-		SelectBox<String> cb = (SelectBox<String>) inputs[1].getField();
-		cb.getItems().clear();
-
-		// When creating, give option to add all elements
-		if (e == null)
-			cb.getItems().add("<ADD ALL>");
-
-		String ids[] = spriteWidget.getAnimations();
-		for (String s : ids)
-			cb.getItems().add(s);
-
-		cb.getList().setItems(cb.getItems());
-
-		cb.invalidateHierarchy();
-
-		setSprite();
-	}
-
-	String ext;
-
-	private void addSources() {
-		@SuppressWarnings("unchecked")
-		SelectBox<String> cb = (SelectBox<String>) inputs[0].getField();
-		String[] src = getSources();
-		cb.getItems().clear();
-
-		for (String s : src)
-			cb.getItems().add(s);
-
-		cb.getList().setItems(cb.getItems());
-		if (cb.getItems().size > 0)
-			cb.setSelectedIndex(0);
-		cb.invalidateHierarchy();
-	}
-
-	private String[] getSources() {
-		String path = null;
-		String type = parent.getAttribute("type");
-
-		if (type.equals(ChapterDocument.ATLAS_ACTOR_TYPE)) {
-			path = Ctx.project.getProjectPath() + Project.ATLASES_PATH + "/"
-					+ Ctx.project.getResDir();
-			ext = ".atlas";
-		} else if (type.equals(ChapterDocument.SPRITE3D_ACTOR_TYPE)) {
-			path = Ctx.project.getProjectPath() + Project.SPRITE3D_PATH;
-			ext = ".g3db";
-		} else if (type.equals(ChapterDocument.SPINE_ACTOR_TYPE)) {
-			path = Ctx.project.getProjectPath() + Project.SPINE_PATH;
-			ext = ".skel";
-		} else if (type.equals(ChapterDocument.IMAGE_ACTOR_TYPE)) {
-			path = Ctx.project.getProjectPath() + Project.IMAGE_PATH + "/"
-					+ Ctx.project.getResDir();
-			ext = "";			
-		}
-
-		File f = new File(path);
-
-		String sources[] = f.list(new FilenameFilter() {
-
-			@Override
-			public boolean accept(File arg0, String arg1) {
-				if (arg1.endsWith(ext))
-					return true;
-
-				return false;
-			}
-		});
-
-		if (sources != null) {
-			Arrays.sort(sources);
-
-			for (int i = 0; i < sources.length; i++)
-				sources[i] = sources[i].substring(0,
-						sources[i].length() - ext.length());
-		} else {
-			sources = new String[0];
-		}
-
-		return sources;
-	}
-
-	/**
-	 * Override to append all animations if selected.
-	 */
-	@Override
-	protected void ok() {
-		@SuppressWarnings("unchecked")
-		SelectBox<String> cb = (SelectBox<String>) inputs[1].getField();
-
-		if (e == null && cb.getSelectedIndex() == 0) {
-			for (int i = 1; i < cb.getItems().size; i++) {
-				cb.setSelectedIndex(i);
-				create();
-				fill();
-//				doc.setId(e, cb.getItems().get(i));
-				
-				if (listener != null)
-					listener.changed(new ChangeEvent(), this);
-			}
-
-			
-		} else {
-			super.ok();
-		}
-	}
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditVerbDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditVerbDialog.java
deleted file mode 100644
index 6111c1ada..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditVerbDialog.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-
-public class EditVerbDialog extends EditElementDialog {
-	public static final String VERBS[] = { "lookat", "pickup", "talkto", "use", "leave", "custom" };
-	
-	public static final String SCENE_VERBS[] = { "init", "test", "custom" };	
-	
-	public static final String VERBS_INFO[] = {
-			"Called when the user clicks\n in the 'lookat' icon\n over a object in scene",
-			"Called when the user clicks\n in the 'pickup' icon\n over a object in scene",
-			"Called when the user clicks\n in the 'talkto' icon\n over a character in scene",
-			"Called when the user drags and drops\n an inventory object over\n an object in scene or in inventory",
-			"Called when the user clicks\n in an exit zone in scene",
-			"User defined verbs can be called\n from dialogs or inside actions using \nthe 'run_verb' action" };
-	
-	public static final String SCENE_VERBS_INFO[] = {
-		"Called every time\n that the scene is loaded",
-		"Called every time\n that the scene is loaded in test mode.\n'test' verb is called before the 'init' verb",
-		"User defined verbs can be called\n from dialogs or inside actions using \nthe 'run_verb' action" };	
-
-	
-	private InputPanel[] inputs;
-
-
-	String attrs[] = { "id", "state", "target"};		
-	
-	@SuppressWarnings("unchecked")
-	public EditVerbDialog(Skin skin, BaseDocument doc, Element parentElement, Element e) {
-		super(skin);
-		
-		inputs = new InputPanel [4];
-		inputs[0] = new InputPanel(skin, "Verb ID", "Select the verb to create.", parentElement.getTagName().equals("scene")?SCENE_VERBS:VERBS);
-		inputs[1] = new InputPanel(skin, "State", "Select the state.");
-		inputs[2] = new InputPanel(skin, "Target BaseActor", "Select the target actor id for the 'use' verb");
-		inputs[3] = new InputPanel(skin, "Custom Verb Name", "Select the Custom verb id");
-
-		if(parentElement.getTagName().equals("scene"))
-			setInfo(SCENE_VERBS_INFO[0]);
-		else
-			setInfo(VERBS_INFO[0]);
-
-		((SelectBox<String>) inputs[0].getField()).addListener(new ChangeListener() {
-
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				String id = (String) inputs[0].getText();
-				int i = inputs[0].getSelectedIndex();
-
-				if(parent.getTagName().equals("scene"))
-					setInfo(SCENE_VERBS_INFO[i]);
-				else
-					setInfo(VERBS_INFO[i]);
-
-				if (id.equals("use"))
-					setVisible(inputs[2],true);
-				else
-					setVisible(inputs[2],false);
-
-				if (id.equals("custom"))
-					setVisible(inputs[3],true);
-				else
-					setVisible(inputs[3],false);
-			}
-
-		});
-		
-		init(inputs, attrs, doc, parentElement, "verb", e);
-		
-		setVisible(inputs[2],false);
-		setVisible(inputs[3],false);
-		
-		if(e != null) {
-			boolean isCustom = true;
-			String id = e.getAttribute("id");
-			
-			String verbs[] = parent.getTagName().equals("scene")?SCENE_VERBS:VERBS;
-			
-			for(String v:verbs) {
-				if(v.equals(id) && !id.equals("custom")) {
-					isCustom = false;
-					break;
-				}
-			}
-			
-			if(isCustom) {
-				inputs[0].setText("custom");
-				setVisible(inputs[3],true);
-				inputs[3].setText(id);
-			}
-		}
-	}
-
-	@Override
-	protected boolean validateFields() {
-		boolean isOk = true;
-		
-		if(inputs[0].getText().equals("custom") && inputs[3].getText().isEmpty()) {
-			inputs[3].setError(true);
-			isOk = false;
-		} else {
-			inputs[3].setError(false);
-		}
-				
-		return isOk;
-	}
-	
-	@Override
-	protected void fill() {
-		for (int j = 0; j < a.length; j++) {
-			InputPanel input = i[j];
-			
-			if (!input.getText().isEmpty()) {
-				e.setAttribute(a[j], input.getText());
-			} else {
-				e.removeAttribute(a[j]);
-			}
-		}
-		
-		if(e.getAttribute("id").equals("custom"))
-			e.setAttribute("id", inputs[3].getText());
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/PackageDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/PackageDialog.java
deleted file mode 100644
index 54c4116ed..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/PackageDialog.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-
-import org.apache.commons.io.FileUtils;
-
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogicgames.packr.Packr;
-import com.badlogicgames.packr.Packr.Platform;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.ui.components.EditDialog;
-import com.bladecoder.engineeditor.ui.components.FileInputPanel;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-import com.bladecoder.engineeditor.utils.RunProccess;
-
-public class PackageDialog extends EditDialog {
-	private static final String ARCH_PROP = "package.arch";
-	private static final String DIR_PROP = "package.dir";
-	
-	private static final String DESKTOP_LAUNCHER = "org/bladecoder/engine/desktop/DesktopLauncher";
-
-	private static final String INFO = "Package the Adventure for distribution";
-	private static final String[] ARCHS = { "desktop", "android", "ios", "html" };
-	private static final String[] TYPES = { "Bundle JRE", "Runnable jar" };
-	private static final String[] OSS = { "all", "windows", "linux64", "linux32", "macOSX" };
-
-	private InputPanel arch;
-	private InputPanel dir;
-	private InputPanel type;
-	private InputPanel os;
-	private InputPanel linux64JRE;
-	private InputPanel linux32JRE;
-	private InputPanel winJRE;
-	private InputPanel osxJRE;
-	private InputPanel version;
-	private InputPanel icon;
-	private InputPanel androidSDK;
-	private InputPanel androidKeyStore;
-	private InputPanel androidKeyAlias;
-	private InputPanel androidKeyStorePassword;
-	private InputPanel androidKeyAliasPassword;
-
-	private InputPanel[] options = new InputPanel[11];
-
-	@SuppressWarnings("unchecked")
-	public PackageDialog(Skin skin) {
-		super("PACKAGE ADVENTURE", skin);
-
-		arch = new InputPanel(skin, "Architecture", "Select the target Architecture for the game", ARCHS);
-		dir = new FileInputPanel(skin, "Output Directory", "Select the output directory to put the package", true);
-		type = new InputPanel(skin, "Type", "Select the type of the package", TYPES);
-		os = new InputPanel(skin, "OS", "Select the OS of the package", OSS);
-		linux64JRE = new FileInputPanel(skin, "JRE.Linux64", "Select the 64 bits Linux JRE Location to bundle. Must be a ZIP file", false);
-		linux32JRE = new FileInputPanel(skin, "JRE.Linux32", "Select the 32 bits Linux JRE Location to bundle. Must be a ZIP file", false);
-		winJRE = new FileInputPanel(skin, "JRE.Windows", "Select the Windows JRE Location to bundle. Must be a ZIP file", false);
-		osxJRE = new FileInputPanel(skin, "JRE.OSX", "Select the OSX JRE Location to bundle. Must be a ZIP file", false);
-		version = new InputPanel(skin, "Version", "Select the version of the package");
-		icon = new FileInputPanel(skin, "Icon", "The icon for the .exe file", false);
-		androidSDK = new FileInputPanel(skin, "SDK", "Select the Android SDK Location", true);
-		androidKeyStore = new FileInputPanel(skin, "KeyStore", "Select the Key Store Location", false);
-		androidKeyAlias = new InputPanel(skin, "KeyAlias", "Select the Key Alias Location");
-		androidKeyStorePassword = new InputPanel(skin, "KeyStorePasswd", "Key Store Password", false);
-		androidKeyAliasPassword = new InputPanel(skin, "KeyAliasPasswd", "Key Alias Password", false);
-
-		options[0] = type;
-		options[1] = os;
-		options[2] = linux64JRE;
-		options[3] = linux32JRE;
-		options[4] = winJRE;
-		options[5] = osxJRE;
-		options[6] = version;
-		options[7] = icon;
-		options[8] = androidSDK;
-		options[9] = androidKeyStore;
-		options[10] = androidKeyAlias;
-
-		addInputPanel(arch);
-		addInputPanel(dir);
-
-		for (InputPanel i : options) {
-			addInputPanel(i);
-			i.setMandatory(true);
-		}
-
-		addInputPanel(androidKeyStorePassword);
-		addInputPanel(androidKeyAliasPassword);
-
-		dir.setMandatory(true);
-
-		arch.setText(Ctx.project.getConfig().getProperty(ARCH_PROP, ARCHS[0]));
-		dir.setText(Ctx.project.getConfig().getProperty(DIR_PROP, ""));
-
-		for (InputPanel i : options) {
-			String prop = Ctx.project.getConfig().getProperty("package." + i.getTitle());
-
-			if (prop != null && !prop.isEmpty())
-				i.setText(prop);
-		}
-
-
-		setInfo(INFO);
-
-		((SelectBox<String>) (arch.getField())).addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				archChanged();
-			}
-		});
-
-		((SelectBox<String>) (type.getField())).addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				typeChanged();
-			}
-		});
-
-		((SelectBox<String>) (os.getField())).addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				osChanged();
-			}
-		});
-
-		archChanged();
-	}
-
-	@Override
-	protected void ok() {
-		
-		new Thread(new Runnable() {
-			Stage stage = getStage();
-			
-			@Override
-			public void run() {
-				Ctx.msg.show(stage, "Generating package...",true);
-				String msg;
-				
-				try {
-					msg = packageAdv();
-				} catch (Exception e) {
-					msg = "Error Generating package\n\n" + e.getMessage();
-				}
-
-				Ctx.project.getConfig().setProperty(ARCH_PROP, arch.getText());
-				Ctx.project.getConfig().setProperty(DIR_PROP, dir.getText());
-
-				for (InputPanel i : options) {
-					Ctx.project.getConfig().setProperty("package." + i.getTitle(), i.getText());
-				}
-				
-				Ctx.msg.hide();
-				
-				if(msg != null)
-					Ctx.msg.show(stage, msg, 3);
-			}
-		}).start();			
-
-	}
-
-	private String packageAdv() throws IOException {
-		String msg = "Package generated SUCCESSFULLY";
-		
-		String projectName = Ctx.project.getProjectDir().getName();
-		String versionParam = "-Ppassed_version=" + version.getText() + " ";
-		
-		if (arch.getText().equals("desktop")) {			
-			String jar = Ctx.project.getProjectDir().getAbsolutePath() +
-					"/desktop/build/libs/" + projectName + "-desktop-" + version.getText() + ".jar";
-			
-			msg = genDesktopJar(projectName, versionParam, jar);
-
-			if (type.getText().equals(TYPES[0])) { // RUNNABLE JAR
-				if (os.getText().equals("linux64")) {					
-					packr(Platform.linux64, linux64JRE.getText(), projectName, jar, DESKTOP_LAUNCHER, dir.getText());
-				} else if (os.getText().equals("linux32")) {
-					packr(Platform.linux32, linux32JRE.getText(), projectName, jar, DESKTOP_LAUNCHER, dir.getText());
-				} else if (os.getText().equals("windows")) {
-					packr(Platform.windows, winJRE.getText(), projectName, jar, DESKTOP_LAUNCHER, dir.getText());
-				} else if (os.getText().equals("macOSX")) {
-					packr(Platform.mac, osxJRE.getText(), projectName, jar, DESKTOP_LAUNCHER, dir.getText());
-				} else if (os.getText().equals("all")) {
-					packr(Platform.linux64, linux64JRE.getText(), projectName, jar, DESKTOP_LAUNCHER, dir.getText());
-					packr(Platform.linux32, linux32JRE.getText(), projectName, jar, DESKTOP_LAUNCHER, dir.getText());
-					packr(Platform.windows, winJRE.getText(), projectName, jar, DESKTOP_LAUNCHER, dir.getText());
-					packr(Platform.mac, osxJRE.getText(), projectName, jar, DESKTOP_LAUNCHER, dir.getText());
-				}
-			}
-		} else if (arch.getText().equals("android")) {			
-			String params = versionParam + 
-					"-Pkeystore=" +  androidKeyStore.getText() + " " +
-					"-PstorePassword=" + androidKeyStorePassword.getText() + " " +
-					"-Palias=" + androidKeyAlias.getText() + " " +
-					"-PkeyPassword=" + androidKeyAliasPassword.getText() + " ";
-			
-			if(RunProccess.runGradle(Ctx.project.getProjectDir(), params + "android:assembleRelease")) {
-				FileUtils.copyDirectory(new File(Ctx.project.getProjectDir().getAbsolutePath() +
-							"/android/build/apk/")
-							, new File(dir.getText()));
-			} else {
-				msg = "Error Generating package" ;
-			}
-		} else if (arch.getText().equals("ios")) {
-			if(RunProccess.runGradle(Ctx.project.getProjectDir(), "ios:createIPA")) {
-				FileUtils.copyDirectory(new File(Ctx.project.getProjectDir().getAbsolutePath() +
-							"/ios/build/robovm/")
-							, new File(dir.getText()));
-			} else {
-				msg = "Error Generating package" ;
-			}			
-		} else if (arch.getText().equals("html")) {
-			if(RunProccess.runGradle(Ctx.project.getProjectDir(), "html:dist")) {
-				FileUtils.copyDirectory(new File(Ctx.project.getProjectDir().getAbsolutePath() +
-							"/html/build/dist")
-							, new File(dir.getText()));
-			} else {
-				msg = "Error Generating package" ;
-			}			
-		}
-
-		return msg;
-	}
-
-	private void archChanged() {
-		for (InputPanel ip : options) {
-			setVisible(ip, false);
-		}
-
-		setVisible(androidKeyStorePassword, false);
-		setVisible(androidKeyAliasPassword, false);
-		setVisible(version, true);
-
-		String a = arch.getText();
-		if (a.equals("desktop")) {
-			setVisible(type, true);
-			typeChanged();
-		} else if (a.equals("android")) {
-			setVisible(androidSDK, true);
-			setVisible(androidKeyStore, true);
-			setVisible(androidKeyAlias, true);
-			setVisible(androidKeyStorePassword, true);
-			setVisible(androidKeyAliasPassword, true);
-		}
-	}
-
-	private void typeChanged() {
-		if (type.getText().equals(TYPES[0])) {
-			setVisible(os, true);
-		} else {
-			setVisible(os, false);
-			setVisible(icon, false);
-		}
-
-		osChanged();
-	}
-
-	private void osChanged() {
-		if (os.isVisible() && (os.getText().equals("windows") || os.getText().equals("all"))) {
-			setVisible(icon, true);
-			setVisible(winJRE, true);
-		} else {
-			setVisible(icon, false);
-			setVisible(winJRE, false);
-		}
-
-		if (os.isVisible() && (os.getText().equals("linux32") || os.getText().equals("all"))) {
-			setVisible(linux32JRE, true);
-		} else {
-			setVisible(linux32JRE, false);
-		}
-
-		if (os.isVisible() && (os.getText().equals("linux64") || os.getText().equals("all"))) {
-			setVisible(linux64JRE, true);
-		} else {
-			setVisible(linux64JRE, false);
-		}
-		
-		if (os.isVisible() && (os.getText().equals("macOSX") || os.getText().equals("all"))) {
-			setVisible(osxJRE, true);
-		} else {
-			setVisible(osxJRE, false);
-		}
-	}
-
-	@Override
-	protected boolean validateFields() {
-		boolean ok = true;
-
-		if (!dir.validateField())
-			ok = false;
-
-		for (InputPanel i : options) {
-			if (i.isVisible() && !i.validateField())
-				ok = false;
-		}
-
-		if (androidKeyStorePassword.isVisible() && !androidKeyStorePassword.validateField())
-			ok = false;
-
-		if (androidKeyAliasPassword.isVisible() && !androidKeyAliasPassword.validateField())
-			ok = false;
-
-//		if (icon.isVisible() && !icon.getText().endsWith(".ico")) {
-//			icon.setError(true);
-//			ok = false;
-//		}
-
-		if (linux32JRE.isVisible() && (!new File(linux32JRE.getText()).exists() || !linux32JRE.getText().toLowerCase().endsWith(".zip"))) {
-			linux32JRE.setError(true);
-			ok = false;
-		}
-
-		if (linux64JRE.isVisible() && (!new File(linux64JRE.getText()).exists() || !linux64JRE.getText().toLowerCase().endsWith(".zip"))){
-			linux64JRE.setError(true);
-			ok = false;
-		}
-
-		if (winJRE.isVisible() && (!new File(winJRE.getText()).exists() || !winJRE.getText().toLowerCase().endsWith(".zip"))){
-			winJRE.setError(true);
-			ok = false;
-		}
-		
-		if (osxJRE.isVisible() && (!new File(osxJRE.getText()).exists() || !osxJRE.getText().toLowerCase().endsWith(".zip"))){
-			osxJRE.setError(true);
-			ok = false;
-		}
-
-		return ok;
-	}
-	
-	private String genDesktopJar(String projectName, String versionParam, String jar) throws IOException {
-		String msg = null;
-		
-		if(RunProccess.runGradle(Ctx.project.getProjectDir(), versionParam + "desktop:dist")) {
-			File f = new File(jar);
-			FileUtils.copyFileToDirectory(f, new File(dir.getText()));					
-			new File(dir.getText() + "/" + projectName + "-desktop-" + version.getText() + ".jar").setExecutable(true);
-		} else {
-			msg = "Error Generating package" ;
-		}
-		
-		return msg;
-	}
-	
-	private void packr(Platform platform, String jdk, String exe, String jar, String mainClass, String outDir) throws IOException {
-		String suffix = null;;
-		
-		switch(platform) {
-		case linux32:
-			suffix = "lin32";
-			break;
-		case linux64:
-			suffix = "lin64";
-			break;
-		case mac:
-			suffix = "mac";
-			break;
-		case windows:
-			suffix = "win";
-			break;
-		
-		}
-		
-		Packr.Config config = new Packr.Config();
-		config.platform = platform;
-		config.jdk = jdk;
-		config.executable = exe;
-		config.jar = jar;
-		config.mainClass = mainClass;
-		config.vmArgs = Arrays.asList("-Xmx1G");
-		config.minimizeJre = new String[] { "jre/lib/rt/com/sun/corba", "jre/lib/rt/com/sun/jndi" };
-		config.outDir = outDir + "/" + exe + "-" + suffix;
-
-		new Packr().pack(config);
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ProjectToolbar.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ProjectToolbar.java
deleted file mode 100644
index e73789f24..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ProjectToolbar.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.awt.Desktop;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.IOException;
-
-import javax.swing.JFileChooser;
-
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Button.ButtonStyle;
-import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
-import com.badlogic.gdx.scenes.scene2d.ui.ImageButton.ImageButtonStyle;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.utils.RunProccess;
-
-public class ProjectToolbar extends Table {
-	private ImageButton newBtn;
-	private ImageButton loadBtn;
-	private ImageButton saveBtn;
-	private ImageButton packageBtn;
-	private ImageButton exitBtn;
-	private ImageButton playBtn;
-	private ImageButton assetsBtn;
-	private ImageButton atlasBtn;
-
-	private Skin skin;
-
-	public ProjectToolbar(Skin skin) {
-		super(skin);
-		this.skin = skin;
-		left();
-		newBtn = new ImageButton(skin);
-		saveBtn = new ImageButton(skin);
-		loadBtn = new ImageButton(skin);
-		packageBtn = new ImageButton(skin);
-		exitBtn = new ImageButton(skin);
-		playBtn = new ImageButton(skin);
-		assetsBtn = new ImageButton(skin);
-		atlasBtn = new ImageButton(skin);
-
-		addToolBarButton(skin, newBtn, "ic_new", "New", "Create a new project");
-		addToolBarButton(skin, loadBtn, "ic_load", "Load",
-				"Load an existing project");
-		addToolBarButton(skin, saveBtn, "ic_save", "Save",
-				"Save the current project");
-		addToolBarButton(skin, exitBtn, "ic_exit", "Exit",
-				"Save changes and exits");
-		row();
-
-		addToolBarButton(skin, playBtn, "ic_play", "Play", "Play Adventure");
-		addToolBarButton(skin, packageBtn, "ic_package", "Package",
-				"Package the game for distribution");
-		addToolBarButton(skin, assetsBtn, "ic_assets", "Assets",
-				"Open assets folder");
-		addToolBarButton(skin, atlasBtn, "ic_atlases", "Atlas", "Create Atlas");
-
-		newBtn.setDisabled(false);
-		loadBtn.setDisabled(false);
-		exitBtn.setDisabled(false);
-
-		newBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				newProject();
-			}
-		});
-
-		loadBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				loadProject();
-			}
-		});
-
-		exitBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				exit();
-			}
-		});
-
-		saveBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				saveProject();
-			}
-		});
-
-		playBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				play();
-			}
-		});
-
-		packageBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				packageProject();
-			}
-		});
-
-		assetsBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				openProjectFolder();
-			}
-		});
-
-		atlasBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				createAtlas();
-			}
-		});
-
-		Ctx.project.getWorld().addPropertyChangeListener(
-				new PropertyChangeListener() {
-					@Override
-					public void propertyChange(PropertyChangeEvent e) {
-						saveBtn.setDisabled(e.getPropertyName().equals(
-								"DOCUMENT_SAVED"));
-					}
-				});
-
-		Ctx.project.addPropertyChangeListener(Project.NOTIFY_PROJECT_LOADED,
-				new PropertyChangeListener() {
-					@Override
-					public void propertyChange(PropertyChangeEvent arg0) {
-						packageBtn.setDisabled(Ctx.project.getProjectDir() == null);
-						playBtn.setDisabled(Ctx.project.getProjectDir() == null);
-						assetsBtn.setDisabled(Ctx.project.getProjectDir() == null);
-						atlasBtn.setDisabled(Ctx.project.getProjectDir() == null);
-					}
-				});
-	}
-
-	private void addToolBarButton(Skin skin, ImageButton button, String icon,
-			String text, String tooltip) {
-		ImageButtonStyle style = new ImageButtonStyle(
-				skin.get(ButtonStyle.class));
-		TextureRegion image = Ctx.assetManager.getIcon(icon);
-		style.imageUp = new TextureRegionDrawable(image);
-
-		try {
-			TextureRegion imageDisabled = Ctx.assetManager.getIcon(icon
-					+ "_disabled");
-			style.imageDisabled = new TextureRegionDrawable(imageDisabled);
-		} catch (Exception e) {
-
-		}
-
-		button.setStyle(style);
-
-		add(button);
-		button.setDisabled(true);
-	}
-
-	private void newProject() {
-		CreateProjectDialog dialog = new CreateProjectDialog(skin);
-		dialog.show(getStage());
-		// TODO
-		// if (!dialog.isCancel()) {
-		// playBtn.setDisabled(false);
-		// packageBtn.setDisabled(false);
-		// }
-	}
-
-	private void loadProject() {
-		JFileChooser chooser = new JFileChooser(
-				Ctx.project.getProjectDir() != null ? Ctx.project
-						.getProjectDir() : new File("."));
-		chooser.setDialogTitle("Select the project to load");
-		chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-		chooser.setMultiSelectionEnabled(false);
-
-		if (chooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
-			try {
-				Ctx.project.saveProject();
-				Ctx.project.loadProject(chooser.getSelectedFile());
-				playBtn.setDisabled(false);
-				packageBtn.setDisabled(false);
-			} catch (Exception ex) {
-				String msg = "Something went wrong while loading the project.\n\n"
-						+ ex.getClass().getSimpleName()
-						+ " - "
-						+ ex.getMessage();
-				Ctx.msg.show(getStage(), msg, 2);
-				ex.printStackTrace();
-			}
-		}
-	}
-
-	public void exit() {
-		Gdx.app.exit();
-	}
-
-	private void saveProject() {
-		File file = Ctx.project.getProjectDir();
-
-		if (file == null) {
-			String msg = "Please create a new project first.";
-			Ctx.msg.show(getStage(), msg, 2);
-			return;
-		}
-
-		try {
-			Ctx.project.saveProject();
-		} catch (Exception ex) {
-			String msg = "Something went wrong while saving the project.\n\n"
-					+ ex.getClass().getSimpleName() + " - " + ex.getMessage();
-			Ctx.msg.show(getStage(), msg, 2);
-		}
-	}
-
-	private void packageProject() {
-		saveProject();
-
-		new PackageDialog(skin).show(getStage());
-	}
-
-	private void play() {
-		try {
-			saveProject();
-
-			if(!RunProccess.runBladeEngine(Ctx.project.getProjectDir(), null, null))
-				Ctx.msg.show(getStage(), "There was a problem running the project", 3);
-		} catch (IOException e) {
-			String msg = "Something went wrong while playing the project.\n\n"
-					+ e.getClass().getSimpleName() + " - " + e.getMessage();
-			Ctx.msg.show(getStage(), msg, 2);
-		}
-	}
-
-	private void openProjectFolder() {
-		if (Desktop.isDesktopSupported()) {
-			try {
-				Desktop.getDesktop().open(
-						new File(Ctx.project.getProjectDir().getAbsoluteFile()
-								+ "/assets"));
-			} catch (IOException e1) {
-				String msg = "Something went wrong while opening assets folder.\n\n"
-						+ e1.getClass().getSimpleName()
-						+ " - "
-						+ e1.getMessage();
-				Ctx.msg.show(getStage(), msg, 2);
-			}
-		}
-	}
-
-	private void createAtlas() {
-		new CreateAtlasDialog(skin).show(getStage());
-	}
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SceneList.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SceneList.java
deleted file mode 100644
index 8d45f35ba..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SceneList.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup;
-import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
-import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.utils.Array;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.model.WorldDocument;
-import com.bladecoder.engineeditor.ui.components.CellRenderer;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.ElementList;
-import com.bladecoder.engineeditor.utils.EditorLogger;
-
-public class SceneList extends ElementList {
-
-	private ImageButton initBtn;
-	private SelectBox<String> chapters;
-
-	public SceneList(Skin skin) {
-		super(skin, true);
-
-		HorizontalGroup chapterPanel = new HorizontalGroup();
-		chapters = new SelectBox<String>(skin);
-		chapters.setFillParent(true);
-		
-		chapterPanel.addActor(new Label("CHAPTER ", skin, "big"));
-		chapterPanel.addActor(chapters);
-		
-		clearChildren();
-		
-		add(chapterPanel).expandX().fillX();
-		row();
-		add(toolbar).expandX().fillX();
-		row().fill();
-		add(container).expandY().fill();
-
-		initBtn = new ImageButton(skin);
-		toolbar.addToolBarButton(initBtn, "ic_check",
-				"Set init scene", "Set init scene");
-
-		initBtn.setDisabled(true);
-
-		list.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				int pos = list.getSelectedIndex();
-
-				if (pos == -1) {
-					Ctx.project.setSelectedScene(null);
-				} else {
-					Element a = list.getItems().get(pos);
-					Ctx.project.setSelectedScene(a);
-				}
-
-				toolbar.disableEdit(pos == -1);
-				initBtn.setDisabled(pos == -1);
-			}
-		});
-
-		list.setCellRenderer(listCellRenderer);
-
-		initBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				setDefault();
-			}
-
-		});
-
-		Ctx.project.addPropertyChangeListener(Project.NOTIFY_PROJECT_LOADED,
-				new PropertyChangeListener() {
-					@Override
-					public void propertyChange(PropertyChangeEvent arg0) {
-						toolbar.disableCreate(Ctx.project.getProjectDir() == null);
-
-						addChapters();
-					}
-				});
-
-		chapters.addListener(chapterListener);
-
-		Ctx.project.getWorld().addPropertyChangeListener(
-				new PropertyChangeListener() {
-					@Override
-					public void propertyChange(PropertyChangeEvent evt) {
-						EditorLogger.debug(evt.getPropertyName() + " NEW:"
-								+ evt.getNewValue() + " OLD:"
-								+ evt.getOldValue());
-
-						if (evt.getPropertyName().equals("chapter")) {
-							addChapters();
-						} else if (evt.getPropertyName().equals(
-								"ELEMENT_DELETED")) {
-							Element e = (Element) evt.getNewValue();
-
-							if (e.getTagName().equals("chapter")) {								
-								addChapters();
-							}
-						}
-					}
-				});
-		
-	}
-
-	ChangeListener chapterListener = new ChangeListener() {
-		@Override
-		public void changed(ChangeEvent event, Actor actor) {
-			String selChapter = (String) chapters.getSelected();
-
-			if (selChapter != null && !selChapter.equals(Ctx.project.getSelectedChapter().getId())) {
-
-				// Save the project when changing chapter
-				try {
-					Ctx.project.saveProject();
-				} catch (IOException | TransformerException e1) {
-					Ctx.msg.show(getStage(),
-							"Error saving project", 3);
-					EditorLogger.error(e1.getMessage());
-				}
-
-				try {
-					if(selChapter != null)
-						Ctx.project.loadChapter(selChapter);
-					
-					doc = Ctx.project.getSelectedChapter();
-					
-					addElements(doc, doc.getElement(), "scene");
-				} catch (ParserConfigurationException | SAXException
-						| IOException e1) {
-					e1.printStackTrace();
-				}
-			}
-		}
-	};
-
-	public void addChapters() {
-		WorldDocument w = Ctx.project.getWorld();
-		String[] nl = w.getChapters();
-		Array<String> array = new Array<String>();
-
-		for (int i = 0; i < nl.length; i++) {
-			array.add(nl[i]);
-		}
-
-		chapters.setItems(array);
-		chapters.setSelected(Ctx.project.getSelectedChapter().getId());
-		invalidate();
-	}
-
-	private void setDefault() {
-
-		int pos = list.getSelectedIndex();
-
-		if (pos == -1)
-			return;
-
-		String id = list.getItems().get(pos).getAttribute("id");
-
-		doc.setRootAttr((Element) list.getItems().get(pos).getParentNode(),
-				"init_scene", id);
-
-	}
-
-	@Override
-	protected EditElementDialog getEditElementDialogInstance(
-			Element e) {
-		return new EditSceneDialog(skin, doc, parent, e);
-	}
-
-	// -------------------------------------------------------------------------
-	// ListCellRenderer
-	// -------------------------------------------------------------------------
-	private final CellRenderer<Element> listCellRenderer = new CellRenderer<Element>() {
-
-		@Override
-		protected String getCellTitle(Element e) {
-			String name = e.getAttribute("id");
-
-			Element chapter = (Element) e.getParentNode();
-
-			String init = chapter.getAttribute("init_scene");
-
-			if (init.equals(name))
-				name += " <init>";
-
-			return name;
-		}
-
-		@Override
-		protected String getCellSubTitle(Element e) {
-			return e.getAttribute("background");
-		}
-
-		@Override
-		public TextureRegion getCellImage(Element e) {
-			String bg = e.getAttribute("background");
-			
-			TextureRegion r = null;
-			
-			if(!bg.isEmpty()) 
-				r = Ctx.project.getBgIcon(bg);
-
-			if (r == null)
-				r =  Ctx.assetManager.getIcon("ic_no_scene");
-
-			return r;
-		}
-		
-		@Override
-		protected boolean hasSubtitle() {
-			return true;
-		}
-		
-		@Override
-		protected boolean hasImage() {
-			return true;
-		}
-	};
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SoundList.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SoundList.java
deleted file mode 100644
index 7d19233e5..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SoundList.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.bladecoder.engineeditor.ui.components.CellRenderer;
-import com.bladecoder.engineeditor.ui.components.ElementList;
-
-public class SoundList extends ElementList {	
-	
-	public SoundList(Skin skin) {
-		super(skin, true);
-		
-		setCellRenderer(listCellRenderer);
-	}	
-
-	@Override
-	protected EditSoundDialog getEditElementDialogInstance(Element e) {
-		return new EditSoundDialog(skin, doc, parent, e);
-	}	
-
-	// -------------------------------------------------------------------------
-	// ListCellRenderer
-	// -------------------------------------------------------------------------
-	private static final CellRenderer<Element> listCellRenderer = new CellRenderer<Element>() {
-
-		@Override
-		protected String getCellTitle(Element e) {
-			String id  = e.getAttribute("id");
-
-			return id;
-		}
-
-		@Override
-		protected String getCellSubTitle(Element e) {
-			String filename = e.getAttribute("filename");
-			String loop = e.getAttribute("loop");
-			String volume = e.getAttribute("volume");
-
-			StringBuilder sb = new StringBuilder();
-
-			if (!filename.isEmpty())
-				sb.append("filename: ").append(filename);
-			if (!loop.isEmpty())
-				sb.append(" loop: ").append(loop);
-			if (!volume.isEmpty())
-				sb.append(" volume: ").append(volume);
-			
-			return sb.toString();
-		}
-		
-		@Override
-		protected boolean hasSubtitle() {
-			return true;
-		}
-	};
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SpriteList.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SpriteList.java
deleted file mode 100644
index d952bcef0..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SpriteList.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.ChapterDocument;
-import com.bladecoder.engineeditor.ui.components.CellRenderer;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.ElementList;
-
-public class SpriteList extends ElementList {
-	
-	private ImageButton initBtn;
-	
-	public SpriteList(Skin skin) {
-		super(skin, true);
-		
-		initBtn = new ImageButton(skin);
-		toolbar.addToolBarButton(initBtn, "ic_check", "Set init scene", "Set init scene");
-		initBtn.setDisabled(true);
-		
-		setCellRenderer(listCellRenderer);
-
-		list.addListener(new ChangeListener() {
-
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				int pos = list.getSelectedIndex();
-
-				String id = null;
-
-				if (pos != -1)
-					id = list.getItems().get(pos).getAttribute("id");
-
-				Ctx.project.setSelectedFA(id);
-				
-				toolbar.disableEdit(pos== -1);
-				initBtn.setDisabled(pos== -1);
-			}
-		});
-		
-		initBtn.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				setDefault();
-			}
-		});
-	}
-	
-	private void setDefault() {
-		ChapterDocument scn = (ChapterDocument) doc;
-
-		int pos = list.getSelectedIndex();
-
-		if (pos == -1)
-			return;
-
-		String id = list.getItems().get(pos).getAttribute("id");
-//		String prev = w.getRootAttr("init_scene");
-		
-		scn.setRootAttr((Element)list.getItems().get(pos).getParentNode(), "init_frame_animation", id);
-	}	
-
-	@Override
-	protected EditElementDialog getEditElementDialogInstance(Element e) {
-		return new EditSpriteDialog(skin, doc, parent, e);
-	}	
-
-	// -------------------------------------------------------------------------
-	// ListCellRenderer
-	// -------------------------------------------------------------------------
-	private final CellRenderer<Element> listCellRenderer = new CellRenderer<Element>() {
-
-		@Override
-		protected String getCellTitle(Element e) {
-			String name =  e.getAttribute("id");
-			Element actor = (Element)e.getParentNode();
-			
-			String init = actor.getAttribute("init_frame_animation");
-			
-			if(init == null || init.isEmpty()) {
-				Node n = actor.getFirstChild();
-				while(!(n instanceof Element))
-					n = n.getNextSibling();
-				
-				init = ((Element)n).getAttribute("id");
-			}
-			
-			if(init.equals(name))
-				name += " <init>";
-			
-			return name;
-		}
-
-		@Override
-		protected String getCellSubTitle(Element e) {
-			String source = e.getAttribute("source");
-			String speed = e.getAttribute("speed");
-			String delay = e.getAttribute("delay");
-			String count = e.getAttribute("count");
-
-			StringBuilder sb = new StringBuilder();
-
-			if (!source.isEmpty())
-				sb.append("source: ").append(source);
-			if (!speed.isEmpty())
-				sb.append(" speed: ").append(speed);
-			if (!delay.isEmpty())
-				sb.append(" delay: ").append(delay);
-			if (!count.isEmpty())
-				sb.append(" count: ").append(count);
-			
-			
-			return sb.toString();
-		}
-
-		@Override
-		public TextureRegion getCellImage(Element e) {
-			String u = null;	
-
-			if (e.getAttribute("animation_type").equalsIgnoreCase("repeat")) {
-				u = "ic_repeat";
-			} else if (e.getAttribute("animation_type").equalsIgnoreCase("yoyo")) {
-				u = "ic_yoyo";
-			} else {
-				u = "ic_sprite_actor";
-			}
-			
-			return  Ctx.assetManager.getIcon(u);
-		}
-		
-		@Override
-		protected boolean hasSubtitle() {
-			return true;
-		}
-		
-		@Override
-		protected boolean hasImage() {
-			return true;
-		}
-	};
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/VerbList.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/VerbList.java
deleted file mode 100644
index b434fc346..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/VerbList.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.text.MessageFormat;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.ui.components.CellRenderer;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.ElementList;
-
-
-public class VerbList extends ElementList {
-	
-	public static final String VERBS[] = { "lookat", "pickup", "talkto", "use", "leave", "init",
-		"test", "custom" };
-
-	private ActionList actionList;
-
-	public VerbList(Skin skin) {
-		super(skin, true);
-		actionList = new ActionList(skin);
-		
-//		addActor(actionList);
-		row();
-		add(actionList).expand().fill();
-
-		list.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				addActions();
-			}
-		});
-
-		list.setCellRenderer(listCellRenderer);
-	}
-
-	@Override
-	protected EditElementDialog getEditElementDialogInstance(Element e) {
-		return new EditVerbDialog(skin, doc, parent, e);
-	}
-
-	@Override
-	public void addElements(BaseDocument doc, Element parent, String tag) {
-		super.addElements(doc, parent, tag);
-		addActions();
-	}
-
-	private void addActions() {
-		int pos = list.getSelectedIndex();
-
-		Element v = null;
-
-		if (pos != -1) {
-			v = list.getItems().get(pos);
-		}
-
-		actionList.addElements(doc, v, "action");
-	}
-
-	// -------------------------------------------------------------------------
-	// ListCellRenderer
-	// -------------------------------------------------------------------------
-	private final CellRenderer<Element> listCellRenderer = new CellRenderer<Element>() {
-
-		@Override
-		protected String getCellTitle(Element e) {
-			return e.getAttribute("id");
-		}
-
-		@Override
-		protected String getCellSubTitle(Element e) {
-			String state = e.getAttribute("state");
-			String target = e.getAttribute("target");
-
-			StringBuilder sb = new StringBuilder();
-
-			if (!state.isEmpty())
-				sb.append("when ").append(state);
-			if (!target.isEmpty())
-				sb.append(" with target '").append(target).append("'");
-
-			return sb.toString();
-		}
-
-		@Override
-		public TextureRegion getCellImage(Element e) {
-			boolean custom = true;
-			
-			String verbName = e.getAttribute("id");
-			for(String v:VERBS) {
-				if(v.equals(verbName)) {
-					custom = false;
-					break;
-				}
-			}
-			
-			String iconName = MessageFormat.format("ic_{0}", e.getAttribute("id"));
-			TextureRegion image = null;
-			
-			if(!custom)
-				image = Ctx.assetManager.getIcon(iconName);
-			else
-				image = Ctx.assetManager.getIcon("ic_custom");
-
-			return image;
-		}
-		
-		@Override
-		protected boolean hasSubtitle() {
-			return true;
-		}
-		
-		@Override
-		protected boolean hasImage() {
-			return true;
-		}
-	};
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/WorldProps.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/WorldProps.java
deleted file mode 100644
index 7db2c88ca..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/WorldProps.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.PropertyTable;
-
-
-public class WorldProps extends PropertyTable {
-
-	public static final String WIDTH_PROP = "width";
-	public static final String HEIGHT_PROP = "height";	
-	public static final String TITLE_PROP = "title";
-	
-//	TableModelListener tableModelListener = new TableModelListener() {
-//		@Override
-//		public void tableChanged(TableModelEvent e) {
-//			if (e.getType() == TableModelEvent.UPDATE) {
-//				int row = e.getFirstRow();
-//				updateModel((String) propertyTable.getModel().getValueAt(row, 0),
-//						(String) propertyTable.getModel().getValueAt(row, 1));
-//			}
-//		}
-//	};
-
-	public WorldProps(Skin skin) {
-		super(skin);
-
-		Ctx.project.addPropertyChangeListener(Project.NOTIFY_PROJECT_LOADED,
-				new PropertyChangeListener() {
-					@Override
-					public void propertyChange(PropertyChangeEvent arg0) {
-						setProject();
-					}
-				});
-	}
-
-	@Override
-	protected void updateModel(String property, String value) {
-		if (property.equals(WIDTH_PROP)) {
-			Ctx.project.getWorld().setWidth(value);
-		} else if (property.equals(TITLE_PROP)) {
-			Ctx.project.getConfig().setProperty(TITLE_PROP, value);
-		} else if (property.equals(HEIGHT_PROP)) {
-			Ctx.project.getWorld().setHeight(value);
-		}
-	}
-
-	private void setProject() {
-		clear();
-		addProperty(WIDTH_PROP, Ctx.project.getWorld().getWidth());
-		addProperty(HEIGHT_PROP, Ctx.project.getWorld().getHeight());		
-		addProperty(TITLE_PROP, Ctx.project.getTitle());
-		
-		invalidateHierarchy();
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditElementDialog.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditElementDialog.java
deleted file mode 100644
index 2cbfe6627..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditElementDialog.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
-
-import java.text.MessageFormat;
-
-import org.w3c.dom.Element;
-
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent;
-import com.bladecoder.engineeditor.model.BaseDocument;
-
-public abstract class EditElementDialog extends EditDialog {
-	
-	protected Element e;
-	protected Element parent;
-	protected String type;
-	protected BaseDocument doc;
-	
-	protected InputPanel[] i;
-	protected String a[];
-	
-    protected ChangeListener listener;
-
-	public EditElementDialog(Skin skin) {
-		super("", skin);
-	}
-	
-	protected void init(InputPanel[] inputs, String attrs[], BaseDocument doc, Element parent, String type, Element e) {
-		this.i = inputs;
-		this.a = attrs;
-		this.e = e;
-		this.doc = doc;
-		this.parent = parent;
-		this.type = type;
-		
-		for (InputPanel i : inputs) {
-			addInputPanel(i);
-		}
-		
-		if (e == null) {
-			setTitle("CREATE " + type.toUpperCase());
-		} else {
-			String s = e.getAttribute("id");
-			
-			if(s==null||s.isEmpty()) s = e.getTagName();
-				
-			setTitle(MessageFormat.format("EDIT ELEMENT ''{0}''", s));
-			
-			for (int pos = 0; pos < attrs.length; pos++) {			
-				InputPanel i = inputs[pos];
-				i.setText(e.getAttribute(attrs[pos]));
-			}
-		}
-		
-		// TODO Set focus to the 1st element		
-//		if(inputs.length > 0) {
-//			getStage().setKeyboardFocus(inputs[0].getField());
-//		}
-	}
-
-	@Override
-	protected void ok() {
-
-		if (e == null) {
-			create();
-		}
-		
-		fill();
-		
-		if(listener != null)
-			listener.changed(new ChangeEvent(), this);
-	}
-	
-	public void setListener(ChangeListener l) {
-		listener = l;
-	}
-	
-	protected void create() {
-		e = doc.createElement(parent, type);
-	}
-
-	protected void fill() {
-		for (int j = 0; j < a.length; j++) {
-			InputPanel input = i[j];
-			
-			if (!input.getText().isEmpty() && input.isVisible()) {
-				if(a[j].equals("id")) {
-					doc.setId(e, input.getText());
-				} else {
-					e.setAttribute(a[j], input.getText());
-				}
-			} else {
-				e.removeAttribute(a[j]);
-			}
-			
-			
-		}
-		
-		doc.setModified(e);
-	}
-	
-	public Element getElement() {
-		return e;
-	}
-
-	@Override
-	protected boolean validateFields() {
-
-		for (InputPanel p : i) {
-			if (p.isVisible() && !p.validateField())
-				return false;
-		}
-
-		return true;
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/ElementList.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/ElementList.java
deleted file mode 100644
index 5074da685..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/ElementList.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
-
-import java.util.Comparator;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.bladecoder.engineeditor.model.BaseDocument;
-
-public abstract class ElementList extends EditList<Element> {
-
-	protected BaseDocument doc;
-	protected Element parent;
-
-	protected Element clipboard;
-	
-	private boolean sorted;
-
-	public ElementList(Skin skin, boolean sorted) {
-		super(skin);
-		
-		list.addListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				int pos = list.getSelectedIndex();
-
-				toolbar.disableEdit(pos == -1);
-			}
-		});
-		
-		this.sorted = sorted;
-
-	}
-
-	public void addElements(BaseDocument doc, Element parent, String tag) {
-		this.doc = doc;
-		this.parent = parent;
-
-		list.getItems().clear();
-		list.getSelection().clear();
-
-		if (parent != null) {
-
-			NodeList nl;
-			
-			if(tag == null)
-				nl = parent.getChildNodes();
-			else {
-//				nl = parent.getElementsByTagName(tag);
-				nl = doc.getChildrenByTag(parent, tag);
-			}
-
-			for (int i = 0; i < nl.getLength(); i++) {
-				if(nl.item(i) instanceof Element)
-					addItem((Element) nl.item(i));
-			}			
-		}
-		
-		if (getItems().size > 0)
-			list.setSelectedIndex(0);
-		
-		toolbar.disableEdit(list.getSelectedIndex() < 0);
-		
-		if(sorted) {
-			list.getItems().sort(new Comparator<Element>() {
-				@Override
-				public int compare(Element o1, Element o2) {
-					return o1.getAttribute("id").compareTo(o2.getAttribute("id"));
-				}
-			});
-		}
-
-		toolbar.disableCreate(parent == null);
-//		list.setWidth(getWidth());
-		list.invalidateHierarchy();
-	}
-
-	@Override
-	protected void create() {
-		EditElementDialog dialog = getEditElementDialogInstance(null);
-		dialog.show(getStage());
-		dialog.setListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				Element e = ((EditElementDialog)actor).getElement();
-				addItem(e);
-				int i = getItems().indexOf(e, true);
-				if(i != -1)
-					list.setSelectedIndex(i);
-				
-				list.invalidateHierarchy();
-			}			
-		});
-	}
-
-	@Override
-	protected void edit() {
-
-		Element e = list.getSelected();
-
-		if (e == null)
-			return;
-
-
-		EditElementDialog dialog = getEditElementDialogInstance(e);
-		dialog.show(getStage());
-		dialog.setListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				Element e = ((EditElementDialog)actor).getElement();
-				doc.setModified(e);
-			}			
-		});		
-	}
-
-	protected abstract EditElementDialog getEditElementDialogInstance(Element e);
-
-	@Override
-	protected void delete() {
-		int pos = list.getSelectedIndex();
-
-		if (pos == -1)
-			return;
-
-		Element e = list.getItems().removeIndex(pos);
-
-		doc.deleteElement(e);
-
-		clipboard = e;
-		toolbar.disablePaste(false);
-
-		if (pos > 0)
-			list.setSelectedIndex(pos - 1);
-		else if (pos == 0 && list.getItems().size > 0)
-			list.setSelectedIndex(0);
-//		else
-//			list.clearSelection();
-	}
-
-	@Override
-	protected void copy() {
-		Element e = list.getSelected();
-
-		if (e == null)
-			return;
-
-		clipboard = (Element) e.cloneNode(true);
-		toolbar.disablePaste(false);
-	}
-
-	@Override
-	protected void paste() {
-		Element newElement = doc.cloneNode(parent, clipboard);
-		int pos = list.getSelectedIndex() + 1;
-		
-		Element e2 = null;	
-		
-		if(pos!=0 && pos < list.getItems().size) 
-			e2 = list.getItems().get(pos);
-		
-		list.getItems().insert(pos, newElement);
-		
-		Node parent = newElement.getParentNode();
-		parent.insertBefore(newElement, e2);					
-		
-		list.setSelectedIndex(pos);		
-		list.invalidateHierarchy();
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/FileInputPanel.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/FileInputPanel.java
deleted file mode 100644
index 0fd0553e4..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/FileInputPanel.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
-
-import java.io.File;
-
-import javax.swing.JFileChooser;
-
-import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
-import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
-import com.bladecoder.engineeditor.Ctx;
-
-public class FileInputPanel extends InputPanel {
-	
-	private File cd;
-	private File selected;
-	
-	private boolean dirOnly = false;
-	private final static String FILE_TEXT = "Select file";
-	private final static String DIR_TEXT = "Select folder";
-	
-	public FileInputPanel(Skin skin, String title, String desc, boolean dirOnly) {
-		this(skin, title, desc, Ctx.project.getProjectDir() != null ? Ctx.project.getProjectDir() : new File("."), dirOnly);
-	}
-
-	public FileInputPanel(Skin skin, String title, String desc, File current, boolean dOnly) {
-		super(skin, title, desc, new TextButton(dOnly?DIR_TEXT:FILE_TEXT, skin), null);
-		
-		this.cd = current;
-		this.dirOnly = dOnly;
-
-//		((TextField) getField()).setEditable(false);
-
-		((TextButton) getField()).addListener(new ClickListener() {
-			public void clicked (InputEvent event, float x, float y) {
-				JFileChooser chooser = new JFileChooser(cd);			
-				
-				if(dirOnly) {
-					chooser.setDialogTitle("Select folder");
-					chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-				} else {
-					chooser.setDialogTitle("Select file");
-				}
-				
-				chooser.setMultiSelectionEnabled(false);
-
-				if (chooser.showDialog(null, "Ok") == JFileChooser.APPROVE_OPTION) {
-					((TextButton) getField()).setText(chooser.getSelectedFile().getAbsolutePath());
-					selected = cd = chooser.getSelectedFile();
-				}				
-			}		
-		});
-	}
-	
-	public File getFile() {
-		return selected;
-	}
-	
-	@Override
-	public String getText() {
-		if(selected != null)
-			return selected.getAbsolutePath();
-		else 
-			return "";
-	}
-	
-	@Override
-	public void setText(String text) {
-		super.setText(text);
-		selected=cd= new File(text);
-	}
-	
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/InputPanel.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/InputPanel.java
deleted file mode 100644
index e2842cbf1..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/InputPanel.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
-import com.badlogic.gdx.scenes.scene2d.ui.TextField;
-import com.bladecoder.engine.actions.Param;
-import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engineeditor.Ctx;
-
-public class InputPanel extends Table {
-	private static final String[] booleanValues = {"true", "false"};
-	private static final String[] booleanNotMandatoryValues = {"", "true", "false"};
-	
-    private Actor field;
-    private Label title;
-    private Label desc;
-    private Param.Type type = Type.STRING;
-    private boolean mandatory = false;
-
-    @SuppressWarnings("unchecked")
-	public InputPanel(Skin skin, String title, String desc, String[] options) {
-    	init(skin, title, desc, new SelectBox<String>(skin), mandatory, null);
-    	
-    	if(options != null)
-    		((SelectBox<String>)field).setItems(options);
-    }
-    
-    public InputPanel(Skin skin, String title, String desc) {
-    	init(skin, title, desc, new TextField("", skin), mandatory, null);
-    } 
-    
-    public InputPanel(Skin skin, String title, String desc, boolean mandatory) {
-    	init(skin, title, desc, new TextField("", skin), mandatory, null);
-    }
-    
-    public InputPanel(Skin skin, String title, String desc, Param.Type type, boolean mandatory) {
-    	this(skin, title, desc, type, mandatory, null, null);
-    }
-    
-    public InputPanel(Skin skin, String title, String desc, Param.Type type, boolean mandatory, String defaultValue) {
-    	this(skin, title, desc, type, mandatory, defaultValue, null);
-    }
-    
-    @SuppressWarnings("unchecked")
-	public InputPanel(Skin skin, String title, String desc, Param.Type type, boolean mandatory, String defaultValue, String[] options) {
-    	this.type = type;
-    	
-    	if(options != null) {
-    		init(skin, title, desc, new SelectBox<String>(skin), mandatory, defaultValue);
-    		
-        	((SelectBox<String>)field).setItems(options);
-    		return;
-    	}
-    	
-		switch(type){
-		case BOOLEAN:
-			init(skin, title, desc, new SelectBox<String>(skin), mandatory, defaultValue);
-			((SelectBox<String>)field).setItems(mandatory?booleanValues:booleanNotMandatoryValues);
-	       	if(defaultValue != null)
-	    		setText(defaultValue);			
-			break;
-			
-		case VECTOR2:
-			init(skin, title, desc, new Vector2Panel(skin), mandatory, defaultValue);
-			break;
-			
-		case DIMENSION:
-			init(skin, title, desc, new DimPanel(skin), mandatory, defaultValue);
-			break;
-			
-		case ACTOR:
-		{
-			NodeList actors = Ctx.project.getSelectedChapter().getActors(Ctx.project.getSelectedScene());
-			int l = actors.getLength();
-			if(!mandatory) l++;
-			String values[] = new String[l];
-			
-			if(!mandatory) {
-				values[0] = "";
-			}
-			
-			for(int i = 0; i < actors.getLength(); i++) {
-				if(mandatory)
-					values[i] = ((Element)actors.item(i)).getAttribute("id");
-				else
-					values[i+1] = ((Element)actors.item(i)).getAttribute("id");
-			}
-			
-			init(skin, title, desc, new SelectBox<String>(skin), mandatory, defaultValue);
-			((SelectBox<String>)field).setItems(values);
-	       	if(defaultValue != null)
-	    		setText(defaultValue);
-		}
-			break;
-			
-		case SCENE:
-		{
-			NodeList scenes = Ctx.project.getSelectedChapter().getScenes();
-			int l = scenes.getLength();
-			if(!mandatory) l++;
-			String values[] = new String[l];
-			
-			if(!mandatory) {
-				values[0] = "";
-			}
-			
-			for(int i = 0; i < scenes.getLength(); i++) {
-				if(mandatory)
-					values[i] = ((Element)scenes.item(i)).getAttribute("id");
-				else
-					values[i+1] = ((Element)scenes.item(i)).getAttribute("id");
-			}
-			
-			init(skin, title, desc, new SelectBox<String>(skin), mandatory, defaultValue);
-			((SelectBox<String>)field).setItems(values);
-	       	if(defaultValue != null)
-	    		setText(defaultValue);
-		}
-			break;			
-			
-		case CHAPTER:
-		{
-			String[] chapters = Ctx.project.getWorld().getChapters();
-			int l = chapters.length;
-			if(!mandatory) l++;
-			String values[] = new String[l];
-			
-			if(!mandatory) {
-				values[0] = "";
-			}
-			
-			for(int i = 0; i < chapters.length; i++) {
-				if(mandatory)
-					values[i] = chapters[i];
-				else
-					values[i+1] = chapters[i];
-			}
-			
-			init(skin, title, desc, new SelectBox<String>(skin), mandatory, defaultValue);
-			((SelectBox<String>)field).setItems(values);
-	       	if(defaultValue != null)
-	    		setText(defaultValue);	
-		}
-			break;			
-			
-		default:
-			init(skin, title, desc, new TextField("", skin), mandatory, defaultValue);
-			break;
-		
-		}
-	}     
-    
-    public InputPanel(Skin skin, String title, String desc, Actor c, String defaultValue) {
-    	init(skin, title, desc, c, false, defaultValue);
-    }
-    
-    private void init(Skin skin, String title, String desc, Actor c, boolean mandatory, String defaultValue) {
-    	this.mandatory = mandatory;
-    	
-       	this.setSkin(skin);
-    	LabelStyle style = new LabelStyle(skin.get(LabelStyle.class));
-    	this.title = new Label(title, style);
-    	
-        this.desc = new Label(desc,skin, "subtitle");
-        this.desc.setWrap(false);  
-    	     	
-       	this.field = c;
-       	
-       	add(this.title).left();
-       	row().expand();
-       	add(field).left();
-       	row().expand();
-       	add(this.desc).left();
-    	
-       	if(defaultValue != null)
-    		setText(defaultValue);
-    }
-    
-    
-    public void setMandatory(boolean value) {
-    	mandatory = value;
-    }
-
-	public void setError(boolean value) {
-    	if(value)
-    		title.getStyle().fontColor = Color.RED;
-    	else
-    		title.getStyle().fontColor = Color.WHITE;
-    }
-    
-    @SuppressWarnings("unchecked")
-	public String getText() {
-    	
-    	if(field instanceof TextField)
-    		return ((TextField)field).getText();
-    	else if(field instanceof SelectBox)
-    		return (String)((SelectBox<String>)field).getSelected();
-    	else if(field instanceof Vector2Panel)
-    		return ((Vector2Panel)field).getText();
-    	else if(field instanceof DimPanel)
-    		return ((DimPanel)field).getText();
-    	
-    	return null;
-    }
-    
-    public String getTitle() {
-    	return title.getText().toString();
-    }
-    
-    @SuppressWarnings("unchecked")
-	public int getSelectedIndex() {
-    	if(field instanceof SelectBox)
-    		return ((SelectBox<String>)field).getSelectedIndex();
-    	
-    	return 0;
-    }
-    
-    public Actor getField() {
-    	return field;
-    }
-
-	@SuppressWarnings("unchecked")
-	public void setText(String text) {
-		if(field instanceof TextField)
-    		((TextField)field).setText(text);
-		else if(field instanceof SelectBox) {
-			int idx = ((SelectBox<String>)field).getItems().indexOf(text, false);
-			if(idx != -1)
-				((SelectBox<String>)field).setSelectedIndex(idx);
-		} else if(field instanceof Vector2Panel)
-    		((Vector2Panel)field).setText(text);
-		else if(field instanceof DimPanel)
-    		((DimPanel)field).setText(text);
-		else if(field instanceof TextButton)
-			((TextButton)field).setText(text);
-	}
-	
-	public boolean validateField() {
-	
-		String s = getText();
-		
-		if(mandatory) {
-			if(s == null || s.trim().isEmpty()) {
-				setError(true);
-				return false;
-			}		
-		}
-		
-		if(field instanceof SelectBox<?>) return true;
-		
-		if(!mandatory && (s==null || s.trim().isEmpty())) {
-			setError(false);	
-			return true;
-		}
-		
-		switch(type){
-		case FLOAT:			
-			try {
-				Float.parseFloat(s);
-			} catch (NumberFormatException e) {
-				setError(true);
-				return false;
-			}
-			break;
-		case INTEGER:
-			try {
-				Integer.parseInt(s);
-			} catch (NumberFormatException e) {
-				setError(true);
-				return false;
-			}				
-			break;
-		case VECTOR2:
-		
-			if(!((Vector2Panel)field).validateField()) {
-				setError(true);
-				return false;
-			}
-			break;
-		case DIMENSION:
-			
-			if(!((DimPanel)field).validateField()) {
-				setError(true);
-				return false;
-			}			
-				
-			break;
-		default:
-			break;
-		
-		}		
-		
-		setError(false);	
-		return true;
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/PropertyTable.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/PropertyTable.java
deleted file mode 100644
index 3f5a51a15..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/PropertyTable.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
-
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.ui.TextField;
-import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
-import com.badlogic.gdx.scenes.scene2d.utils.FocusListener;
-
-public class PropertyTable extends Table {
-	private static final String[] BOOLEAN_VALUES = {"", "true", "false"};
-
-	Skin skin;
-
-	public enum Types {
-		INTEGER, BOOLEAN, FLOAT, STRING
-	}
-
-	public PropertyTable(Skin skin) {
-		super(skin);
-		this.skin = skin;
-		top().left();
-		
-		add(new Label("Name", skin));
-		add(new Label("Value", skin));
-	}
-
-	public void addProperty(String name, String value, Types type) {
-		
-		row();
-		add(new Label(name, skin)).expandX().left();
-		
-		if(type == Types.BOOLEAN) {
-			SelectBox<String> sb= new SelectBox<String>(skin);
-			sb.setItems(BOOLEAN_VALUES);
-			if(value!=null)
-				sb.setSelected(value);
-			sb.setName(name);
-			add(sb).expandX().left();
-			
-			sb.addListener(new ChangeListener() {
-				
-				@SuppressWarnings("unchecked")
-				@Override
-				public void changed(
-						com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent event,
-						Actor actor) {
-					updateModel(actor.getName(), ((SelectBox<String>)actor).getSelected());
-					
-				}
-			});
-		} else {
-			TextField tf = new TextField( value==null?"":value, skin);
-			tf.setName(name);
-			add(tf).expandX().left();
-			
-			tf.addListener(new FocusListener() {
-				
-				@Override
-				public void keyboardFocusChanged (FocusEvent event, Actor actor, boolean focused) {
-					if(!focused)
-						updateModel(actor.getName(), ((TextField)actor).getText());
-				}
-			});
-		}
-	}
-
-	public void addProperty(String name, int value) {
-		addProperty(name, Integer.toString(value), Types.INTEGER);
-	}
-
-	public void addProperty(String name, float value) {
-		addProperty(name, Float.toString(value), Types.FLOAT);
-	}
-
-	public void addProperty(String name, String value) {
-		addProperty(name, value, Types.STRING);
-	}
-
-	public void addProperty(String name, boolean value) {
-		addProperty(name, Boolean.toString(value), Types.BOOLEAN);
-	}
-	
-	protected void updateModel(String property, String value) {
-		
-	}
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/EditorLogger.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/EditorLogger.java
deleted file mode 100644
index cd0b776e8..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/EditorLogger.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
-
-public class EditorLogger {
-	private static String TAG = "EDITOR";
-	public static enum Levels {DEBUG, ERROR};
-	
-	public static Levels level = Levels.ERROR;
-
-	public static void debug(String message) {
-		if(level == Levels.DEBUG)
-			System.out.println(TAG + ": " + message);
-	}
-
-	public static void error(String message) {
-		System.err.println(TAG + ": " + message);
-	}
-
-	public static void error(String message, Exception e) {
-		System.out.println(TAG + ": " + message + " Exception: " + e.getMessage());
-	}
-
-	public static void toggle() {
-		if (level == Levels.DEBUG)
-			level = Levels.ERROR;
-		else
-			level = Levels.DEBUG;
-	}
-
-	public static boolean debugMode() {
-		if (level == Levels.DEBUG)
-			return true;
-
-		return false;
-	}
-
-	public static Levels getDebugLevel() {
-		return level;
-	}
-
-	public static void setDebugLevel(Levels l) {
-		level = l;
-	}
-	
-	public static void setDebug() {
-		level = Levels.DEBUG;
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/ExtractStrings.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/ExtractStrings.java
deleted file mode 100644
index 7716ef489..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/ExtractStrings.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.Properties;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * Extract all strings from chapter to the I18N properties file.
- * 
- * @author rgarcia
- */
-public class ExtractStrings {
-	private final static String[] i18nAttributes = {"text", "desc", "response_text"};
-	
-	// other locale message properties to generate
-	private final static String[] locales = {"es"};
-	
-	Properties prop = new Properties();
-
-	String xmlFilename;
-	String propFilename;
-	String propFilenameLocales[] = new String[locales.length];
-	Properties propLocales[] = new Properties[locales.length];
-
-	Document doc;
-
-	public void parseXML(String xmlFilename, String propFilename) throws ParserConfigurationException, SAXException,
-			IOException {
-		this.xmlFilename = xmlFilename;
-		this.propFilename = propFilename;
-		
-		// If the .properties name is not given, it is used the same that the xml 
-		if(propFilename == null) {
-			this.propFilename = xmlFilename.substring(0, xmlFilename.length() - 4) + ".properties";
-			
-			for(int i = 0; i < locales.length; i++) {
-				propFilenameLocales[i] = xmlFilename.substring(0, xmlFilename.length() - 4) + "_" + locales[i] + ".properties";
-			}
-		} else {
-			for(int i = 0; i < locales.length; i++) {
-				propFilenameLocales[i] = this.propFilename.substring(0, this.propFilename.length() - 11) + "_" + locales[i] + ".properties";
-			}
-		}
-
-		File fXmlFile = new File(xmlFilename);
-		DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-		DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-		doc = dBuilder.parse(fXmlFile);
-		
-		File propFile = new File(this.propFilename);
-		
-		if(propFile.exists()) {
-			prop.load(new FileInputStream(propFile));
-		}
-		
-		for(int i = 0; i < propFilenameLocales.length; i++) {
-			File propFileLocale = new File(propFilenameLocales[i]);
-			propLocales[i] = new Properties();
-		
-			if(propFileLocale.exists()) {
-				propLocales[i].load(new FileInputStream(propFileLocale));
-			}
-		}
-	}
-
-	public void extract() {
-		extract(doc.getDocumentElement(), doc.getDocumentElement().getAttribute("id"));
-	}
-
-	private void extract(Element e, String key) {
-		for(String attr:i18nAttributes) {
-			if(e.getAttribute(attr) != null && !e.getAttribute(attr).isEmpty()) {
-				String key2 = key + "." + attr;
-				String value = e.getAttribute(attr);
-				
-				if(e.getAttribute(attr).charAt(0) != '@') {
-					prop.put(key2, value);
-					
-					for(int i = 0; i < locales.length; i++) {
-						propLocales[i].put(key2, value);
-					}
-
-					// change XML value
-					e.getAttributeNode(attr).setNodeValue("@" + key2);
-				}
-			}
-		}
-
-		NodeList nodes = e.getChildNodes();
-
-		for (int i = 0, j=0; i < nodes.getLength(); i++) {
-			Node n = nodes.item(i);
-
-			if (n.getNodeType() == Node.ELEMENT_NODE) {
-				Element e2 = (Element) n;
-				
-				String state = e2.getAttribute("state");
-				String target = e2.getAttribute("target");
-				String id = e2.getAttribute("id");
-				
-				if (id.isEmpty())
-					id = Integer.toString(j);
-				
-				if(!state.isEmpty()) id  = id + "." + state;
-				if(!target.isEmpty()) id  = id + "." + target;				
-
-				String key2 = key + "." + id;
-				
-				if(key.isEmpty()) key2 = id;
-				
-				extract(e2, key2);
-				
-				j++;
-			}
-		}
-
-	}
-
-	public void writeProp() throws IOException {
-		FileOutputStream os = new FileOutputStream(propFilename);				
-		Writer out = new OutputStreamWriter(os, "ISO-8859-1");
-		prop.store(out, null);
-		
-		for(int i = 0; i < locales.length; i++) {
-			FileOutputStream osES = new FileOutputStream(propFilenameLocales[i]);		
-			Writer outES = new OutputStreamWriter(osES, "ISO-8859-1");
-			propLocales[i].store(outES, null);
-		}
-	}
-
-	public void writeXML() throws TransformerException, FileNotFoundException {
-		TransformerFactory transformerFactory = TransformerFactory.newInstance();
-		Transformer transformer = transformerFactory.newTransformer();
-		transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-		DOMSource source = new DOMSource(doc);
-		StreamResult result = new StreamResult(new FileOutputStream(xmlFilename));
-		transformer.transform(source, result);
-	}
-
-	/**
-	 * Main method
-	 * 
-	 * @param args
-	 *            XML filename
-	 *            Props filename (optional)
-	 * @throws IOException
-	 * @throws SAXException
-	 * @throws ParserConfigurationException
-	 * @throws TransformerException
-	 */
-	public static void main(String[] args) throws ParserConfigurationException, SAXException,
-			IOException, TransformerException {
-
-		if (args.length < 1) {
-			usage();
-			System.exit(0);
-		}
-		
-		String xmlFilename = args[0];
-		String propFilename = null;
-		
-		if(args.length == 2) {
-			propFilename = args[1];
-		}
-
-		ExtractStrings e = new ExtractStrings();
-		e.parseXML(xmlFilename, propFilename);
-		e.extract();
-		e.writeProp();
-		e.writeXML();
-		System.out.println("Strings extracted successfully for " + args[0]);
-	}
-
-	private static void usage() {
-		System.out.println("XML filename argument missing.\n");
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/HttpUtils.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/HttpUtils.java
deleted file mode 100644
index 3307b8ba3..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/HttpUtils.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-/**
- * @author Aurelien Ribon | http://www.aurelienribon.com/
- */
-public class HttpUtils {
-	public static DownloadTask downloadAsync(URL input, OutputStream output, Callback callback) {
-		final DownloadTask task = new DownloadTask(input, output, callback);
-
-		new Thread(new Runnable() {
-			@Override public void run() {
-				task.download();
-			}
-		}).start();
-
-		return task;
-	}
-
-	public static interface Callback {
-		public void completed();
-		public void canceled();
-		public void error(IOException ex);
-		public void updated(int length, int totalLength);
-	}
-
-	public static class DownloadTask {
-		private final URL input;
-		private final OutputStream output;
-		private final Callback callback;
-		private boolean run = true;
-
-		public DownloadTask(URL input, OutputStream output, Callback callback) {
-			this.input = input;
-			this.output = output;
-			this.callback = callback;
-		}
-
-		public void stop() {
-			run = false;
-		}
-
-		public URL getInput() {
-			return input;
-		}
-
-		public OutputStream getOutput() {
-			return output;
-		}
-
-		public Callback getCallback() {
-			return callback;
-		}
-
-		private void download() {
-			OutputStream os = null;
-			InputStream is = null;
-			IOException ex = null;
-
-			try {
-				HttpURLConnection connection = (HttpURLConnection) input.openConnection();
-				connection.setDoInput(true);
-				connection.setDoOutput(false);
-				connection.setUseCaches(true);
-				connection.setConnectTimeout(3000);
-				connection.connect();
-
-				is = new BufferedInputStream(connection.getInputStream(), 4096);
-				os = output;
-
-				byte[] data = new byte[4096];
-				int length = connection.getContentLength();
-				int total = 0;
-
-				int count;
-				while (run && (count = is.read(data)) != -1) {
-					total += count;
-					os.write(data, 0, count);
-					if (callback != null) callback.updated(total, length);
-				}
-
-			} catch (IOException ex1) {
-				ex = ex1;
-
-			} finally {
-				if (os != null) try {os.flush(); os.close();} catch (IOException ex1) {}
-				if (is != null) try {is.close();} catch (IOException ex1) {}
-
-				if (callback != null) {
-					if (ex != null) callback.error(ex);
-					else if (run == true) callback.completed();
-					else callback.canceled();
-				}
-			}
-		}
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/ImageUtils.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/ImageUtils.java
deleted file mode 100644
index b7d2dcd43..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/ImageUtils.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
-
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-
-import javax.imageio.ImageIO;
-import javax.swing.ImageIcon;
-
-public class ImageUtils {
-
-	public static ImageIcon getImageIcon(URL u, int w) throws IOException {
-		BufferedImage img = null;
-		BufferedImage tmp = ImageIO.read(u);
-		ImageIcon icon = null;
-
-		if (tmp != null) {
-			float h = (float) tmp.getHeight() * (float) w / (float) tmp.getWidth();
-
-			img = scaleImage(w, (int) h, tmp);
-			icon = new ImageIcon((Image) img);
-		}
-
-		return icon;
-	}
-
-	public static BufferedImage scaleImage(int w, int h, BufferedImage img) {
-		BufferedImage bi;
-		bi = new BufferedImage(w, h, BufferedImage.TRANSLUCENT);
-		Graphics2D g2d = (Graphics2D) bi.createGraphics();
-//		g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-//		g2d.addRenderingHints(new RenderingHints(RenderingHints.KEY_RENDERING,
-//				RenderingHints.VALUE_RENDER_QUALITY));
-		
-		g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
-                RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-		g2d.drawImage(img, 0, 0, w, h, null);
-		g2d.dispose();
-		return bi;
-	}
-	
-	public static void scaleImageFile(File org, File dest, float scale) throws IOException {
-		BufferedImage destImg = null;
-		BufferedImage orgImg = ImageIO.read(org);
-
-		if (orgImg != null) {
-			destImg = scaleImage((int)(orgImg.getWidth() * scale), (int)(orgImg.getHeight() * scale), orgImg);
-			ImageIO.write(destImg, org.getName().substring(org.getName().lastIndexOf('.') + 1), dest);
-		}	
-	}
-	
-	public static void scaleDirFiles(File orgDir, File destDir, float scale) throws IOException {
-		File[] files = orgDir.listFiles(new FilenameFilter() {
-			
-			@Override
-			public boolean accept(File dir, String name) {
-				if(name.toLowerCase().endsWith("png")||
-						name.toLowerCase().endsWith("jpg")||
-						name.toLowerCase().endsWith("etc1")) return true;
-				
-				return false;
-			}
-		});
-		
-		for(File f:files) {					
-			ImageUtils.scaleImageFile(f, new File(destDir, f.getName()), scale);
-		}		
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/Message.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/Message.java
deleted file mode 100644
index bf9b998c7..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/Message.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
-
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
-import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
-
-import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
-import com.badlogic.gdx.math.Interpolation;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.actions.Actions;
-import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.badlogic.gdx.scenes.scene2d.utils.Align;
-
-public class Message extends Label {
-	static public float fadeDuration = 0.4f;
-	boolean isModal = false;
-
-	public Message(Skin skin) {
-		super("", skin, "message");
-		
-		setWrap(true);
-		setAlignment(Align.center, Align.center);
-	}
-	
-	public void show (Stage stage, String text) {
-		show(stage, text, false);
-	}
-	
-	public void show (Stage stage, String text, boolean modal) {
-		isModal = modal;
-		
-		if(text == null) {
-			hide();
-			return;
-		}
-
-		add(stage, text);
-		
-		if (fadeDuration > 0) {
-			getColor().a = 0;
-			addAction(Actions.fadeIn(fadeDuration, Interpolation.fade));
-		}
-	}
-	
-	private void add(Stage stage, String text) {
-		clearActions();
-		
-		setText(text);
-		
-		TextBounds bounds2 = getStyle().font.getWrappedBounds(text, stage.getWidth() * .8f);
-		
-		setSize(bounds2.width + bounds2.height, bounds2.height  + bounds2.height * 2);
-
-		stage.addActor(this);
-		setPosition(Math.round((stage.getWidth() - getWidth()) / 2), Math.round((stage.getHeight() - getHeight()) / 2));
-		invalidate();		
-	}
-	
-	@Override
-	public Actor hit(float x, float y, boolean touchable) {
-		if(isModal)
-			return this;
-		
-		return null;
-	}
-	
-	public void show (Stage stage, String text, float duration) {
-		isModal = false;
-		
-		if(text == null) {
-			hide();
-			return;
-		}
-		
-		add(stage, text);
-		
-		if (fadeDuration > 0) {
-			getColor().a = 0;
-			addAction(sequence(Actions.fadeIn(fadeDuration, Interpolation.fade), 
-					Actions.delay(duration, sequence(fadeOut(fadeDuration, Interpolation.fade), Actions.removeActor()))));
-		}
-	}
-
-	public void hide () {
-		isModal = false;
-		setText("");
-		
-		if (fadeDuration > 0) {
-			addAction(sequence(fadeOut(fadeDuration, Interpolation.fade), Actions.removeActor()));
-		} else
-			remove();
-	}	
-
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/RunProccess.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/RunProccess.java
deleted file mode 100644
index 9936d271d..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/RunProccess.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * Run Java Process in a new VM
- * 
- * @author rgarcia
- */
-public class RunProccess {
-	private static final String ANT_MAIN_CLASS = "org.apache.tools.ant.launch.Launcher";
-
-	private static String getClasspath(List<String> classpathEntries) {
-		StringBuilder builder = new StringBuilder();
-		int count = 0;
-		final int totalSize = classpathEntries.size();
-		for (String classpathEntry : classpathEntries) {
-			builder.append(classpathEntry);
-			count++;
-			if (count < totalSize) {
-				builder.append(System.getProperty("path.separator"));
-			}
-		}
-		return builder.toString();
-	}
-	
-	public static boolean runBladeEngine(File prjFolder, String chapter, String scene) throws IOException {
-		String args = ":desktop:run -PappArgs=[\"-w\"";
-		
-		if(chapter != null) {
-			args += ",\"-chapter\",\"" + chapter + "\"";
-		}
-		
-		if(scene != null) {
-			args += ",\"-t\",\"" + scene + "\"";
-		}
-		
-		args += "]";
-		
-		return runGradle(prjFolder, args);
-	}
-	
-	public static void runAnt(String buildFile, String target, String distDir, String projectDir, Properties props) throws IOException {
-		String packageFilesDir = "package-files/";
-		
-		if(!new File(packageFilesDir).exists()) {
-			EditorLogger.error("package-files folder not found. Searching folder for IDE mode.");
-			
-			packageFilesDir = "src/dist/package-files/";
-			if(!new File(packageFilesDir).exists()) {
-				EditorLogger.error(new File(packageFilesDir).getAbsolutePath() + " folder not found in IDE mode.");
-				return;
-			}
-		}
-		
-		
-		List<String> args = new ArrayList<String>();
-		args.add("-f");
-		args.add(packageFilesDir + buildFile);
-		args.add("-Dproject=" + projectDir);
-		args.add("-Ddist=" + distDir);
-		
-		StringBuilder sb = new StringBuilder();
-		
-		for(Object key:props.keySet()) {	
-			sb.setLength(0);
-			sb.append("-D").append(key).append("=").append(props.get(key));
-			args.add(sb.toString());
-		}
-		
-		args.add(target);
-		
-		List<String> cp = new ArrayList<String>();
-//		cp.add(System.getProperty("java.class.path") );
-		cp.add(packageFilesDir + "ant.jar");
-		cp.add(packageFilesDir + "ant-launcher.jar");
-		
-		Process p = runJavaProccess(ANT_MAIN_CLASS, cp, args);
-		
-		try {
-			p.waitFor();
-			EditorLogger.debug("ANT EXIT VALUE: " + p.exitValue());
-			
-			if(p.exitValue() == 1) {
-				throw new IOException("ERROR IN ANT PROCCESS");
-			}
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public static Process runJavaProccess(String mainClass, List<String> classpathEntries, List<String> args) throws IOException {
-		String javaRT = System.getProperty("java.home") + "/bin/java";
-		String workingDirectory = ".";
-		
-		
-		List<String> argumentsList = new ArrayList<String>();
-		argumentsList.add(javaRT);
-		
-		if(classpathEntries!=null && classpathEntries.size() > 0) {
-			argumentsList.add("-classpath");
-			argumentsList.add(getClasspath(classpathEntries));
-		}
-		
-		argumentsList.add(mainClass);
-		
-		if(args != null)
-			argumentsList.addAll(args);
-
-		ProcessBuilder processBuilder = new ProcessBuilder(
-				argumentsList.toArray(new String[argumentsList.size()]));
-//		processBuilder.redirectErrorStream(true);
-		processBuilder.directory(new File(workingDirectory));
-		processBuilder.inheritIO();
-		
-		return processBuilder.start();
-	}
-	
-	public static boolean runGradle(File workingDir, String parameters) {
-		String exec = workingDir.getAbsolutePath() + "/" + (System.getProperty("os.name").contains("Windows") ?  "gradlew.bat": "gradlew");
-		String command = exec + " " + parameters;
-		
-		EditorLogger.debug("Executing '" + command + "'");
-		
-		try {
-			final ProcessBuilder pb = new ProcessBuilder(command.split(" ")).directory(workingDir);
-			
-			// TODO: READ OUTPUT FROM pb AND print in output stream			
-			if(System.console() != null)
-				pb.inheritIO();
-			
-			final Process process = pb.start();
-			
-			process.waitFor();			
-			return process.exitValue() == 0;
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-	}	
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/Versions.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/Versions.java
deleted file mode 100644
index 0c272e975..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/Versions.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
-
-import java.io.InputStream;
-import java.util.Properties;
-
-public class Versions {
-	private static final String VERSION_PROP="version";
-	private static final String LIBGDX_VERSION_PROP="libgdxVersion";
-	private static final String ROBOVM_VERSION_PROP="roboVMVersion";
-	private static final String BUILDTOOLS_VERSION_PROP="buildToolsVersion";
-	private static final String ANDROID_API_LEVEL_PROP="androidAPILevel";
-	private static final String GWT_VERSION_PROP = "gwtVersion";
-	
-	public static final String PROPERTIES_FILENAME = "/versions.properties";
-
-	private static Properties config = null;
-	
-	private static String getProperty(String key, String defaultValue) {
-		if(config == null) {
-			config = new Properties();
-			
-			try {
-				InputStream is = Versions.class.getResourceAsStream(PROPERTIES_FILENAME);
-				config.load(is);
-			} catch (Exception e) {
-				EditorLogger.error("ERROR LOADING VERSION FILE: " + e.getMessage());
-			}
-		}
-		
-		return config.getProperty(key, defaultValue);
-	}
-	
-	public static String getVersion() {
-		return getProperty(VERSION_PROP,null);
-	}
-	
-	public static String getLibgdxVersion() {
-		return getProperty(LIBGDX_VERSION_PROP,null);
-	}
-	
-	public static String getRoboVMVersion() {
-		return getProperty(ROBOVM_VERSION_PROP,null);
-	}
-	
-	public static String getBuildToolsVersion() {
-		return getProperty(BUILDTOOLS_VERSION_PROP,null);
-	}
-	
-	public static String getAndroidAPILevel() {
-		return getProperty(ANDROID_API_LEVEL_PROP,null);
-	}
-	
-	public static String getGwtVersion() {
-		return getProperty(GWT_VERSION_PROP,null);
-	}
-	
-	public static void setBuildToolsVersion(String v) {
-		config.setProperty(BUILDTOOLS_VERSION_PROP, v);
-	}
-	
-	public static void setAndroidAPILevel(String v) {
-		config.setProperty(ANDROID_API_LEVEL_PROP, v);
-	}
-}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/ZipUtils.java b/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/ZipUtils.java
deleted file mode 100644
index ef98ed49f..000000000
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/ZipUtils.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.zip.Deflater;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipOutputStream;
-
-public class ZipUtils {
-	// 4MB buffer
-	private static final byte[] BUFFER = new byte[4096 * 1024];
-
-	// copy input to output stream
-	private static void copy(InputStream input, OutputStream output) throws IOException {
-		int bytesRead;
-		while ((bytesRead = input.read(BUFFER)) != -1) {
-			output.write(BUFFER, 0, bytesRead);
-		}
-	}
-
-	public static void mergeZIPs(String f[], String dest) throws Exception {
-		// Needed to avoid appending repeated entries.
-		HashMap<String, String> destEntries = new HashMap<String, String>();
-
-		// read the org zips
-		ZipFile fZip[] = new ZipFile[f.length];
-
-		for (int i = 0; i < fZip.length; i++)
-			fZip[i] = new ZipFile(f[i]);
-
-		// write the dest zip
-		ZipOutputStream destZip = new ZipOutputStream(new FileOutputStream(dest));
-
-		// copy contents from f zip to the dest zip
-
-		for (ZipFile z : fZip) {
-			Enumeration<? extends ZipEntry> entries = z.entries();
-			while (entries.hasMoreElements()) {
-				ZipEntry e = entries.nextElement();
-
-				String name = e.getName();
-				if (destEntries.get(name) == null) {
-					destEntries.put(name, name);
-					EditorLogger.debug("copy: " + e.getName());
-					destZip.putNextEntry(e);
-					EditorLogger.debug("putnextEntry done");
-					if (!e.isDirectory()) {
-						copy(z.getInputStream(e), destZip);
-					}
-					destZip.closeEntry();
-				}
-			}
-		}
-
-		EditorLogger.debug("appending done ");
-
-		// close
-		for (ZipFile z : fZip) {
-			z.close();
-		}
-
-		destZip.close();
-	}
-
-	public static void packZip(List<File> sources, File output) throws IOException {
-		EditorLogger.debug("Packaging to " + output.getName());
-		ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(output));
-		zipOut.setLevel(Deflater.DEFAULT_COMPRESSION);
-
-		for (File source : sources) {
-			if (source.isDirectory()) {
-				zipDir(zipOut, "", source);
-			} else {
-				zipFile(zipOut, "", source);
-			}
-		}
-		zipOut.flush();
-		zipOut.close();
-		EditorLogger.debug("Done");
-	}
-
-	private static String buildPath(String path, String file) {
-		if (path == null || path.isEmpty()) {
-			return file;
-		} else {
-			return path + "/" + file;
-		}
-	}
-
-	private static void zipDir(ZipOutputStream zos, String path, File dir) throws IOException {
-		if (!dir.canRead()) {
-			EditorLogger.error("Cannot read " + dir.getCanonicalPath()
-					+ " (maybe because of permissions)");
-			return;
-		}
-
-		File[] files = dir.listFiles();
-		path = buildPath(path, dir.getName());
-		EditorLogger.debug("Adding Directory " + path);
-
-		for (File source : files) {
-			if (source.isDirectory()) {
-				zipDir(zos, path, source);
-			} else {
-				zipFile(zos, path, source);
-			}
-		}
-
-		EditorLogger.debug("Leaving Directory " + path);
-	}
-
-	private static void zipFile(ZipOutputStream zos, String path, File file) throws IOException {
-		if (!file.canRead()) {
-			EditorLogger.error("Cannot read " + file.getCanonicalPath()
-					+ " (maybe because of permissions)");
-			return;
-		}
-
-		EditorLogger.debug("Compressing " + file.getName());
-		zos.putNextEntry(new ZipEntry(buildPath(path, file.getName())));
-
-		FileInputStream fis = new FileInputStream(file);
-
-		byte[] buffer = new byte[4092];
-		int byteCount = 0;
-		while ((byteCount = fis.read(buffer)) != -1) {
-			zos.write(buffer, 0, byteCount);
-		}
-
-		fis.close();
-		zos.closeEntry();
-	}
-}
diff --git a/adventure-composer/src/main/resources/images/icons.png b/adventure-composer/src/main/resources/images/icons.png
deleted file mode 100644
index dddde0db4..000000000
Binary files a/adventure-composer/src/main/resources/images/icons.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/AndroidManifest.xml b/adventure-composer/src/main/resources/projectTmpl/android/AndroidManifest.xml
deleted file mode 100644
index 0621ea55f..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="%PACKAGE%.android"
-    android:versionCode="1"
-    android:versionName="1.0" >
-    
-   <uses-sdk android:minSdkVersion="13"
-			android:targetSdkVersion="%API_LEVEL%" />
-        
-    <uses-feature android:glEsVersion="0x00020000"
-			android:required="true" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/GdxTheme" >
-        <activity
-            android:name="%PACKAGE%.android.AndroidLauncher"
-            android:label="@string/app_name" 
-            android:screenOrientation="landscape"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/BladeEngine.properties b/adventure-composer/src/main/resources/projectTmpl/android/assets/BladeEngine.properties
deleted file mode 100644
index 0f2fc9068..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/assets/BladeEngine.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-title=Blade Engine Adventure
-pie_mode.desktop=false
-inventory_pos=down
-debug=false
-#load_gamestate=
-#play_recording=full
-#force_res=1920
-
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/model/00.chapter b/adventure-composer/src/main/resources/projectTmpl/android/assets/model/00.chapter
deleted file mode 100644
index b2a095c45..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/assets/model/00.chapter
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<chapter id="00">
-</chapter>
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/model/world.properties b/adventure-composer/src/main/resources/projectTmpl/android/assets/model/world.properties
deleted file mode 100644
index b1c67c358..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/assets/model/world.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#world.xml
-#Fri Sep 20 11:21:23 CEST 2013
-default.use.0.text=I don't know what to do with that
-default.lookat.0.text=Nothing interesting here
-default.pickup.0.text=I can not take that
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/model/world.xml b/adventure-composer/src/main/resources/projectTmpl/android/assets/model/world.xml
deleted file mode 100644
index e8bbada8b..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/assets/model/world.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<world height="1080" width="1920" init_chapter="00">
-
-	<!-- *********************** DEFAULT VERBS ************************ -->
-	<verb id="lookat">
-		<action action_name="Lookat" text="@default.lookat.0.text" />
-	</verb>
-
-	<verb id="pickup">
-		<action action_name="Lookat" text="@default.pickup.0.text" />
-	</verb>
-
-	<verb id="use">
-		<action action_name="Say" text="@default.use.0.text" wait="false" />
-	</verb>
-
-	<verb id="dialog">
-		<action action_name="Cutmode" inventory="false" value="true" />
-		<action action_name="SayDialog" />
-		<action action_name="Cutmode" inventory="true" value="false" />
-	</verb>
-</world>
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/model/world_es.properties b/adventure-composer/src/main/resources/projectTmpl/android/assets/model/world_es.properties
deleted file mode 100644
index 18ee3faf1..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/assets/model/world_es.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 29 15:12:39 CEST 2013
-default.use.0.text=No se que hacer con esto
-default.lookat.0.text=Nada interesante
-default.pickup.0.text=No puedo coger eso
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpDesktop.png b/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpDesktop.png
deleted file mode 100644
index fd127d022..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpDesktop.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpDesktop_es.png b/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpDesktop_es.png
deleted file mode 100644
index bfc107447..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpDesktop_es.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpPie.png b/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpPie.png
deleted file mode 100644
index a59cca9c5..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpPie.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpPie_es.png b/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpPie_es.png
deleted file mode 100644
index 2e4e38e29..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/helpPie_es.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/ui.atlas b/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/ui.atlas
deleted file mode 100644
index 24a4ed80d..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/ui.atlas
+++ /dev/null
@@ -1,191 +0,0 @@
-
-ui.png
-size: 1005,1005
-format: RGBA8888
-filter: MipMapLinearNearest,Nearest
-repeat: none
-back
-  rotate: false
-  xy: 349, 770
-  size: 235, 235
-  orig: 235, 235
-  offset: 0, 0
-  index: -1
-border_black_rect4
-  rotate: false
-  xy: 955, 596
-  size: 31, 31
-  split: 5, 5, 5, 4
-  orig: 31, 31
-  offset: 0, 0
-  index: -1
-border_rect2
-  rotate: false
-  xy: 955, 631
-  size: 32, 32
-  split: 2, 2, 2, 2
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-border_rect4
-  rotate: false
-  xy: 800, 108
-  size: 32, 32
-  split: 4, 4, 5, 5
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-bubblepointer
-  rotate: false
-  xy: 800, 144
-  size: 79, 51
-  orig: 79, 51
-  offset: 0, 0
-  index: -1
-circle
-  rotate: false
-  xy: 648, 47
-  size: 148, 148
-  orig: 148, 148
-  offset: 0, 0
-  index: -1
-circle_border
-  rotate: false
-  xy: 4, 347
-  size: 312, 312
-  orig: 312, 312
-  offset: 0, 0
-  index: -1
-circle_button
-  rotate: false
-  xy: 4, 663
-  size: 341, 342
-  orig: 341, 342
-  offset: 0, 0
-  index: -1
-config
-  rotate: false
-  xy: 529, 327
-  size: 200, 200
-  orig: 200, 200
-  offset: 0, 0
-  index: -1
-credits
-  rotate: false
-  xy: 4, 108
-  size: 235, 235
-  orig: 235, 235
-  offset: 0, 0
-  index: -1
-help
-  rotate: false
-  xy: 588, 770
-  size: 235, 235
-  orig: 235, 235
-  offset: 0, 0
-  index: -1
-hotspotpointer
-  rotate: false
-  xy: 320, 322
-  size: 205, 205
-  orig: 205, 205
-  offset: 0, 0
-  index: -1
-inventory
-  rotate: false
-  xy: 827, 834
-  size: 171, 171
-  orig: 171, 171
-  offset: 0, 0
-  index: -1
-inventory_plain
-  rotate: false
-  xy: 169, 7
-  size: 136, 97
-  orig: 136, 97
-  offset: 0, 0
-  index: -1
-leave
-  rotate: false
-  xy: 648, 199
-  size: 197, 124
-  orig: 197, 124
-  offset: 0, 0
-  index: -1
-left
-  rotate: false
-  xy: 243, 118
-  size: 200, 200
-  orig: 200, 200
-  offset: 0, 0
-  index: -1
-lookat
-  rotate: false
-  xy: 4, 4
-  size: 161, 100
-  orig: 161, 100
-  offset: 0, 0
-  index: -1
-menu
-  rotate: false
-  xy: 827, 667
-  size: 163, 163
-  orig: 163, 163
-  offset: 0, 0
-  index: -1
-pickup
-  rotate: false
-  xy: 849, 207
-  size: 103, 116
-  orig: 103, 116
-  offset: 0, 0
-  index: -1
-pie
-  rotate: false
-  xy: 447, 121
-  size: 197, 197
-  orig: 197, 197
-  offset: 0, 0
-  index: -1
-pointer
-  rotate: false
-  xy: 827, 540
-  size: 124, 123
-  orig: 124, 123
-  offset: 0, 0
-  index: -1
-quit
-  rotate: false
-  xy: 349, 531
-  size: 235, 235
-  orig: 235, 235
-  offset: 0, 0
-  index: -1
-reload
-  rotate: false
-  xy: 588, 531
-  size: 235, 235
-  orig: 235, 235
-  offset: 0, 0
-  index: -1
-right
-  rotate: false
-  xy: 733, 327
-  size: 200, 200
-  orig: 200, 200
-  offset: 0, 0
-  index: -1
-talkto
-  rotate: false
-  xy: 309, 10
-  size: 125, 104
-  orig: 125, 104
-  offset: 0, 0
-  index: -1
-white_pixel
-  rotate: false
-  xy: 1002, 1002
-  size: 3, 3
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/ui.png b/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/ui.png
deleted file mode 100644
index da1ddb528..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/ui.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/ArchitectsDaughter_fix.ttf b/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/ArchitectsDaughter_fix.ttf
deleted file mode 100644
index 52db80429..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/ArchitectsDaughter_fix.ttf and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/credits.txt b/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/credits.txt
deleted file mode 100644
index 80967556d..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/credits.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-t#SCRIPT
-RAFAEL GARCÍA
-t#CHAPTER DESIGN
-ALMUDENA CASTILLEJO
-RAFAEL GARCÍA
-t#BACKGROUNDS
-ALMUDENA CASTILLEJO
-RAFAEL GARCÍA
-t#PROGRAMMING
-RAFAEL GARCÍA
-t#MUSIC
-Moonlight Sonata Op. 27 No. 2 Moonlight Sonata 
-Performed by Paul Pitman - musopen.org
-t#SOUND FX
-freesound.org
-s#120
-i#libgdx_logo.png
-s#250
-i#blade_logo.png
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/ui.json b/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/ui.json
deleted file mode 100644
index 9f8131298..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/ui.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-com.badlogic.gdx.graphics.g2d.BitmapFont: {
-		default: {file: Roboto-Regular.ttf, size: 20},
-		debug: {file: Roboto-Regular.ttf, size: 15}, 
-		big-font: {file: Roboto-Black.ttf, size: 35},
-		title-font: {file: Roboto-Black.ttf, size: 60},
-		dialog-font: {file: ArchitectsDaughter_fix.ttf, size: 20},
-		text-manager-font: {file: ArchitectsDaughter_fix.ttf, size: 18},
-		desc: {file: Ubuntu-M.ttf, size: 16},
-		credits-title: {file: Ubuntu-M.ttf, size: 20},
-		credits: {file: Ubuntu-M.ttf, size: 30}
-	},
-com.badlogic.gdx.graphics.Color: {
-	green: { a: 1, b: 0, g: 1, r: 0 },
-	white: { a: 1, b: 1, g: 1, r: 1 },
-	red: { a: 1, b: 0, g: 0, r: 1 },
-	black: { a: 1, b: 0, g: 0, r: 0 },
-	dark-grey: { a: 1, b: 0.25, g: 0.25, r: 0.25 },
-	light-grey: { a: 1, b: 0.75, g: 0.75, r: 0.75 },
-	grey: { a: 1, b: 0.5, g: 0.5, r: 0.5 },
-	text-dark: { a: 1, b: 1, g: 1, r: 1 },
-	indigo: { r: 0.24, g: 0.31, b: 0.70, a: 1 },
-	indigo-light:  { r: 0.50, g: 0.55, b: 0.82, a: 1 },
-	red500: { r: 0.90, g: 0.11, b: 0.13, a: 1 },
-	red-dark: { r: 0.71, g: 0.04, b: 0.06, a: 1 },
-	red-light:  { r: 0.99, g: 0.45, b: 0.47, a: 1 },
-	black-trans:  { r: 0.1, g: 0.1, b: 0.1, a: 0.7 }
-},
-com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
-	black08: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 0.8 } },
-	white: { name: white_pixel, color: white },
-	grey: { name: white_pixel, color: grey},
-	dark-grey: { name: white_pixel, color: dark-grey},
-	red: { name: white_pixel, color: { r: 0.5, g: 0, b: 0, a: 1 }},
-	circle: { name: circle_button, color: red-dark},
-	circle-light: { name: circle_button, color: red500},
-	circle-border: { name: circle_border, color: black-trans},
-	circle-border-light: { name: circle_border, color: light-grey},	
-	border-rect-grey: { name: border_rect4, color: light-grey},
-	border-rect-dark-grey: { name: border_rect2, color: { a: 1, b: 0.6, g: 0.6, r: 0.6 }},
-},
-com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: {
-	pie_lookat: {up:circle-border, down: circle-border-light, imageUp: lookat},
-	pie_pickup: {up:circle-border, down: circle-border-light, imageUp: pickup},
-	pie_talkto: {up:circle-border, down: circle-border-light, imageUp: talkto},
-	inventory: {up:inventory},
-	menu: {up:circle, down: circle-light, imageUp: menu}
-},
-com.bladecoder.engine.ui.InventoryUI$InventoryUIStyle: {
-	default: {background: border-rect-grey, itemBackground: border-rect-dark-grey, menuButtonStyle: menu}
-},
-com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
-		default: { font: default, up: grey, fontColor: white , downFontColor: grey, overFontColor: light-grey, disabledFontColor: dark-grey},
-		menu: { font: big-font, fontColor: white , downFontColor: grey, overFontColor: light-grey, disabledFontColor: dark-grey}		
-},
-com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
-		default: { font: default, fontColor: white},
-		title: { font: title-font, fontColor: white},
-},
-
-com.bladecoder.engine.ui.DialogUI$DialogUIStyle: {
-	default: {background: black08, font: dialog-font, fontColor: white, overFontColor: light-grey}
-},
-
-com.bladecoder.engine.ui.TextManagerUI$TextManagerUIStyle: {
-	default: {rectBackground: border_black_rect4, talkBackground: white, font: text-manager-font, talkBubble: bubblepointer}
-},
-com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
-		default: { selection: grey, background: dark-grey, focusedBackground: dark-grey, disabledBackground: grey, font: default, fontColor: white, focusedFontColor: text-dark, disabledFontColor: text-dark, cursor: white, messageFont: default, messageFontColor: text-dark }
-},
-com.badlogic.gdx.scenes.scene2d.ui.ScrollPane$ScrollPaneStyle: {
-		default: {vScroll: dark-grey, hScrollKnob: dark-grey, background: grey, hScroll: dark-grey, vScrollKnob: dark-grey, corner: grey},
-		opaque: { vScroll: dark-grey, hScrollKnob: dark-grey, background: grey, hScroll: dark-grey, vScrollKnob: dark-grey, corner: grey}
-	},
-com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle: {
-		default: { fontColorUnselected: text-dark, selection: grey, fontColorSelected: text-dark, font: default },
-		opaque: { fontColorUnselected: text-dark, selection: grey, fontColorSelected: text-dark, font: default }
-	},
-
-com.badlogic.gdx.scenes.scene2d.ui.SelectBox$SelectBoxStyle: {
-	default: { background: dark-grey, backgroundOver: dark-grey, backgroundOpen: dark-grey, listStyle: default, scrollStyle: opaque, font: default, fontColor: white },
-}	
-}
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/build.gradle b/adventure-composer/src/main/resources/projectTmpl/android/build.gradle
deleted file mode 100644
index 62dc8352f..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/build.gradle
+++ /dev/null
@@ -1,138 +0,0 @@
-android {
-    buildToolsVersion "%BUILD_TOOLS_VERSION%"
-    compileSdkVersion %API_LEVEL%
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-
-        instrumentTest.setRoot('tests')
-        
-        if(project.hasProperty('keystore')) {   
-          signingConfigs {
-            release {
-            storeFile file(project.keystore)
-            storePassword project.storePassword
-            keyAlias project.alias
-            keyPassword project.keyPassword
-            }
-          }
-    
-          buildTypes {
-           release {
-            signingConfig signingConfigs.release
-           }
-         }
-       }
-    }
-}
-
-// needed to add JNI shared libraries to APK when compiling on CLI
-tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask ->
-    pkgTask.jniFolders = new HashSet<File>()
-    pkgTask.jniFolders.add(new File(projectDir, 'libs'))
-}
-
-// called every time gradle gets executed, takes the native dependencies of
-// the natives configuration, and extracts them to the proper libs/ folders
-// so they get packed with the APK.
-task copyAndroidNatives() { 
-    file("libs/armeabi/").mkdirs();
-    file("libs/armeabi-v7a/").mkdirs();
-    file("libs/x86/").mkdirs();
-
-    configurations.natives.files.each { jar ->
-        def outputDir = null
-        if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
-        if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
-        if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
-        if(outputDir != null) {
-            copy {
-                from zipTree(jar)
-                into outputDir
-                include "*.so"
-            }
-        }
-    }
-}
-
-task run(type: Exec) {
-    def path
-    def localProperties = project.file("../local.properties")
-    if (localProperties.exists()) {
-        Properties properties = new Properties()
-        localProperties.withInputStream { instr ->
-            properties.load(instr)
-        }
-        def sdkDir = properties.getProperty('sdk.dir')
-        if (sdkDir) {
-            path = sdkDir
-        } else {
-            path = "$System.env.ANDROID_HOME"
-        }
-    } else {
-        path = "$System.env.ANDROID_HOME"
-    }
-
-    def adb = path + "/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', '%PACKAGE%.android/%PACKAGE%.android.AndroidLauncher'
-}
-
-// sets up the Android Eclipse project, using the old Ant based build.
-eclipse {
-    // need to specify Java source sets explicitely, SpringSource Gradle Eclipse plugin
-    // ignores any nodes added in classpath.file.withXml
-    sourceSets {
-        main {
-            java.srcDirs "src", 'gen'
-        }
-    }
-
-    jdt {
-        sourceCompatibility = 1.6
-        targetCompatibility = 1.6
-    }
-
-    classpath {
-        plusConfigurations += [ project.configurations.compile ]        
-        containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES'       
-    }
-
-    project {
-        name = appName + "-android"
-        natures 'com.android.ide.eclipse.adt.AndroidNature'
-        buildCommands.clear();
-        buildCommand "com.android.ide.eclipse.adt.ResourceManagerBuilder"
-        buildCommand "com.android.ide.eclipse.adt.PreCompilerBuilder"
-        buildCommand "org.eclipse.jdt.core.javabuilder"
-        buildCommand "com.android.ide.eclipse.adt.ApkBuilder"
-    }
-}
-
-// sets up the Android Idea project, using the old Ant based build.
-idea {
-    module {
-        sourceDirs += file("src");
-        scopes = [ COMPILE: [plus:[project.configurations.compile]]]        
-
-        iml {
-            withXml {
-                def node = it.asNode()
-                def builder = NodeBuilder.newInstance();
-                builder.current = node;
-                builder.component(name: "FacetManager") {
-                    facet(type: "android", name: "Android") {
-                        configuration {
-                            option(name: "UPDATE_PROPERTY_FILES", value:"true")
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/ic_launcher-web.png b/adventure-composer/src/main/resources/projectTmpl/android/ic_launcher-web.png
deleted file mode 100644
index c863b75be..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/ic_launcher-web.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/project.properties b/adventure-composer/src/main/resources/projectTmpl/android/project.properties
deleted file mode 100644
index 4ab125693..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-19
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-hdpi/ic_launcher.png b/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 09d798646..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-mdpi/ic_launcher.png b/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index df54068b0..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-xhdpi/ic_launcher.png b/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 1c24992c7..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-xxhdpi/ic_launcher.png b/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 055c737ad..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/android/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/src/AndroidLauncher b/adventure-composer/src/main/resources/projectTmpl/android/src/AndroidLauncher
deleted file mode 100644
index 0513e8d62..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/android/src/AndroidLauncher
+++ /dev/null
@@ -1,25 +0,0 @@
-package %PACKAGE%.android;
-
-import com.bladecoder.engine.BladeEngine;
-
-import android.os.Bundle; 
-import android.view.WindowManager;
-
-import com.badlogic.gdx.backends.android.AndroidApplication;
-import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
-
-public class AndroidLauncher extends AndroidApplication {
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();
-        cfg.useAccelerometer = false;
-        cfg.useCompass = false;
-        cfg.numSamples = 2;
-        
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        
-        initialize(new BladeEngine(), cfg);
-    }
-}
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/core/build.gradle b/adventure-composer/src/main/resources/projectTmpl/core/build.gradle
deleted file mode 100644
index 03cd1bea2..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/core/build.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-apply plugin: "java"
-
-sourceCompatibility = 1.6
-[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-
-sourceSets.main.java.srcDirs = [ "src/" ]
-
-
-eclipse.project {
-    name = appName + "-core"
-}
diff --git a/adventure-composer/src/main/resources/projectTmpl/desktop/blade_engine.html b/adventure-composer/src/main/resources/projectTmpl/desktop/blade_engine.html
deleted file mode 100644
index 7d9ce5dbf..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/desktop/blade_engine.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  <head>
-    <title>BladeEngine</title>
-          <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-  <body>
-
-  <div id="applet_container">
-  <applet code="org.lwjgl.util.applet.AppletLoader" archive="lwjgl_util_applet.jar" codebase="." width="960" height="540">
-  
-    <param name="al_title" value="BladeEngine">
-    <param name="al_main" value="com.bladecoder.engine.desktop.Applet">
-    <param name="al_logo" value="icon128.png">
-<!--     <param name="al_progressbar" value="appletprogress.gif"> -->
-
-    <param name="al_bgcolor" value="000000">
-    <param name="al_fgcolor" value="ffffff">
-    
-    <param name="al_jars" value="BladeEngine.jar">
-
-    <param name="al_windows" value="">
-    <param name="al_linux" value="">
-    <param name="al_mac" value="">
-    <param name="al_solaris" value="">
-    
-    <param name="codebase_lookup" value="false">
-
-    <param name="java_arguments" value="-Dsun.java2d.noddraw=true -Dsun.awt.noerasebackground=true -Dsun.java2d.d3d=false -Dsun.java2d.opengl=false -Dsun.java2d.pmoffscreen=false -Xmx800M">
-   <param name="lwjgl_arguments" value="-Dorg.lwjgl.input.Mouse.allowNegativeMouseCoords=true">
-    <param name="separate_jvm" value="true">
-    <param name="codebase_lookup" value="false">
-  </applet>
-  </div>
-  
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/desktop/build.gradle b/adventure-composer/src/main/resources/projectTmpl/desktop/build.gradle
deleted file mode 100644
index 288fed43f..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/desktop/build.gradle
+++ /dev/null
@@ -1,53 +0,0 @@
-apply plugin: "java"
-
-sourceCompatibility = 1.6
-sourceSets.main.java.srcDirs = [ "src/" ]
-sourceSets.main.resources.srcDirs = [ "src/" ]
-
-project.ext.mainClassName = "%PACKAGE%.desktop.DesktopLauncher"
-project.ext.assetsDir = new File("../%ASSET_PATH%");
-
-task run(dependsOn: classes, type: JavaExec) {
-    main = project.mainClassName
-    classpath = sourceSets.main.runtimeClasspath
-    standardInput = System.in
-    workingDir = project.assetsDir
-    ignoreExitValue = true
-    
-    if (project.hasProperty("appArgs") ) {  
-        args Eval.me(appArgs)  
-    }     
-}
-
-task dist(type: Jar) {
-    baseName =  appName + "-desktop"
-    
-    from files(sourceSets.main.output.classesDir)
-    from files(sourceSets.main.output.resourcesDir)
-    from {configurations.compile.collect {zipTree(it)}}
-    from files(project.assetsDir);
- 
-    manifest {
-        attributes 'Main-Class': project.mainClassName
-    }
-}
-
-dist.dependsOn classes
-
-eclipse {
-    project {
-        name = appName + "-desktop"
-        linkedResource name: 'assets', type: '2', location: 'PARENT-1-PROJECT_LOC/%ASSET_PATH%'
-    }
-}
-
-task afterEclipseImport(description: "Post processing after project generation", group: "IDE") {
-  doLast {
-    def classpath = new XmlParser().parse(file(".classpath"))
-    new Node(classpath, "classpathentry", [ kind: 'src', path: 'assets' ]);
-    def writer = new FileWriter(file(".classpath"))
-    def printer = new XmlNodePrinter(new PrintWriter(writer))
-    printer.setPreserveWhitespace(true)
-    printer.print(classpath)
-  }
-}
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/desktop/src/Applet b/adventure-composer/src/main/resources/projectTmpl/desktop/src/Applet
deleted file mode 100644
index f03ddac43..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/desktop/src/Applet
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.bladecoder.engine.desktop;
-
-import com.bladecoder.engine.BladeEngine;
-
-import com.badlogic.gdx.backends.lwjgl.LwjglApplet;
-
-public class Applet extends LwjglApplet {
-	private static final long serialVersionUID = 1L;
-
-	public Applet() {
-		super(new BladeEngine());
-	}
-}
diff --git a/adventure-composer/src/main/resources/projectTmpl/desktop/src/DesktopLauncher b/adventure-composer/src/main/resources/projectTmpl/desktop/src/DesktopLauncher
deleted file mode 100644
index e38b66154..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/desktop/src/DesktopLauncher
+++ /dev/null
@@ -1,160 +0,0 @@
-package %PACKAGE%.desktop;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.IntBuffer;
-import java.util.Properties;
-
-import com.bladecoder.engine.BladeEngine;
-import com.bladecoder.engine.util.Config;
-import org.lwjgl.BufferUtils;
-import org.lwjgl.LWJGLException;
-import org.lwjgl.input.Cursor;
-import org.lwjgl.input.Mouse;
-
-import com.badlogic.gdx.Files.FileType;
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
-
-public class DesktopLauncher extends BladeEngine {
-
-	private boolean fullscreen = true;
-	private LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration();
-
-	DesktopLauncher() {
-		Properties p = new Properties();
-		
-		try {
-			InputStream s = DesktopLauncher.class.getResourceAsStream(Config.PROPERTIES_FILENAME);
-			if(s!=null)
-				p.load(s);
-		} catch (IOException e) {
-		}
-		
-		cfg.title = p.getProperty(Config.TITLE_PROP, "Blade Engine Adventure");
-//		cfg.useGL30 = true;
-
-		// cfg.width = World.getInstance().getWidth();
-		// cfg.height = World.getInstance().getHeight();
-
-		cfg.width = 1920 / 2;
-		cfg.height = 1080 / 2;
-
-		cfg.resizable = true;
-		cfg.samples = 2;
-	}
-
-	public void run() {
-		if(DesktopLauncher.class.getResource("/icons/icon128.png")!=null)
-			cfg.addIcon("icons/icon128.png", FileType.Internal);
-		
-		if(DesktopLauncher.class.getResource("/icons/icon32.png")!=null)
-			cfg.addIcon("icons/icon32.png", FileType.Internal);
-		
-		if(DesktopLauncher.class.getResource("/icons/icon16.png")!=null)
-			cfg.addIcon("icons/icon16.png", FileType.Internal);		
-		
-		new LwjglApplication(this, cfg);
-	}
-
-	public void parseParams(String[] args) {
-		for (int i = 0; i < args.length; i++) {
-			String s = args[i];
-			if (s.equals("-t")) {
-				if (i + 1 < args.length) {
-					i++;
-					setTestMode(args[i]);
-				}
-			} else if (s.equals("-p")) {
-				if (i + 1 < args.length) {
-					i++;
-					setPlayMode(args[i]);
-				}
-			} else if (s.equals("-chapter")) {
-				if (i + 1 < args.length) {
-					i++;
-					setChapter(args[i]);
-				}							
-			} else if (s.equals("-f")) {
-				fullscreen = true;
-
-				//cfg.fullscreen = true;
-			} else if (s.equals("-d")) {
-				setDebugMode();
-			} else if (s.equals("-r")) {
-				setRestart();				
-			} else if (s.equals("-res")) {
-				if (i + 1 < args.length) {
-					i++;
-					forceResolution(args[i]);
-				}					
-			} else if (s.equals("-w")) {
-				fullscreen = false;
-			} else if (s.equals("-l")) {
-				if (i + 1 < args.length) {
-					i++;
-					loadGameState(args[i]);
-				}
-			} else if (s.equals("-h")) {
-				usage();
-			} else {
-				if(i == 0 && !s.startsWith("-")) continue; // When embeded JRE the 0 parameter is the app name
-				System.out.println("Unrecognized parameter: " + s);
-				usage();
-			}
-		}
-	}
-
-	
-	public void usage() {
-		System.out.println(
-				"Usage:\n" +
-				"-chapter chapter\tLoads the selected chapter\n" +
-			    "-t scene_name\tStart test mode for the scene\n" +
-			    "-p record_name\tPlay previusly recorded games\n" +
-			    "-f\tSet fullscreen mode\n" +
-			    "-w\tSet windowed mode\n" +
-			    "-d\tShow debug messages\n" +
-			    "-res width\tForce the resolution width\n" +
-			    "-l game_state\tLoad the previusly saved game state\n" + 
-			    "-r\tRun the game from the begining\n"
-				);
-		
-		System.exit(0);
-	}
-
-	@Override
-	public void create() {
-		// Gdx.input.setCursorCatched(false);
-		if (fullscreen)
-			Gdx.graphics.setDisplayMode(Gdx.graphics.getDesktopDisplayMode());
-		
-		hideCursor();
-		
-		super.create();
-	}
-
-	private void hideCursor() {
-		Cursor emptyCursor;
-
-		int min = org.lwjgl.input.Cursor.getMinCursorSize();
-		IntBuffer tmp = BufferUtils.createIntBuffer(min * min);
-		try {
-			emptyCursor = new org.lwjgl.input.Cursor(min, min, min / 2,
-					min / 2, 1, tmp, null);
-
-			Mouse.setNativeCursor(emptyCursor);
-		} catch (LWJGLException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public static void main(String[] args) {
-		DesktopLauncher game = new DesktopLauncher();
-		game.parseParams(args);
-		game.run();
-	}
-}
diff --git a/adventure-composer/src/main/resources/projectTmpl/desktop/src/icons/icon128.png b/adventure-composer/src/main/resources/projectTmpl/desktop/src/icons/icon128.png
deleted file mode 100644
index 47a2dc96f..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/desktop/src/icons/icon128.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/desktop/src/icons/icon16.png b/adventure-composer/src/main/resources/projectTmpl/desktop/src/icons/icon16.png
deleted file mode 100644
index 348db53c4..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/desktop/src/icons/icon16.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/desktop/src/icons/icon32.png b/adventure-composer/src/main/resources/projectTmpl/desktop/src/icons/icon32.png
deleted file mode 100644
index 831b74e84..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/desktop/src/icons/icon32.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/gradle.properties b/adventure-composer/src/main/resources/projectTmpl/gradle.properties
deleted file mode 100644
index fa55fd1e1..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-org.gradle.daemon=true
-org.gradle.jvmargs=-Xms128m -Xmx512m
-org.gradle.configureondemand=true
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.jar b/adventure-composer/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index b979729db..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/gradlew b/adventure-composer/src/main/resources/projectTmpl/gradlew
deleted file mode 100644
index 91a7e269e..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/adventure-composer/src/main/resources/projectTmpl/html/GdxDefinition b/adventure-composer/src/main/resources/projectTmpl/html/GdxDefinition
deleted file mode 100644
index 395cd5985..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/html/GdxDefinition
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit trunk//EN" "http://google-web-toolkit.googlecode.com/svn/trunk/distro-source/core/src/gwt-module.dtd">
-<module rename-to="html">
-%GWT_INHERITS%
-	<inherits name='%MAIN_CLASS%' />
-	<entry-point class='%PACKAGE%.client.HtmlLauncher' />
-	
-	<set-configuration-property name="gdx.assetpath" value="../%ASSET_PATH%" />
-</module>
diff --git a/adventure-composer/src/main/resources/projectTmpl/html/GdxDefinitionSuperdev b/adventure-composer/src/main/resources/projectTmpl/html/GdxDefinitionSuperdev
deleted file mode 100644
index 08822d347..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/html/GdxDefinitionSuperdev
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit trunk//EN" "http://google-web-toolkit.googlecode.com/svn/trunk/distro-source/core/src/gwt-module.dtd">
-<module rename-to="html">
-%GWT_INHERITS%
-    <inherits name='%MAIN_CLASS%' />
-	<entry-point class='%PACKAGE%.client.HtmlLauncher' />
-	
-	<add-linker name="xsiframe"/>
-	<set-configuration-property name='xsiframe.failIfScriptTag' value='FALSE'/>
-	<set-configuration-property name="devModeRedirectEnabled" value="true"/>
-	
-	<set-configuration-property name="gdx.assetpath" value="../%ASSET_PATH%" />
-</module>
diff --git a/adventure-composer/src/main/resources/projectTmpl/html/build.gradle b/adventure-composer/src/main/resources/projectTmpl/html/build.gradle
deleted file mode 100644
index 1d2d64eb9..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/html/build.gradle
+++ /dev/null
@@ -1,70 +0,0 @@
-apply plugin: "java"
-apply plugin: "jetty"
-
-gwt {
-    gwtVersion='%GWT_VERSION%' // Should match the gwt version used for building the gwt backend
-    maxHeapSize="1G" // Default 256m is not enough for gwt compiler. GWT is HUNGRY
-    minHeapSize="1G"
-
-    src = files(file("src/")) // Needs to be in front of "modules" below.
-    modules '%PACKAGE%.GdxDefinition'
-    devModules '%PACKAGE%.GdxDefinitionSuperdev'
-    project.webAppDirName = 'webapp'
-
-    compiler {
-        strict = true;
-        enableClosureCompiler = true;
-        disableCastChecking = true;
-    }
-}
-
-task draftRun(type: JettyRunWar) {
-    dependsOn draftWar
-    dependsOn.remove('war')
-    webApp=draftWar.archivePath
-    daemon=true
-}
-
-task superDev(type: de.richsource.gradle.plugins.gwt.GwtSuperDev) {
-    dependsOn draftRun
-    doFirst {
-    	gwt.modules = gwt.devModules
-    }
-}
-
-task dist(dependsOn: [clean, compileGwt]) {
-    doLast {
-        file("build/dist").mkdirs()
-        copy {
-            from "build/gwt/out"
-            into "build/dist"
-        }
-        copy {
-            from "webapp"
-            into "build/dist"
-            }
-        copy {
-            from "war"
-            into "build/dist"
-        }
-    }
-}
-
-draftWar {
-   from "war"
-}
-
-task addSource << {
-	sourceSets.main.compileClasspath += files(project(':core').sourceSets.main.allJava.srcDirs)
-}
-
-tasks.compileGwt.dependsOn(addSource)
-tasks.draftCompileGwt.dependsOn(addSource)
-
-sourceCompatibility = 1.6
-sourceSets.main.java.srcDirs = [ "src/" ]
-
-
-eclipse.project {
-    name = appName + "-html"
-}
diff --git a/adventure-composer/src/main/resources/projectTmpl/html/src/HtmlLauncher b/adventure-composer/src/main/resources/projectTmpl/html/src/HtmlLauncher
deleted file mode 100644
index a6d0c092e..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/html/src/HtmlLauncher
+++ /dev/null
@@ -1,19 +0,0 @@
-package %PACKAGE%.client;
-
-import com.badlogic.gdx.ApplicationListener;
-import com.badlogic.gdx.backends.gwt.GwtApplication;
-import com.badlogic.gdx.backends.gwt.GwtApplicationConfiguration;
-import com.bladecoder.engine.BladeEngine;
-
-public class HtmlLauncher extends GwtApplication {
-
-        @Override
-        public GwtApplicationConfiguration getConfig () {
-                return new GwtApplicationConfiguration(480, 320);
-        }
-
-        @Override
-        public ApplicationListener getApplicationListener () {
-                return new BladeEngine();
-        }
-}
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/html/war/WEB-INF/web.xml b/adventure-composer/src/main/resources/projectTmpl/html/war/WEB-INF/web.xml
deleted file mode 100644
index 4301df248..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/html/war/WEB-INF/web.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" ?>
-<web-app>
-</web-app>
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/html/war/index b/adventure-composer/src/main/resources/projectTmpl/html/war/index
deleted file mode 100644
index f159de476..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/html/war/index
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<html>
-       <head>
-              <title>%APP_NAME%</title>
-              <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-              <link href="styles.css" rel="stylesheet" type="text/css">
-              <script src="soundmanager2-setup.js"></script>  
-  			  <script src="soundmanager2-jsmin.js"></script> 
-               <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-       
-       <body>              
-              <a class="superdev" href="javascript:%7B%20window.__gwt_bookmarklet_params%20%3D%20%7B'server_url'%3A'http%3A%2F%2Flocalhost%3A9876%2F'%7D%3B%20var%20s%20%3D%20document.createElement('script')%3B%20s.src%20%3D%20'http%3A%2F%2Flocalhost%3A9876%2Fdev_mode_on.js'%3B%20void(document.getElementsByTagName('head')%5B0%5D.appendChild(s))%3B%7D">SuperDev Refresh</a>
-              <div align="center" id="embed-html"></div>
-              <script type="text/javascript" src="html/html.nocache.js"></script>
-       </body>
-       
-       <script>
-              function handleMouseDown(evt) {
-                evt.preventDefault();
-                evt.stopPropagation();
-                evt.target.style.cursor = 'default';
-              }
-              
-              function handleMouseUp(evt) {
-                evt.preventDefault();
-                evt.stopPropagation();
-                evt.target.style.cursor = '';
-              }
-              document.getElementById('embed-html').addEventListener('mousedown', handleMouseDown, false);
-              document.getElementById('embed-html').addEventListener('mouseup', handleMouseUp, false);
-       </script>
-</html>
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/html/war/refresh.png b/adventure-composer/src/main/resources/projectTmpl/html/war/refresh.png
deleted file mode 100644
index 24a48f1cc..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/html/war/refresh.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/html/war/soundmanager2-jsmin.js b/adventure-composer/src/main/resources/projectTmpl/html/war/soundmanager2-jsmin.js
deleted file mode 100644
index b6af93d80..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/html/war/soundmanager2-jsmin.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/** @license
-
-
- SoundManager 2: JavaScript Sound for the Web
- ----------------------------------------------
- http://schillmania.com/projects/soundmanager2/
-
- Copyright (c) 2007, Scott Schiller. All rights reserved.
- Code provided under the BSD License:
- http://schillmania.com/projects/soundmanager2/license.txt
-
- V2.97a.20130512
-*/
-(function(h,g){function fa(fa,wa){function ga(b){return c.preferFlash&&H&&!c.ignoreFlash&&c.flash[b]!==g&&c.flash[b]}function s(b){return function(d){var e=this._s;!e||!e._a?(e&&e.id?c._wD(e.id+": Ignoring "+d.type):c._wD(rb+"Ignoring "+d.type),d=null):d=b.call(this,d);return d}}this.setupOptions={url:fa||null,flashVersion:8,debugMode:!0,debugFlash:!1,useConsole:!0,consoleOnly:!0,waitForWindowLoad:!1,bgColor:"#ffffff",useHighPerformance:!1,flashPollingInterval:null,html5PollingInterval:null,flashLoadTimeout:1E3,
-wmode:null,allowScriptAccess:"always",useFlashBlock:!1,useHTML5Audio:!0,html5Test:/^(probably|maybe)$/i,preferFlash:!0,noSWFCache:!1,idPrefix:"sound"};this.defaultOptions={autoLoad:!1,autoPlay:!1,from:null,loops:1,onid3:null,onload:null,whileloading:null,onplay:null,onpause:null,onresume:null,whileplaying:null,onposition:null,onstop:null,onfailure:null,onfinish:null,multiShot:!0,multiShotEvents:!1,position:null,pan:0,stream:!0,to:null,type:null,usePolicyFile:!1,volume:100};this.flash9Options={isMovieStar:null,
-usePeakData:!1,useWaveformData:!1,useEQData:!1,onbufferchange:null,ondataerror:null};this.movieStarOptions={bufferTime:3,serverURL:null,onconnect:null,duration:null};this.audioFormats={mp3:{type:['audio/mpeg; codecs\x3d"mp3"',"audio/mpeg","audio/mp3","audio/MPA","audio/mpa-robust"],required:!0},mp4:{related:["aac","m4a","m4b"],type:['audio/mp4; codecs\x3d"mp4a.40.2"',"audio/aac","audio/x-m4a","audio/MP4A-LATM","audio/mpeg4-generic"],required:!1},ogg:{type:["audio/ogg; codecs\x3dvorbis"],required:!1},
-opus:{type:["audio/ogg; codecs\x3dopus","audio/opus"],required:!1},wav:{type:['audio/wav; codecs\x3d"1"',"audio/wav","audio/wave","audio/x-wav"],required:!1}};this.movieID="sm2-container";this.id=wa||"sm2movie";this.debugID="soundmanager-debug";this.debugURLParam=/([#?&])debug=1/i;this.versionNumber="V2.97a.20130512";this.altURL=this.movieURL=this.version=null;this.enabled=this.swfLoaded=!1;this.oMC=null;this.sounds={};this.soundIDs=[];this.didFlashBlock=this.muted=!1;this.filePattern=null;this.filePatterns=
-{flash8:/\.mp3(\?.*)?$/i,flash9:/\.mp3(\?.*)?$/i};this.features={buffering:!1,peakData:!1,waveformData:!1,eqData:!1,movieStar:!1};this.sandbox={type:null,types:{remote:"remote (domain-based) rules",localWithFile:"local with file access (no internet access)",localWithNetwork:"local with network (internet access only, no local access)",localTrusted:"local, trusted (local+internet access)"},description:null,noRemote:null,noLocal:null};this.html5={usingFlash:null};this.flash={};this.ignoreFlash=this.html5Only=
-!1;var Ua,c=this,Va=null,k=null,rb="HTML5::",A,t=navigator.userAgent,U=h.location.href.toString(),m=document,xa,Wa,ya,n,F=[],za=!0,C,V=!1,W=!1,q=!1,y=!1,ha=!1,p,sb=0,X,B,Aa,O,Ba,M,P,Q,Xa,Ca,ia,I,ja,Da,R,Ea,Y,ka,la,S,Ya,Fa,Za=["log","info","warn","error"],$a,Ga,ab,Z=null,Ha=null,r,Ia,T,bb,ma,na,J,v,$=!1,Ja=!1,cb,db,eb,oa=0,aa=null,pa,N=[],qa,u=null,fb,ra,ba,K,sa,Ka,gb,w,hb=Array.prototype.slice,E=!1,La,H,Ma,ib,G,jb,Na,ta,kb=0,ca=t.match(/(ipad|iphone|ipod)/i),lb=t.match(/android/i),L=t.match(/msie/i),
-tb=t.match(/webkit/i),ua=t.match(/safari/i)&&!t.match(/chrome/i),Oa=t.match(/opera/i),ub=t.match(/firefox/i),Pa=t.match(/(mobile|pre\/|xoom)/i)||ca||lb,Qa=!U.match(/usehtml5audio/i)&&!U.match(/sm2\-ignorebadua/i)&&ua&&!t.match(/silk/i)&&t.match(/OS X 10_6_([3-7])/i),da=h.console!==g&&console.log!==g,Ra=m.hasFocus!==g?m.hasFocus():null,va=ua&&(m.hasFocus===g||!m.hasFocus()),mb=!va,nb=/(mp3|mp4|mpa|m4a|m4b)/i,ea=m.location?m.location.protocol.match(/http/i):null,ob=!ea?"http://":"",pb=/^\s*audio\/(?:x-)?(?:mpeg4|aac|flv|mov|mp4||m4v|m4a|m4b|mp4v|3gp|3g2)\s*(?:$|;)/i,
-qb="mpeg4 aac flv mov mp4 m4v f4v m4a m4b mp4v 3gp 3g2".split(" "),vb=RegExp("\\.("+qb.join("|")+")(\\?.*)?$","i");this.mimePattern=/^\s*audio\/(?:x-)?(?:mp(?:eg|3))\s*(?:$|;)/i;this.useAltURL=!ea;var Sa;try{Sa=Audio!==g&&(Oa&&opera!==g&&10>opera.version()?new Audio(null):new Audio).canPlayType!==g}catch(wb){Sa=!1}this.hasHTML5=Sa;this.setup=function(b){var d=!c.url;b!==g&&(q&&u&&c.ok()&&(b.flashVersion!==g||b.url!==g||b.html5Test!==g))&&J(r("setupLate"));Aa(b);b&&(d&&(Y&&b.url!==g)&&c.beginDelayedInit(),
-!Y&&(b.url!==g&&"complete"===m.readyState)&&setTimeout(R,1));return c};this.supported=this.ok=function(){return u?q&&!y:c.useHTML5Audio&&c.hasHTML5};this.getMovie=function(c){return A(c)||m[c]||h[c]};this.createSound=function(b,d){function e(){f=ma(f);c.sounds[f.id]=new Ua(f);c.soundIDs.push(f.id);return c.sounds[f.id]}var a,f;a=null;a="soundManager.createSound(): "+r(!q?"notReady":"notOK");if(!q||!c.ok())return J(a),!1;d!==g&&(b={id:b,url:d});f=B(b);f.url=pa(f.url);void 0===f.id&&(f.id=c.setupOptions.idPrefix+
-kb++);f.id.toString().charAt(0).match(/^[0-9]$/)&&c._wD("soundManager.createSound(): "+r("badID",f.id),2);c._wD("soundManager.createSound(): "+f.id+(f.url?" ("+f.url+")":""),1);if(v(f.id,!0))return c._wD("soundManager.createSound(): "+f.id+" exists",1),c.sounds[f.id];if(ra(f))a=e(),c._wD(f.id+": Using HTML5"),a._setup_html5(f);else{if(c.html5Only)return c._wD(f.id+": No HTML5 support for this sound, and no Flash. Exiting."),e();if(c.html5.usingFlash&&f.url&&f.url.match(/data\:/i))return c._wD(f.id+
-": data: URIs not supported via Flash. Exiting."),e();8<n&&(null===f.isMovieStar&&(f.isMovieStar=!(!f.serverURL&&!(f.type&&f.type.match(pb)||f.url&&f.url.match(vb)))),f.isMovieStar&&(c._wD("soundManager.createSound(): using MovieStar handling"),1<f.loops&&p("noNSLoop")));f=na(f,"soundManager.createSound(): ");a=e();8===n?k._createSound(f.id,f.loops||1,f.usePolicyFile):(k._createSound(f.id,f.url,f.usePeakData,f.useWaveformData,f.useEQData,f.isMovieStar,f.isMovieStar?f.bufferTime:!1,f.loops||1,f.serverURL,
-f.duration||null,f.autoPlay,!0,f.autoLoad,f.usePolicyFile),f.serverURL||(a.connected=!0,f.onconnect&&f.onconnect.apply(a)));!f.serverURL&&(f.autoLoad||f.autoPlay)&&a.load(f)}!f.serverURL&&f.autoPlay&&a.play();return a};this.destroySound=function(b,d){if(!v(b))return!1;var e=c.sounds[b],a;e._iO={};e.stop();e.unload();for(a=0;a<c.soundIDs.length;a++)if(c.soundIDs[a]===b){c.soundIDs.splice(a,1);break}d||e.destruct(!0);delete c.sounds[b];return!0};this.load=function(b,d){return!v(b)?!1:c.sounds[b].load(d)};
-this.unload=function(b){return!v(b)?!1:c.sounds[b].unload()};this.onposition=this.onPosition=function(b,d,e,a){return!v(b)?!1:c.sounds[b].onposition(d,e,a)};this.clearOnPosition=function(b,d,e){return!v(b)?!1:c.sounds[b].clearOnPosition(d,e)};this.start=this.play=function(b,d){var e=null,a=d&&!(d instanceof Object);if(!q||!c.ok())return J("soundManager.play(): "+r(!q?"notReady":"notOK")),!1;if(v(b,a))a&&(d={url:d});else{if(!a)return!1;a&&(d={url:d});d&&d.url&&(c._wD('soundManager.play(): Attempting to create "'+
-b+'"',1),d.id=b,e=c.createSound(d).play())}null===e&&(e=c.sounds[b].play(d));return e};this.setPosition=function(b,d){return!v(b)?!1:c.sounds[b].setPosition(d)};this.stop=function(b){if(!v(b))return!1;c._wD("soundManager.stop("+b+")",1);return c.sounds[b].stop()};this.stopAll=function(){var b;c._wD("soundManager.stopAll()",1);for(b in c.sounds)c.sounds.hasOwnProperty(b)&&c.sounds[b].stop()};this.pause=function(b){return!v(b)?!1:c.sounds[b].pause()};this.pauseAll=function(){var b;for(b=c.soundIDs.length-
-1;0<=b;b--)c.sounds[c.soundIDs[b]].pause()};this.resume=function(b){return!v(b)?!1:c.sounds[b].resume()};this.resumeAll=function(){var b;for(b=c.soundIDs.length-1;0<=b;b--)c.sounds[c.soundIDs[b]].resume()};this.togglePause=function(b){return!v(b)?!1:c.sounds[b].togglePause()};this.setPan=function(b,d){return!v(b)?!1:c.sounds[b].setPan(d)};this.setVolume=function(b,d){return!v(b)?!1:c.sounds[b].setVolume(d)};this.mute=function(b){var d=0;b instanceof String&&(b=null);if(b){if(!v(b))return!1;c._wD('soundManager.mute(): Muting "'+
-b+'"');return c.sounds[b].mute()}c._wD("soundManager.mute(): Muting all sounds");for(d=c.soundIDs.length-1;0<=d;d--)c.sounds[c.soundIDs[d]].mute();return c.muted=!0};this.muteAll=function(){c.mute()};this.unmute=function(b){b instanceof String&&(b=null);if(b){if(!v(b))return!1;c._wD('soundManager.unmute(): Unmuting "'+b+'"');return c.sounds[b].unmute()}c._wD("soundManager.unmute(): Unmuting all sounds");for(b=c.soundIDs.length-1;0<=b;b--)c.sounds[c.soundIDs[b]].unmute();c.muted=!1;return!0};this.unmuteAll=
-function(){c.unmute()};this.toggleMute=function(b){return!v(b)?!1:c.sounds[b].toggleMute()};this.getMemoryUse=function(){var c=0;k&&8!==n&&(c=parseInt(k._getMemoryUse(),10));return c};this.disable=function(b){var d;b===g&&(b=!1);if(y)return!1;y=!0;p("shutdown",1);for(d=c.soundIDs.length-1;0<=d;d--)$a(c.sounds[c.soundIDs[d]]);X(b);w.remove(h,"load",P);return!0};this.canPlayMIME=function(b){var d;c.hasHTML5&&(d=ba({type:b}));!d&&u&&(d=b&&c.ok()?!!(8<n&&b.match(pb)||b.match(c.mimePattern)):null);return d};
-this.canPlayURL=function(b){var d;c.hasHTML5&&(d=ba({url:b}));!d&&u&&(d=b&&c.ok()?!!b.match(c.filePattern):null);return d};this.canPlayLink=function(b){return b.type!==g&&b.type&&c.canPlayMIME(b.type)?!0:c.canPlayURL(b.href)};this.getSoundById=function(b,d){if(!b)return null;var e=c.sounds[b];!e&&!d&&c._wD('soundManager.getSoundById(): Sound "'+b+'" not found.',2);return e};this.onready=function(b,d){if("function"===typeof b)q&&c._wD(r("queue","onready")),d||(d=h),Ba("onready",b,d),M();else throw r("needFunction",
-"onready");return!0};this.ontimeout=function(b,d){if("function"===typeof b)q&&c._wD(r("queue","ontimeout")),d||(d=h),Ba("ontimeout",b,d),M({type:"ontimeout"});else throw r("needFunction","ontimeout");return!0};this._writeDebug=function(b,d){var e,a;if(!c.debugMode)return!1;if(da&&c.useConsole){if(d&&"object"===typeof d)console.log(b,d);else if(Za[d]!==g)console[Za[d]](b);else console.log(b);if(c.consoleOnly)return!0}e=A("soundmanager-debug");if(!e)return!1;a=m.createElement("div");0===++sb%2&&(a.className=
-"sm2-alt");d=d===g?0:parseInt(d,10);a.appendChild(m.createTextNode(b));d&&(2<=d&&(a.style.fontWeight="bold"),3===d&&(a.style.color="#ff3333"));e.insertBefore(a,e.firstChild);return!0};-1!==U.indexOf("sm2-debug\x3dalert")&&(this._writeDebug=function(c){h.alert(c)});this._wD=this._writeDebug;this._debug=function(){var b,d;p("currentObj",1);b=0;for(d=c.soundIDs.length;b<d;b++)c.sounds[c.soundIDs[b]]._debug()};this.reboot=function(b,d){c.soundIDs.length&&c._wD("Destroying "+c.soundIDs.length+" SMSound object"+
-(1!==c.soundIDs.length?"s":"")+"...");var e,a,f;for(e=c.soundIDs.length-1;0<=e;e--)c.sounds[c.soundIDs[e]].destruct();if(k)try{L&&(Ha=k.innerHTML),Z=k.parentNode.removeChild(k)}catch(g){p("badRemove",2)}Ha=Z=u=k=null;c.enabled=Y=q=$=Ja=V=W=y=E=c.swfLoaded=!1;c.soundIDs=[];c.sounds={};kb=0;if(b)F=[];else for(e in F)if(F.hasOwnProperty(e)){a=0;for(f=F[e].length;a<f;a++)F[e][a].fired=!1}d||c._wD("soundManager: Rebooting...");c.html5={usingFlash:null};c.flash={};c.html5Only=!1;c.ignoreFlash=!1;h.setTimeout(function(){Da();
-d||c.beginDelayedInit()},20);return c};this.reset=function(){p("reset");return c.reboot(!0,!0)};this.getMoviePercent=function(){return k&&"PercentLoaded"in k?k.PercentLoaded():null};this.beginDelayedInit=function(){ha=!0;R();setTimeout(function(){if(Ja)return!1;la();ja();return Ja=!0},20);Q()};this.destruct=function(){c._wD("soundManager.destruct()");c.disable(!0)};Ua=function(b){var d,e,a=this,f,h,z,l,m,q,s=!1,D=[],t=0,Ta,y,u=null,A;e=d=null;this.sID=this.id=b.id;this.url=b.url;this._iO=this.instanceOptions=
-this.options=B(b);this.pan=this.options.pan;this.volume=this.options.volume;this.isHTML5=!1;this._a=null;A=this.url?!1:!0;this.id3={};this._debug=function(){c._wD(a.id+": Merged options:",a.options)};this.load=function(b){var d=null,e;b!==g?a._iO=B(b,a.options):(b=a.options,a._iO=b,u&&u!==a.url&&(p("manURL"),a._iO.url=a.url,a.url=null));a._iO.url||(a._iO.url=a.url);a._iO.url=pa(a._iO.url);e=a.instanceOptions=a._iO;c._wD(a.id+": load ("+e.url+")");if(!e.url&&!a.url)return c._wD(a.id+": load(): url is unassigned. Exiting.",
-2),a;!a.isHTML5&&(8===n&&!a.url&&!e.autoPlay)&&c._wD(a.id+": Flash 8 load() limitation: Wait for onload() before calling play().",1);if(e.url===a.url&&0!==a.readyState&&2!==a.readyState)return p("onURL",1),3===a.readyState&&e.onload&&ta(a,function(){e.onload.apply(a,[!!a.duration])}),a;a.loaded=!1;a.readyState=1;a.playState=0;a.id3={};if(ra(e))d=a._setup_html5(e),d._called_load?c._wD(a.id+": Ignoring request to load again"):(a._html5_canplay=!1,a.url!==e.url&&(c._wD(p("manURL")+": "+e.url),a._a.src=
-e.url,a.setPosition(0)),a._a.autobuffer="auto",a._a.preload="auto",a._a._called_load=!0,e.autoPlay&&a.play());else{if(c.html5Only)return c._wD(a.id+": No flash support. Exiting."),a;if(a._iO.url&&a._iO.url.match(/data\:/i))return c._wD(a.id+": data: URIs not supported via Flash. Exiting."),a;try{a.isHTML5=!1,a._iO=na(ma(e)),e=a._iO,8===n?k._load(a.id,e.url,e.stream,e.autoPlay,e.usePolicyFile):k._load(a.id,e.url,!!e.stream,!!e.autoPlay,e.loops||1,!!e.autoLoad,e.usePolicyFile)}catch(f){p("smError",
-2),C("onload",!1),S({type:"SMSOUND_LOAD_JS_EXCEPTION",fatal:!0})}}a.url=e.url;return a};this.unload=function(){0!==a.readyState&&(c._wD(a.id+": unload()"),a.isHTML5?(l(),a._a&&(a._a.pause(),u=sa(a._a))):8===n?k._unload(a.id,"about:blank"):k._unload(a.id),f());return a};this.destruct=function(b){c._wD(a.id+": Destruct");a.isHTML5?(l(),a._a&&(a._a.pause(),sa(a._a),E||z(),a._a._s=null,a._a=null)):(a._iO.onfailure=null,k._destroySound(a.id));b||c.destroySound(a.id,!0)};this.start=this.play=function(b,
-d){var e,f,l,z,h,x=!0,x=null;e=a.id+": play(): ";d=d===g?!0:d;b||(b={});a.url&&(a._iO.url=a.url);a._iO=B(a._iO,a.options);a._iO=B(b,a._iO);a._iO.url=pa(a._iO.url);a.instanceOptions=a._iO;if(!a.isHTML5&&a._iO.serverURL&&!a.connected)return a.getAutoPlay()||(c._wD(e+" Netstream not connected yet - setting autoPlay"),a.setAutoPlay(!0)),a;ra(a._iO)&&(a._setup_html5(a._iO),m());1===a.playState&&!a.paused&&((f=a._iO.multiShot)?c._wD(e+"Already playing (multi-shot)",1):(c._wD(e+"Already playing (one-shot)",
-1),a.isHTML5&&a.setPosition(a._iO.position),x=a));if(null!==x)return x;b.url&&b.url!==a.url&&(!a.readyState&&!a.isHTML5&&8===n&&A?A=!1:a.load(a._iO));a.loaded?c._wD(e.substr(0,e.lastIndexOf(":"))):0===a.readyState?(c._wD(e+"Attempting to load"),!a.isHTML5&&!c.html5Only?(a._iO.autoPlay=!0,a.load(a._iO)):a.isHTML5?a.load(a._iO):(c._wD(e+"Unsupported type. Exiting."),x=a),a.instanceOptions=a._iO):2===a.readyState?(c._wD(e+"Could not load - exiting",2),x=a):c._wD(e+"Loading - attempting to play...");
-if(null!==x)return x;!a.isHTML5&&(9===n&&0<a.position&&a.position===a.duration)&&(c._wD(e+"Sound at end, resetting to position:0"),b.position=0);if(a.paused&&0<=a.position&&(!a._iO.serverURL||0<a.position))c._wD(e+"Resuming from paused state",1),a.resume();else{a._iO=B(b,a._iO);if(null!==a._iO.from&&null!==a._iO.to&&0===a.instanceCount&&0===a.playState&&!a._iO.serverURL){f=function(){a._iO=B(b,a._iO);a.play(a._iO)};if(a.isHTML5&&!a._html5_canplay)c._wD(e+"Beginning load for from/to case"),a.load({oncanplay:f}),
-x=!1;else if(!a.isHTML5&&!a.loaded&&(!a.readyState||2!==a.readyState))c._wD(e+"Preloading for from/to case"),a.load({onload:f}),x=!1;if(null!==x)return x;a._iO=y()}(!a.instanceCount||a._iO.multiShotEvents||a.isHTML5&&a._iO.multiShot&&!E||!a.isHTML5&&8<n&&!a.getAutoPlay())&&a.instanceCount++;a._iO.onposition&&0===a.playState&&q(a);a.playState=1;a.paused=!1;a.position=a._iO.position!==g&&!isNaN(a._iO.position)?a._iO.position:0;a.isHTML5||(a._iO=na(ma(a._iO)));a._iO.onplay&&d&&(a._iO.onplay.apply(a),
-s=!0);a.setVolume(a._iO.volume,!0);a.setPan(a._iO.pan,!0);a.isHTML5?2>a.instanceCount?(m(),e=a._setup_html5(),a.setPosition(a._iO.position),e.play()):(c._wD(a.id+": Cloning Audio() for instance #"+a.instanceCount+"..."),l=new Audio(a._iO.url),z=function(){w.remove(l,"onended",z);a._onfinish(a);sa(l);l=null},h=function(){w.remove(l,"canplay",h);try{l.currentTime=a._iO.position/1E3}catch(c){J(a.id+": multiShot play() failed to apply position of "+a._iO.position/1E3)}l.play()},w.add(l,"ended",z),a._iO.position?
-w.add(l,"canplay",h):l.play()):(x=k._start(a.id,a._iO.loops||1,9===n?a.position:a.position/1E3,a._iO.multiShot||!1),9===n&&!x&&(c._wD(e+"No sound hardware, or 32-sound ceiling hit",2),a._iO.onplayerror&&a._iO.onplayerror.apply(a)))}return a};this.stop=function(b){var d=a._iO;1===a.playState&&(c._wD(a.id+": stop()"),a._onbufferchange(0),a._resetOnPosition(0),a.paused=!1,a.isHTML5||(a.playState=0),Ta(),d.to&&a.clearOnPosition(d.to),a.isHTML5?a._a&&(b=a.position,a.setPosition(0),a.position=b,a._a.pause(),
-a.playState=0,a._onTimer(),l()):(k._stop(a.id,b),d.serverURL&&a.unload()),a.instanceCount=0,a._iO={},d.onstop&&d.onstop.apply(a));return a};this.setAutoPlay=function(b){c._wD(a.id+": Autoplay turned "+(b?"on":"off"));a._iO.autoPlay=b;a.isHTML5||(k._setAutoPlay(a.id,b),b&&(!a.instanceCount&&1===a.readyState)&&(a.instanceCount++,c._wD(a.id+": Incremented instance count to "+a.instanceCount)))};this.getAutoPlay=function(){return a._iO.autoPlay};this.setPosition=function(b){b===g&&(b=0);var d=a.isHTML5?
-Math.max(b,0):Math.min(a.duration||a._iO.duration,Math.max(b,0));a.position=d;b=a.position/1E3;a._resetOnPosition(a.position);a._iO.position=d;if(a.isHTML5){if(a._a){if(a._html5_canplay){if(a._a.currentTime!==b){c._wD(a.id+": setPosition("+b+")");try{a._a.currentTime=b,(0===a.playState||a.paused)&&a._a.pause()}catch(e){c._wD(a.id+": setPosition("+b+") failed: "+e.message,2)}}}else if(b)return c._wD(a.id+": setPosition("+b+"): Cannot seek yet, sound not ready",2),a;a.paused&&a._onTimer(!0)}}else b=
-9===n?a.position:b,a.readyState&&2!==a.readyState&&k._setPosition(a.id,b,a.paused||!a.playState,a._iO.multiShot);return a};this.pause=function(b){if(a.paused||0===a.playState&&1!==a.readyState)return a;c._wD(a.id+": pause()");a.paused=!0;a.isHTML5?(a._setup_html5().pause(),l()):(b||b===g)&&k._pause(a.id,a._iO.multiShot);a._iO.onpause&&a._iO.onpause.apply(a);return a};this.resume=function(){var b=a._iO;if(!a.paused)return a;c._wD(a.id+": resume()");a.paused=!1;a.playState=1;a.isHTML5?(a._setup_html5().play(),
-m()):(b.isMovieStar&&!b.serverURL&&a.setPosition(a.position),k._pause(a.id,b.multiShot));!s&&b.onplay?(b.onplay.apply(a),s=!0):b.onresume&&b.onresume.apply(a);return a};this.togglePause=function(){c._wD(a.id+": togglePause()");if(0===a.playState)return a.play({position:9===n&&!a.isHTML5?a.position:a.position/1E3}),a;a.paused?a.resume():a.pause();return a};this.setPan=function(b,c){b===g&&(b=0);c===g&&(c=!1);a.isHTML5||k._setPan(a.id,b);a._iO.pan=b;c||(a.pan=b,a.options.pan=b);return a};this.setVolume=
-function(b,d){b===g&&(b=100);d===g&&(d=!1);a.isHTML5?a._a&&(a._a.volume=Math.max(0,Math.min(1,b/100))):k._setVolume(a.id,c.muted&&!a.muted||a.muted?0:b);a._iO.volume=b;d||(a.volume=b,a.options.volume=b);return a};this.mute=function(){a.muted=!0;a.isHTML5?a._a&&(a._a.muted=!0):k._setVolume(a.id,0);return a};this.unmute=function(){a.muted=!1;var b=a._iO.volume!==g;a.isHTML5?a._a&&(a._a.muted=!1):k._setVolume(a.id,b?a._iO.volume:a.options.volume);return a};this.toggleMute=function(){return a.muted?a.unmute():
-a.mute()};this.onposition=this.onPosition=function(b,c,d){D.push({position:parseInt(b,10),method:c,scope:d!==g?d:a,fired:!1});return a};this.clearOnPosition=function(a,b){var c;a=parseInt(a,10);if(isNaN(a))return!1;for(c=0;c<D.length;c++)if(a===D[c].position&&(!b||b===D[c].method))D[c].fired&&t--,D.splice(c,1)};this._processOnPosition=function(){var b,c;b=D.length;if(!b||!a.playState||t>=b)return!1;for(b-=1;0<=b;b--)c=D[b],!c.fired&&a.position>=c.position&&(c.fired=!0,t++,c.method.apply(c.scope,[c.position]));
-return!0};this._resetOnPosition=function(a){var b,c;b=D.length;if(!b)return!1;for(b-=1;0<=b;b--)c=D[b],c.fired&&a<=c.position&&(c.fired=!1,t--);return!0};y=function(){var b=a._iO,d=b.from,e=b.to,f,g;g=function(){c._wD(a.id+': "To" time of '+e+" reached.");a.clearOnPosition(e,g);a.stop()};f=function(){c._wD(a.id+': Playing "from" '+d);if(null!==e&&!isNaN(e))a.onPosition(e,g)};null!==d&&!isNaN(d)&&(b.position=d,b.multiShot=!1,f());return b};q=function(){var b,c=a._iO.onposition;if(c)for(b in c)if(c.hasOwnProperty(b))a.onPosition(parseInt(b,
-10),c[b])};Ta=function(){var b,c=a._iO.onposition;if(c)for(b in c)c.hasOwnProperty(b)&&a.clearOnPosition(parseInt(b,10))};m=function(){a.isHTML5&&cb(a)};l=function(){a.isHTML5&&db(a)};f=function(b){b||(D=[],t=0);s=!1;a._hasTimer=null;a._a=null;a._html5_canplay=!1;a.bytesLoaded=null;a.bytesTotal=null;a.duration=a._iO&&a._iO.duration?a._iO.duration:null;a.durationEstimate=null;a.buffered=[];a.eqData=[];a.eqData.left=[];a.eqData.right=[];a.failures=0;a.isBuffering=!1;a.instanceOptions={};a.instanceCount=
-0;a.loaded=!1;a.metadata={};a.readyState=0;a.muted=!1;a.paused=!1;a.peakData={left:0,right:0};a.waveformData={left:[],right:[]};a.playState=0;a.position=null;a.id3={}};f();this._onTimer=function(b){var c,f=!1,g={};if(a._hasTimer||b){if(a._a&&(b||(0<a.playState||1===a.readyState)&&!a.paused))c=a._get_html5_duration(),c!==d&&(d=c,a.duration=c,f=!0),a.durationEstimate=a.duration,c=1E3*a._a.currentTime||0,c!==e&&(e=c,f=!0),(f||b)&&a._whileplaying(c,g,g,g,g);return f}};this._get_html5_duration=function(){var b=
-a._iO;return(b=a._a&&a._a.duration?1E3*a._a.duration:b&&b.duration?b.duration:null)&&!isNaN(b)&&Infinity!==b?b:null};this._apply_loop=function(a,b){!a.loop&&1<b&&c._wD("Note: Native HTML5 looping is infinite.",1);a.loop=1<b?"loop":""};this._setup_html5=function(b){b=B(a._iO,b);var c=E?Va:a._a,d=decodeURI(b.url),e;E?d===decodeURI(La)&&(e=!0):d===decodeURI(u)&&(e=!0);if(c){if(c._s)if(E)c._s&&(c._s.playState&&!e)&&c._s.stop();else if(!E&&d===decodeURI(u))return a._apply_loop(c,b.loops),c;e||(f(!1),c.src=
-b.url,La=u=a.url=b.url,c._called_load=!1)}else a._a=b.autoLoad||b.autoPlay?new Audio(b.url):Oa&&10>opera.version()?new Audio(null):new Audio,c=a._a,c._called_load=!1,E&&(Va=c);a.isHTML5=!0;a._a=c;c._s=a;h();a._apply_loop(c,b.loops);b.autoLoad||b.autoPlay?a.load():(c.autobuffer=!1,c.preload="auto");return c};h=function(){if(a._a._added_events)return!1;var b;a._a._added_events=!0;for(b in G)G.hasOwnProperty(b)&&a._a&&a._a.addEventListener(b,G[b],!1);return!0};z=function(){var b;c._wD(a.id+": Removing event listeners");
-a._a._added_events=!1;for(b in G)G.hasOwnProperty(b)&&a._a&&a._a.removeEventListener(b,G[b],!1)};this._onload=function(b){var d=!!b||!a.isHTML5&&8===n&&a.duration;b=a.id+": ";c._wD(b+(d?"onload()":"Failed to load / invalid sound?"+(!a.duration?" Zero-length duration reported.":" -")+" ("+a.url+")"),d?1:2);!d&&!a.isHTML5&&(!0===c.sandbox.noRemote&&c._wD(b+r("noNet"),1),!0===c.sandbox.noLocal&&c._wD(b+r("noLocal"),1));a.loaded=d;a.readyState=d?3:2;a._onbufferchange(0);a._iO.onload&&ta(a,function(){a._iO.onload.apply(a,
-[d])});return!0};this._onbufferchange=function(b){if(0===a.playState||b&&a.isBuffering||!b&&!a.isBuffering)return!1;a.isBuffering=1===b;a._iO.onbufferchange&&(c._wD(a.id+": Buffer state change: "+b),a._iO.onbufferchange.apply(a));return!0};this._onsuspend=function(){a._iO.onsuspend&&(c._wD(a.id+": Playback suspended"),a._iO.onsuspend.apply(a));return!0};this._onfailure=function(b,d,e){a.failures++;c._wD(a.id+": Failures \x3d "+a.failures);if(a._iO.onfailure&&1===a.failures)a._iO.onfailure(a,b,d,e);
-else c._wD(a.id+": Ignoring failure")};this._onfinish=function(){var b=a._iO.onfinish;a._onbufferchange(0);a._resetOnPosition(0);if(a.instanceCount&&(a.instanceCount--,a.instanceCount||(Ta(),a.playState=0,a.paused=!1,a.instanceCount=0,a.instanceOptions={},a._iO={},l(),a.isHTML5&&(a.position=0)),(!a.instanceCount||a._iO.multiShotEvents)&&b))c._wD(a.id+": onfinish()"),ta(a,function(){b.apply(a)})};this._whileloading=function(b,c,d,e){var f=a._iO;a.bytesLoaded=b;a.bytesTotal=c;a.duration=Math.floor(d);
-a.bufferLength=e;a.durationEstimate=!a.isHTML5&&!f.isMovieStar?f.duration?a.duration>f.duration?a.duration:f.duration:parseInt(a.bytesTotal/a.bytesLoaded*a.duration,10):a.duration;a.isHTML5||(a.buffered=[{start:0,end:a.duration}]);(3!==a.readyState||a.isHTML5)&&f.whileloading&&f.whileloading.apply(a)};this._whileplaying=function(b,c,d,e,f){var l=a._iO;if(isNaN(b)||null===b)return!1;a.position=Math.max(0,b);a._processOnPosition();!a.isHTML5&&8<n&&(l.usePeakData&&(c!==g&&c)&&(a.peakData={left:c.leftPeak,
-right:c.rightPeak}),l.useWaveformData&&(d!==g&&d)&&(a.waveformData={left:d.split(","),right:e.split(",")}),l.useEQData&&(f!==g&&f&&f.leftEQ)&&(b=f.leftEQ.split(","),a.eqData=b,a.eqData.left=b,f.rightEQ!==g&&f.rightEQ&&(a.eqData.right=f.rightEQ.split(","))));1===a.playState&&(!a.isHTML5&&(8===n&&!a.position&&a.isBuffering)&&a._onbufferchange(0),l.whileplaying&&l.whileplaying.apply(a));return!0};this._oncaptiondata=function(b){c._wD(a.id+": Caption data received.");a.captiondata=b;a._iO.oncaptiondata&&
-a._iO.oncaptiondata.apply(a,[b])};this._onmetadata=function(b,d){c._wD(a.id+": Metadata received.");var e={},f,g;f=0;for(g=b.length;f<g;f++)e[b[f]]=d[f];a.metadata=e;a._iO.onmetadata&&a._iO.onmetadata.apply(a)};this._onid3=function(b,d){c._wD(a.id+": ID3 data received.");var e=[],f,g;f=0;for(g=b.length;f<g;f++)e[b[f]]=d[f];a.id3=B(a.id3,e);a._iO.onid3&&a._iO.onid3.apply(a)};this._onconnect=function(b){b=1===b;c._wD(a.id+": "+(b?"Connected.":"Failed to connect? - "+a.url),b?1:2);if(a.connected=b)a.failures=
-0,v(a.id)&&(a.getAutoPlay()?a.play(g,a.getAutoPlay()):a._iO.autoLoad&&a.load()),a._iO.onconnect&&a._iO.onconnect.apply(a,[b])};this._ondataerror=function(b){0<a.playState&&(c._wD(a.id+": Data error: "+b),a._iO.ondataerror&&a._iO.ondataerror.apply(a))};this._debug()};ka=function(){return m.body||m._docElement||m.getElementsByTagName("div")[0]};A=function(b){return m.getElementById(b)};B=function(b,d){var e=b||{},a,f;a=d===g?c.defaultOptions:d;for(f in a)a.hasOwnProperty(f)&&e[f]===g&&(e[f]="object"!==
-typeof a[f]||null===a[f]?a[f]:B(e[f],a[f]));return e};ta=function(b,c){!b.isHTML5&&8===n?h.setTimeout(c,0):c()};O={onready:1,ontimeout:1,defaultOptions:1,flash9Options:1,movieStarOptions:1};Aa=function(b,d){var e,a=!0,f=d!==g,x=c.setupOptions;if(b===g){a=[];for(e in x)x.hasOwnProperty(e)&&a.push(e);for(e in O)O.hasOwnProperty(e)&&("object"===typeof c[e]?a.push(e+": {...}"):c[e]instanceof Function?a.push(e+": function() {...}"):a.push(e));c._wD(r("setup",a.join(", ")));return!1}for(e in b)if(b.hasOwnProperty(e))if("object"!==
-typeof b[e]||null===b[e]||b[e]instanceof Array||b[e]instanceof RegExp)f&&O[d]!==g?c[d][e]=b[e]:x[e]!==g?(c.setupOptions[e]=b[e],c[e]=b[e]):O[e]===g?(J(r(c[e]===g?"setupUndef":"setupError",e),2),a=!1):c[e]instanceof Function?c[e].apply(c,b[e]instanceof Array?b[e]:[b[e]]):c[e]=b[e];else if(O[e]===g)J(r(c[e]===g?"setupUndef":"setupError",e),2),a=!1;else return Aa(b[e],e);return a};w=function(){function b(a){a=hb.call(a);var b=a.length;e?(a[1]="on"+a[1],3<b&&a.pop()):3===b&&a.push(!1);return a}function c(b,
-d){var g=b.shift(),l=[a[d]];if(e)g[l](b[0],b[1]);else g[l].apply(g,b)}var e=h.attachEvent,a={add:e?"attachEvent":"addEventListener",remove:e?"detachEvent":"removeEventListener"};return{add:function(){c(b(arguments),"add")},remove:function(){c(b(arguments),"remove")}}}();G={abort:s(function(){c._wD(this._s.id+": abort")}),canplay:s(function(){var b=this._s,d;if(b._html5_canplay)return!0;b._html5_canplay=!0;c._wD(b.id+": canplay");b._onbufferchange(0);d=b._iO.position!==g&&!isNaN(b._iO.position)?b._iO.position/
-1E3:null;if(b.position&&this.currentTime!==d){c._wD(b.id+": canplay: Setting position to "+d);try{this.currentTime=d}catch(e){c._wD(b.id+": canplay: Setting position of "+d+" failed: "+e.message,2)}}b._iO._oncanplay&&b._iO._oncanplay()}),canplaythrough:s(function(){var b=this._s;b.loaded||(b._onbufferchange(0),b._whileloading(b.bytesLoaded,b.bytesTotal,b._get_html5_duration()),b._onload(!0))}),ended:s(function(){var b=this._s;c._wD(b.id+": ended");b._onfinish()}),error:s(function(){c._wD(this._s.id+
-": HTML5 error, code "+this.error.code);this._s._onload(!1)}),loadeddata:s(function(){var b=this._s;c._wD(b.id+": loadeddata");!b._loaded&&!ua&&(b.duration=b._get_html5_duration())}),loadedmetadata:s(function(){c._wD(this._s.id+": loadedmetadata")}),loadstart:s(function(){c._wD(this._s.id+": loadstart");this._s._onbufferchange(1)}),play:s(function(){this._s._onbufferchange(0)}),playing:s(function(){c._wD(this._s.id+": playing");this._s._onbufferchange(0)}),progress:s(function(b){var d=this._s,e,a,
-f;e=0;var g="progress"===b.type,z=b.target.buffered,l=b.loaded||0,h=b.total||1;d.buffered=[];if(z&&z.length){e=0;for(a=z.length;e<a;e++)d.buffered.push({start:1E3*z.start(e),end:1E3*z.end(e)});e=1E3*(z.end(0)-z.start(0));l=Math.min(1,e/(1E3*b.target.duration));if(g&&1<z.length){f=[];a=z.length;for(e=0;e<a;e++)f.push(1E3*b.target.buffered.start(e)+"-"+1E3*b.target.buffered.end(e));c._wD(this._s.id+": progress, timeRanges: "+f.join(", "))}g&&!isNaN(l)&&c._wD(this._s.id+": progress, "+Math.floor(100*
-l)+"% loaded")}isNaN(l)||(d._onbufferchange(0),d._whileloading(l,h,d._get_html5_duration()),l&&(h&&l===h)&&G.canplaythrough.call(this,b))}),ratechange:s(function(){c._wD(this._s.id+": ratechange")}),suspend:s(function(b){var d=this._s;c._wD(this._s.id+": suspend");G.progress.call(this,b);d._onsuspend()}),stalled:s(function(){c._wD(this._s.id+": stalled")}),timeupdate:s(function(){this._s._onTimer()}),waiting:s(function(){var b=this._s;c._wD(this._s.id+": waiting");b._onbufferchange(1)})};ra=function(b){return!b||
-!b.type&&!b.url&&!b.serverURL?!1:b.serverURL||b.type&&ga(b.type)?!1:b.type?ba({type:b.type}):ba({url:b.url})||c.html5Only||b.url.match(/data\:/i)};sa=function(b){var c;b&&(c=ua&&!ca?null:ub?"about:blank":null,b.src=c,void 0!==b._called_unload&&(b._called_load=!1));E&&(La=null);return c};ba=function(b){if(!c.useHTML5Audio||!c.hasHTML5)return!1;var d=b.url||null;b=b.type||null;var e=c.audioFormats,a;if(b&&c.html5[b]!==g)return c.html5[b]&&!ga(b);if(!K){K=[];for(a in e)e.hasOwnProperty(a)&&(K.push(a),
-e[a].related&&(K=K.concat(e[a].related)));K=RegExp("\\.("+K.join("|")+")(\\?.*)?$","i")}a=d?d.toLowerCase().match(K):null;!a||!a.length?b&&(d=b.indexOf(";"),a=(-1!==d?b.substr(0,d):b).substr(6)):a=a[1];a&&c.html5[a]!==g?d=c.html5[a]&&!ga(a):(b="audio/"+a,d=c.html5.canPlayType({type:b}),d=(c.html5[a]=d)&&c.html5[b]&&!ga(b));return d};gb=function(){function b(a){var b,e,f=b=!1;if(!d||"function"!==typeof d.canPlayType)return b;if(a instanceof Array){b=0;for(e=a.length;b<e;b++)if(c.html5[a[b]]||d.canPlayType(a[b]).match(c.html5Test))f=
-!0,c.html5[a[b]]=!0,c.flash[a[b]]=!!a[b].match(nb);b=f}else a=d&&"function"===typeof d.canPlayType?d.canPlayType(a):!1,b=!(!a||!a.match(c.html5Test));return b}if(!c.useHTML5Audio||!c.hasHTML5)return u=c.html5.usingFlash=!0,!1;var d=Audio!==g?Oa&&10>opera.version()?new Audio(null):new Audio:null,e,a,f={},h;h=c.audioFormats;for(e in h)if(h.hasOwnProperty(e)&&(a="audio/"+e,f[e]=b(h[e].type),f[a]=f[e],e.match(nb)?(c.flash[e]=!0,c.flash[a]=!0):(c.flash[e]=!1,c.flash[a]=!1),h[e]&&h[e].related))for(a=h[e].related.length-
-1;0<=a;a--)f["audio/"+h[e].related[a]]=f[e],c.html5[h[e].related[a]]=f[e],c.flash[h[e].related[a]]=f[e];f.canPlayType=d?b:null;c.html5=B(c.html5,f);c.html5.usingFlash=fb();u=c.html5.usingFlash;return!0};I={notReady:"Unavailable - wait until onready() has fired.",notOK:"Audio support is not available.",domError:"soundManagerexception caught while appending SWF to DOM.",spcWmode:"Removing wmode, preventing known SWF loading issue(s)",swf404:"soundManager: Verify that %s is a valid path.",tryDebug:"Try soundManager.debugFlash \x3d true for more security details (output goes to SWF.)",
-checkSWF:"See SWF output for more debug info.",localFail:"soundManager: Non-HTTP page ("+m.location.protocol+" URL?) Review Flash player security settings for this special case:\nhttp://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html\nMay need to add/allow path, eg. c:/sm2/ or /users/me/sm2/",waitFocus:"soundManager: Special case: Waiting for SWF to load with window focus...",waitForever:"soundManager: Waiting indefinitely for Flash (will recover if unblocked)...",
-waitSWF:"soundManager: Waiting for 100% SWF load...",needFunction:"soundManager: Function object expected for %s",badID:'Sound ID "%s" should be a string, starting with a non-numeric character',currentObj:"soundManager: _debug(): Current sound objects",waitOnload:"soundManager: Waiting for window.onload()",docLoaded:"soundManager: Document already loaded",onload:"soundManager: initComplete(): calling soundManager.onload()",onloadOK:"soundManager.onload() complete",didInit:"soundManager: init(): Already called?",
-secNote:"Flash security note: Network/internet URLs will not load due to security restrictions. Access can be configured via Flash Player Global Security Settings Page: http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html",badRemove:"soundManager: Failed to remove Flash node.",shutdown:"soundManager.disable(): Shutting down",queue:"soundManager: Queueing %s handler",smError:"SMSound.load(): Exception: JS-Flash communication failed, or JS error.",fbTimeout:"No flash response, applying .swf_timedout CSS...",
-fbLoaded:"Flash loaded",fbHandler:"soundManager: flashBlockHandler()",manURL:"SMSound.load(): Using manually-assigned URL",onURL:"soundManager.load(): current URL already assigned.",badFV:'soundManager.flashVersion must be 8 or 9. "%s" is invalid. Reverting to %s.',as2loop:"Note: Setting stream:false so looping can work (flash 8 limitation)",noNSLoop:"Note: Looping not implemented for MovieStar formats",needfl9:"Note: Switching to flash 9, required for MP4 formats.",mfTimeout:"Setting flashLoadTimeout \x3d 0 (infinite) for off-screen, mobile flash case",
-needFlash:"soundManager: Fatal error: Flash is needed to play some required formats, but is not available.",gotFocus:"soundManager: Got window focus.",policy:"Enabling usePolicyFile for data access",setup:"soundManager.setup(): allowed parameters: %s",setupError:'soundManager.setup(): "%s" cannot be assigned with this method.',setupUndef:'soundManager.setup(): Could not find option "%s"',setupLate:"soundManager.setup(): url, flashVersion and html5Test property changes will not take effect until reboot().",
-noURL:"soundManager: Flash URL required. Call soundManager.setup({url:...}) to get started.",sm2Loaded:"SoundManager 2: Ready.",reset:"soundManager.reset(): Removing event callbacks",mobileUA:"Mobile UA detected, preferring HTML5 by default.",globalHTML5:"Using singleton HTML5 Audio() pattern for this device."};r=function(){var b=hb.call(arguments),c=b.shift(),c=I&&I[c]?I[c]:"",e,a;if(c&&b&&b.length){e=0;for(a=b.length;e<a;e++)c=c.replace("%s",b[e])}return c};ma=function(b){8===n&&(1<b.loops&&b.stream)&&
-(p("as2loop"),b.stream=!1);return b};na=function(b,d){if(b&&!b.usePolicyFile&&(b.onid3||b.usePeakData||b.useWaveformData||b.useEQData))c._wD((d||"")+r("policy")),b.usePolicyFile=!0;return b};J=function(b){da&&console.warn!==g?console.warn(b):c._wD(b)};xa=function(){return!1};$a=function(b){for(var c in b)b.hasOwnProperty(c)&&"function"===typeof b[c]&&(b[c]=xa)};Ga=function(b){b===g&&(b=!1);(y||b)&&c.disable(b)};ab=function(b){var d=null;if(b)if(b.match(/\.swf(\?.*)?$/i)){if(d=b.substr(b.toLowerCase().lastIndexOf(".swf?")+
-4))return b}else b.lastIndexOf("/")!==b.length-1&&(b+="/");b=(b&&-1!==b.lastIndexOf("/")?b.substr(0,b.lastIndexOf("/")+1):"./")+c.movieURL;c.noSWFCache&&(b+="?ts\x3d"+(new Date).getTime());return b};Ca=function(){n=parseInt(c.flashVersion,10);8!==n&&9!==n&&(c._wD(r("badFV",n,8)),c.flashVersion=n=8);var b=c.debugMode||c.debugFlash?"_debug.swf":".swf";c.useHTML5Audio&&(!c.html5Only&&c.audioFormats.mp4.required&&9>n)&&(c._wD(r("needfl9")),c.flashVersion=n=9);c.version=c.versionNumber+(c.html5Only?" (HTML5-only mode)":
-9===n?" (AS3/Flash 9)":" (AS2/Flash 8)");8<n?(c.defaultOptions=B(c.defaultOptions,c.flash9Options),c.features.buffering=!0,c.defaultOptions=B(c.defaultOptions,c.movieStarOptions),c.filePatterns.flash9=RegExp("\\.(mp3|"+qb.join("|")+")(\\?.*)?$","i"),c.features.movieStar=!0):c.features.movieStar=!1;c.filePattern=c.filePatterns[8!==n?"flash9":"flash8"];c.movieURL=(8===n?"soundmanager2.swf":"soundmanager2_flash9.swf").replace(".swf",b);c.features.peakData=c.features.waveformData=c.features.eqData=8<
-n};Ya=function(b,c){if(!k)return!1;k._setPolling(b,c)};Fa=function(){c.debugURLParam.test(U)&&(c.debugMode=!0);if(A(c.debugID))return!1;var b,d,e,a;if(c.debugMode&&!A(c.debugID)&&(!da||!c.useConsole||!c.consoleOnly)){b=m.createElement("div");b.id=c.debugID+"-toggle";d={position:"fixed",bottom:"0px",right:"0px",width:"1.2em",height:"1.2em",lineHeight:"1.2em",margin:"2px",textAlign:"center",border:"1px solid #999",cursor:"pointer",background:"#fff",color:"#333",zIndex:10001};b.appendChild(m.createTextNode("-"));
-b.onclick=bb;b.title="Toggle SM2 debug console";t.match(/msie 6/i)&&(b.style.position="absolute",b.style.cursor="hand");for(a in d)d.hasOwnProperty(a)&&(b.style[a]=d[a]);d=m.createElement("div");d.id=c.debugID;d.style.display=c.debugMode?"block":"none";if(c.debugMode&&!A(b.id)){try{e=ka(),e.appendChild(b)}catch(f){throw Error(r("domError")+" \n"+f.toString());}e.appendChild(d)}}};v=this.getSoundById;p=function(b,d){return!b?"":c._wD(r(b),d)};bb=function(){var b=A(c.debugID),d=A(c.debugID+"-toggle");
-if(!b)return!1;za?(d.innerHTML="+",b.style.display="none"):(d.innerHTML="-",b.style.display="block");za=!za};C=function(b,c,e){if(h.sm2Debugger!==g)try{sm2Debugger.handleEvent(b,c,e)}catch(a){return!1}return!0};T=function(){var b=[];c.debugMode&&b.push("sm2_debug");c.debugFlash&&b.push("flash_debug");c.useHighPerformance&&b.push("high_performance");return b.join(" ")};Ia=function(){var b=r("fbHandler"),d=c.getMoviePercent(),e={type:"FLASHBLOCK"};if(c.html5Only)return!1;c.ok()?(c.didFlashBlock&&c._wD(b+
-": Unblocked"),c.oMC&&(c.oMC.className=[T(),"movieContainer","swf_loaded"+(c.didFlashBlock?" swf_unblocked":"")].join(" "))):(u&&(c.oMC.className=T()+" movieContainer "+(null===d?"swf_timedout":"swf_error"),c._wD(b+": "+r("fbTimeout")+(d?" ("+r("fbLoaded")+")":""))),c.didFlashBlock=!0,M({type:"ontimeout",ignoreInit:!0,error:e}),S(e))};Ba=function(b,c,e){F[b]===g&&(F[b]=[]);F[b].push({method:c,scope:e||null,fired:!1})};M=function(b){b||(b={type:c.ok()?"onready":"ontimeout"});if(!q&&b&&!b.ignoreInit||
-"ontimeout"===b.type&&(c.ok()||y&&!b.ignoreInit))return!1;var d={success:b&&b.ignoreInit?c.ok():!y},e=b&&b.type?F[b.type]||[]:[],a=[],f,d=[d],g=u&&!c.ok();b.error&&(d[0].error=b.error);b=0;for(f=e.length;b<f;b++)!0!==e[b].fired&&a.push(e[b]);if(a.length){b=0;for(f=a.length;b<f;b++)a[b].scope?a[b].method.apply(a[b].scope,d):a[b].method.apply(this,d),g||(a[b].fired=!0)}return!0};P=function(){h.setTimeout(function(){c.useFlashBlock&&Ia();M();"function"===typeof c.onload&&(p("onload",1),c.onload.apply(h),
-p("onloadOK",1));c.waitForWindowLoad&&w.add(h,"load",P)},1)};Ma=function(){if(H!==g)return H;var b=!1,c=navigator,e=c.plugins,a,f=h.ActiveXObject;if(e&&e.length)(c=c.mimeTypes)&&(c["application/x-shockwave-flash"]&&c["application/x-shockwave-flash"].enabledPlugin&&c["application/x-shockwave-flash"].enabledPlugin.description)&&(b=!0);else if(f!==g&&!t.match(/MSAppHost/i)){try{a=new f("ShockwaveFlash.ShockwaveFlash")}catch(m){a=null}b=!!a}return H=b};fb=function(){var b,d,e=c.audioFormats;if(ca&&t.match(/os (1|2|3_0|3_1)/i))c.hasHTML5=
-!1,c.html5Only=!0,c.oMC&&(c.oMC.style.display="none");else if(c.useHTML5Audio){if(!c.html5||!c.html5.canPlayType)c._wD("SoundManager: No HTML5 Audio() support detected."),c.hasHTML5=!1;Qa&&c._wD("soundManager: Note: Buggy HTML5 Audio in Safari on this OS X release, see https://bugs.webkit.org/show_bug.cgi?id\x3d32159 - "+(!H?" would use flash fallback for MP3/MP4, but none detected.":"will use flash fallback for MP3/MP4, if available"),1)}if(c.useHTML5Audio&&c.hasHTML5)for(d in qa=!0,e)if(e.hasOwnProperty(d)&&
-e[d].required)if(c.html5.canPlayType(e[d].type)){if(c.preferFlash&&(c.flash[d]||c.flash[e[d].type]))b=!0}else qa=!1,b=!0;c.ignoreFlash&&(b=!1,qa=!0);c.html5Only=c.hasHTML5&&c.useHTML5Audio&&!b;return!c.html5Only};pa=function(b){var d,e,a=0;if(b instanceof Array){d=0;for(e=b.length;d<e;d++)if(b[d]instanceof Object){if(c.canPlayMIME(b[d].type)){a=d;break}}else if(c.canPlayURL(b[d])){a=d;break}b[a].url&&(b[a]=b[a].url);b=b[a]}return b};cb=function(b){b._hasTimer||(b._hasTimer=!0,!Pa&&c.html5PollingInterval&&
-(null===aa&&0===oa&&(aa=setInterval(eb,c.html5PollingInterval)),oa++))};db=function(b){b._hasTimer&&(b._hasTimer=!1,!Pa&&c.html5PollingInterval&&oa--)};eb=function(){var b;if(null!==aa&&!oa)return clearInterval(aa),aa=null,!1;for(b=c.soundIDs.length-1;0<=b;b--)c.sounds[c.soundIDs[b]].isHTML5&&c.sounds[c.soundIDs[b]]._hasTimer&&c.sounds[c.soundIDs[b]]._onTimer()};S=function(b){b=b!==g?b:{};"function"===typeof c.onerror&&c.onerror.apply(h,[{type:b.type!==g?b.type:null}]);b.fatal!==g&&b.fatal&&c.disable()};
-ib=function(){if(!Qa||!Ma())return!1;var b=c.audioFormats,d,e;for(e in b)if(b.hasOwnProperty(e)&&("mp3"===e||"mp4"===e))if(c._wD("soundManager: Using flash fallback for "+e+" format"),c.html5[e]=!1,b[e]&&b[e].related)for(d=b[e].related.length-1;0<=d;d--)c.html5[b[e].related[d]]=!1};this._setSandboxType=function(b){var d=c.sandbox;d.type=b;d.description=d.types[d.types[b]!==g?b:"unknown"];"localWithFile"===d.type?(d.noRemote=!0,d.noLocal=!1,p("secNote",2)):"localWithNetwork"===d.type?(d.noRemote=!1,
-d.noLocal=!0):"localTrusted"===d.type&&(d.noRemote=!1,d.noLocal=!1)};this._externalInterfaceOK=function(b){if(c.swfLoaded)return!1;var d;C("swf",!0);C("flashtojs",!0);c.swfLoaded=!0;va=!1;Qa&&ib();if(!b||b.replace(/\+dev/i,"")!==c.versionNumber.replace(/\+dev/i,""))return d='soundManager: Fatal: JavaScript file build "'+c.versionNumber+'" does not match Flash SWF build "'+b+'" at '+c.url+". Ensure both are up-to-date.",setTimeout(function(){throw Error(d);},0),!1;setTimeout(ya,L?100:1)};la=function(b,
-d){function e(){var a=[],b,d=[];b="SoundManager "+c.version+(!c.html5Only&&c.useHTML5Audio?c.hasHTML5?" + HTML5 audio":", no HTML5 audio support":"");c.html5Only?c.html5PollingInterval&&a.push("html5PollingInterval ("+c.html5PollingInterval+"ms)"):(c.preferFlash&&a.push("preferFlash"),c.useHighPerformance&&a.push("useHighPerformance"),c.flashPollingInterval&&a.push("flashPollingInterval ("+c.flashPollingInterval+"ms)"),c.html5PollingInterval&&a.push("html5PollingInterval ("+c.html5PollingInterval+
-"ms)"),c.wmode&&a.push("wmode ("+c.wmode+")"),c.debugFlash&&a.push("debugFlash"),c.useFlashBlock&&a.push("flashBlock"));a.length&&(d=d.concat([a.join(" + ")]));c._wD(b+(d.length?" + "+d.join(", "):""),1);jb()}function a(a,b){return'\x3cparam name\x3d"'+a+'" value\x3d"'+b+'" /\x3e'}if(V&&W)return!1;if(c.html5Only)return Ca(),e(),c.oMC=A(c.movieID),ya(),W=V=!0,!1;var f=d||c.url,h=c.altURL||f,k=ka(),l=T(),n=null,n=m.getElementsByTagName("html")[0],p,s,q,n=n&&n.dir&&n.dir.match(/rtl/i);b=b===g?c.id:b;
-Ca();c.url=ab(ea?f:h);d=c.url;c.wmode=!c.wmode&&c.useHighPerformance?"transparent":c.wmode;if(null!==c.wmode&&(t.match(/msie 8/i)||!L&&!c.useHighPerformance)&&navigator.platform.match(/win32|win64/i))N.push(I.spcWmode),c.wmode=null;k={name:b,id:b,src:d,quality:"high",allowScriptAccess:c.allowScriptAccess,bgcolor:c.bgColor,pluginspage:ob+"www.macromedia.com/go/getflashplayer",title:"JS/Flash audio component (SoundManager 2)",type:"application/x-shockwave-flash",wmode:c.wmode,hasPriority:"true"};c.debugFlash&&
-(k.FlashVars="debug\x3d1");c.wmode||delete k.wmode;if(L)f=m.createElement("div"),s=['\x3cobject id\x3d"'+b+'" data\x3d"'+d+'" type\x3d"'+k.type+'" title\x3d"'+k.title+'" classid\x3d"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase\x3d"'+ob+'download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version\x3d6,0,40,0"\x3e',a("movie",d),a("AllowScriptAccess",c.allowScriptAccess),a("quality",k.quality),c.wmode?a("wmode",c.wmode):"",a("bgcolor",c.bgColor),a("hasPriority","true"),c.debugFlash?
-a("FlashVars",k.FlashVars):"","\x3c/object\x3e"].join("");else for(p in f=m.createElement("embed"),k)k.hasOwnProperty(p)&&f.setAttribute(p,k[p]);Fa();l=T();if(k=ka())if(c.oMC=A(c.movieID)||m.createElement("div"),c.oMC.id)q=c.oMC.className,c.oMC.className=(q?q+" ":"movieContainer")+(l?" "+l:""),c.oMC.appendChild(f),L&&(p=c.oMC.appendChild(m.createElement("div")),p.className="sm2-object-box",p.innerHTML=s),W=!0;else{c.oMC.id=c.movieID;c.oMC.className="movieContainer "+l;p=l=null;c.useFlashBlock||(c.useHighPerformance?
-l={position:"fixed",width:"8px",height:"8px",bottom:"0px",left:"0px",overflow:"hidden"}:(l={position:"absolute",width:"6px",height:"6px",top:"-9999px",left:"-9999px"},n&&(l.left=Math.abs(parseInt(l.left,10))+"px")));tb&&(c.oMC.style.zIndex=1E4);if(!c.debugFlash)for(q in l)l.hasOwnProperty(q)&&(c.oMC.style[q]=l[q]);try{L||c.oMC.appendChild(f),k.appendChild(c.oMC),L&&(p=c.oMC.appendChild(m.createElement("div")),p.className="sm2-object-box",p.innerHTML=s),W=!0}catch(u){throw Error(r("domError")+" \n"+
-u.toString());}}V=!0;e();return!0};ja=function(){if(c.html5Only)return la(),!1;if(k)return!1;if(!c.url)return p("noURL"),!1;k=c.getMovie(c.id);k||(Z?(L?c.oMC.innerHTML=Ha:c.oMC.appendChild(Z),Z=null,V=!0):la(c.id,c.url),k=c.getMovie(c.id));"function"===typeof c.oninitmovie&&setTimeout(c.oninitmovie,1);Na();return!0};Q=function(){setTimeout(Xa,1E3)};Xa=function(){var b,d=!1;if(!c.url||$)return!1;$=!0;w.remove(h,"load",Q);if(va&&!Ra)return p("waitFocus"),!1;q||(b=c.getMoviePercent(),0<b&&100>b&&(d=
-!0));setTimeout(function(){b=c.getMoviePercent();if(d)return $=!1,c._wD(r("waitSWF")),h.setTimeout(Q,1),!1;q||(c._wD("soundManager: No Flash response within expected time. Likely causes: "+(0===b?"SWF load failed, ":"")+"Flash blocked or JS-Flash security error."+(c.debugFlash?" "+r("checkSWF"):""),2),!ea&&b&&(p("localFail",2),c.debugFlash||p("tryDebug",2)),0===b&&c._wD(r("swf404",c.url),1),C("flashtojs",!1,": Timed out"+ea?" (Check flash security or flash blockers)":" (No plugin/missing SWF?)"));
-!q&&mb&&(null===b?c.useFlashBlock||0===c.flashLoadTimeout?(c.useFlashBlock&&Ia(),p("waitForever")):!c.useFlashBlock&&qa?h.setTimeout(function(){J("soundManager: useFlashBlock is false, 100% HTML5 mode is possible. Rebooting with preferFlash: false...");c.setup({preferFlash:!1}).reboot();c.didFlashBlock=!0;c.beginDelayedInit()},1):(p("waitForever"),M({type:"ontimeout",ignoreInit:!0})):0===c.flashLoadTimeout?p("waitForever"):Ga(!0))},c.flashLoadTimeout)};ia=function(){if(Ra||!va)return w.remove(h,"focus",
-ia),!0;Ra=mb=!0;p("gotFocus");$=!1;Q();w.remove(h,"focus",ia);return!0};Na=function(){N.length&&(c._wD("SoundManager 2: "+N.join(" "),1),N=[])};jb=function(){Na();var b,d=[];if(c.useHTML5Audio&&c.hasHTML5){for(b in c.audioFormats)c.audioFormats.hasOwnProperty(b)&&d.push(b+" \x3d "+c.html5[b]+(!c.html5[b]&&u&&c.flash[b]?" (using flash)":c.preferFlash&&c.flash[b]&&u?" (preferring flash)":!c.html5[b]?" ("+(c.audioFormats[b].required?"required, ":"")+"and no flash support)":""));c._wD("SoundManager 2 HTML5 support: "+
-d.join(", "),1)}};X=function(b){if(q)return!1;if(c.html5Only)return p("sm2Loaded"),q=!0,P(),C("onload",!0),!0;var d=!0,e;if(!c.useFlashBlock||!c.flashLoadTimeout||c.getMoviePercent())q=!0,y&&(e={type:!H&&u?"NO_FLASH":"INIT_TIMEOUT"});c._wD("SoundManager 2 "+(y?"failed to load":"loaded")+" ("+(y?"Flash security/load error":"OK")+")",y?2:1);y||b?(c.useFlashBlock&&c.oMC&&(c.oMC.className=T()+" "+(null===c.getMoviePercent()?"swf_timedout":"swf_error")),M({type:"ontimeout",error:e,ignoreInit:!0}),C("onload",
-!1),S(e),d=!1):C("onload",!0);y||(c.waitForWindowLoad&&!ha?(p("waitOnload"),w.add(h,"load",P)):(c.waitForWindowLoad&&ha&&p("docLoaded"),P()));return d};Wa=function(){var b,d=c.setupOptions;for(b in d)d.hasOwnProperty(b)&&(c[b]===g?c[b]=d[b]:c[b]!==d[b]&&(c.setupOptions[b]=c[b]))};ya=function(){if(q)return p("didInit"),!1;if(c.html5Only)return q||(w.remove(h,"load",c.beginDelayedInit),c.enabled=!0,X()),!0;ja();try{k._externalInterfaceTest(!1),Ya(!0,c.flashPollingInterval||(c.useHighPerformance?10:
-50)),c.debugMode||k._disableDebug(),c.enabled=!0,C("jstoflash",!0),c.html5Only||w.add(h,"unload",xa)}catch(b){return c._wD("js/flash exception: "+b.toString()),C("jstoflash",!1),S({type:"JS_TO_FLASH_EXCEPTION",fatal:!0}),Ga(!0),X(),!1}X();w.remove(h,"load",c.beginDelayedInit);return!0};R=function(){if(Y)return!1;Y=!0;Wa();Fa();var b=null,b=null,d=U.toLowerCase();-1!==d.indexOf("sm2-usehtml5audio\x3d")&&(b="1"===d.charAt(d.indexOf("sm2-usehtml5audio\x3d")+18),da&&console.log((b?"Enabling ":"Disabling ")+
-"useHTML5Audio via URL parameter"),c.setup({useHTML5Audio:b}));-1!==d.indexOf("sm2-preferflash\x3d")&&(b="1"===d.charAt(d.indexOf("sm2-preferflash\x3d")+16),da&&console.log((b?"Enabling ":"Disabling ")+"preferFlash via URL parameter"),c.setup({preferFlash:b}));!H&&c.hasHTML5&&(c._wD("SoundManager: No Flash detected"+(!c.useHTML5Audio?", enabling HTML5.":". Trying HTML5-only mode."),1),c.setup({useHTML5Audio:!0,preferFlash:!1}));gb();!H&&u&&(N.push(I.needFlash),c.setup({flashLoadTimeout:1}));m.removeEventListener&&
-m.removeEventListener("DOMContentLoaded",R,!1);ja();return!0};Ka=function(){"complete"===m.readyState&&(R(),m.detachEvent("onreadystatechange",Ka));return!0};Ea=function(){ha=!0;w.remove(h,"load",Ea)};Da=function(){if(Pa&&((!c.setupOptions.useHTML5Audio||c.setupOptions.preferFlash)&&N.push(I.mobileUA),c.setupOptions.useHTML5Audio=!0,c.setupOptions.preferFlash=!1,ca||lb&&!t.match(/android\s2\.3/i)))N.push(I.globalHTML5),ca&&(c.ignoreFlash=!0),E=!0};Da();Ma();w.add(h,"focus",ia);w.add(h,"load",Q);w.add(h,
-"load",Ea);m.addEventListener?m.addEventListener("DOMContentLoaded",R,!1):m.attachEvent?m.attachEvent("onreadystatechange",Ka):(C("onload",!1),S({type:"NO_DOM2_EVENTS",fatal:!0}))}var wa=null;if(void 0===h.SM2_DEFER||!SM2_DEFER)wa=new fa;h.SoundManager=fa;h.soundManager=wa})(window);
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/html/war/soundmanager2-setup.js b/adventure-composer/src/main/resources/projectTmpl/html/war/soundmanager2-setup.js
deleted file mode 100644
index 4d0ac6630..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/html/war/soundmanager2-setup.js
+++ /dev/null
@@ -1 +0,0 @@
-window.SM2_DEFER = true;
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/html/war/styles.css b/adventure-composer/src/main/resources/projectTmpl/html/war/styles.css
deleted file mode 100644
index f823a7a98..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/html/war/styles.css
+++ /dev/null
@@ -1,91 +0,0 @@
-canvas {
-    cursor: default;
-    outline: none;
-}
-
-body {
-    background-color: #ffffff;
-}
-
-.superdev {
-	background-color:#3bb3e0;
-	font-family: 'Open Sans', sans-serif;
-	font-size:12px;
-	text-decoration:none;
-	color:#fff;
-	position:relative;
-	padding:10px 20px;
-	padding-right:50px;
-	background-image: linear-gradient(bottom, rgb(44,160,202) 0%, rgb(62,184,229) 100%);
-	background-image: -o-linear-gradient(bottom, rgb(44,160,202) 0%, rgb(62,184,229) 100%);
-	background-image: -moz-linear-gradient(bottom, rgb(44,160,202) 0%, rgb(62,184,229) 100%);
-	background-image: -webkit-linear-gradient(bottom, rgb(44,160,202) 0%, rgb(62,184,229) 100%);
-	background-image: -ms-linear-gradient(bottom, rgb(44,160,202) 0%, rgb(62,184,229) 100%);
-	background-image: -webkit-gradient(
-	linear,
-	left bottom,
-	left top,
-	color-stop(0, rgb(44,160,202)),
-	color-stop(1, rgb(62,184,229))
-	);
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	-o-border-radius: 5px;
-	border-radius: 5px;
-	-webkit-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 5px 0px 0px #156785, 0px 10px 5px #999;
-	-moz-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 5px 0px 0px #156785, 0px 10px 5px #999;
-	-o-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 5px 0px 0px #156785, 0px 10px 5px #999;
-	box-shadow: inset 0px 1px 0px #2ab7ec, 0px 5px 0px 0px #156785, 0px 10px 5px #999;
-}
-
-.superdev:active {
-	top:3px;
-	background-image: linear-gradient(bottom, rgb(62,184,229) 0%, rgb(44,160,202) 100%);
-	background-image: -o-linear-gradient(bottom, rgb(62,184,229) 0%, rgb(44,160,202) 100%);
-	background-image: -moz-linear-gradient(bottom, rgb(62,184,229) 0%, rgb(44,160,202) 100%);
-	background-image: -webkit-linear-gradient(bottom, rgb(62,184,229) 0%, rgb(44,160,202) 100%);
-	background-image: -ms-linear-gradient(bottom, rgb(62,184,229) 0%, rgb(44,160,202) 100%);
-	background-image: -webkit-gradient(
-	linear,
-	left bottom,
-	left top,
-	color-stop(0, rgb(62,184,229)),
-	color-stop(1, rgb(44,160,202))
-	);
-	-webkit-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 2px 0px 0px #156785, 0px 5px 3px #999;
-	-moz-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 2px 0px 0px #156785, 0px 5px 3px #999;
-	-o-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 2px 0px 0px #156785, 0px 5px 3px #999;
-	box-shadow: inset 0px 1px 0px #2ab7ec, 0px 2px 0px 0px #156785, 0px 5px 3px #999;
-}
-
-.superdev::before {
-	background-color:#2591b4;
-	background-image:url(refresh.png);
-    background-size: 12px;
-	background-repeat:no-repeat;
-	background-position:center center;
-	content:"";
-	width:20px;
-	height:20px;
-	position:absolute;
-	right:15px;
-	top:50%;
-	margin-top:-9px;
-	-webkit-border-radius: 50%;
-	-moz-border-radius: 50%;
-	-o-border-radius: 50%;
-	border-radius: 50%;
-	-webkit-box-shadow: inset 0px 1px 0px #052756, 0px 1px 0px #60c9f0;
-	-moz-box-shadow: inset 0px 1px 0px #052756, 0px 1px 0px #60c9f0;
-	-o-box-shadow: inset 0px 1px 0px #052756, 0px 1px 0px #60c9f0;
-	box-shadow: inset 0px 1px 0px #052756, 0px 1px 0px #60c9f0;
-}
-
-.superdev:active::before {
-	top:50%;
-	margin-top:-12px;
-	-webkit-box-shadow: inset 0px 1px 0px #60c9f0, 0px 3px 0px #0e3871, 0px 6px 3px #1a80a6;
-	-moz-box-shadow: inset 0px 1px 0px #60c9f0, 0px 3px 0px #0e3871, 0px 6px 3px #1a80a6;
-	-o-box-shadow: inset 0px 1px 0px #60c9f0, 0px 3px 0px #0e3871, 0px 6px 3px #1a80a6;
-	box-shadow: inset 0px 1px 0px #60c9f0, 0px 3px 0px #0e3871, 0px 6px 3px #1a80a6;
-}
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/Info.plist.xml b/adventure-composer/src/main/resources/projectTmpl/ios/Info.plist.xml
deleted file mode 100644
index 407bec75c..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/ios/Info.plist.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>en</string>
-    <key>CFBundleDisplayName</key>
-    <string>${app.name}</string>
-    <key>CFBundleExecutable</key>
-    <string>${app.executable}</string>
-    <key>CFBundleIdentifier</key>
-    <string>${app.id}</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleName</key>
-    <string>${app.name}</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleShortVersionString</key>
-    <string>${app.version}</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>CFBundleVersion</key>
-    <string>${app.build}</string>
-    <key>LSRequiresIPhoneOS</key>
-    <true/>
-    <key>UIViewControllerBasedStatusBarAppearance</key>
-    <false/>
-    <key>UIStatusBarHidden</key>
-    <true/>
-    <key>UIDeviceFamily</key>
-    <array>
-        <integer>1</integer>
-        <integer>2</integer>
-    </array>
-    <key>UIRequiredDeviceCapabilities</key>
-    <array>
-        <string>armv7</string>
-        <string>opengles-2</string>
-    </array>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-        <string>UIInterfaceOrientationPortrait</string>
-        <string>UIInterfaceOrientationLandscapeLeft</string>
-        <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>CFBundleIcons</key>
-    <dict>
-        <key>CFBundlePrimaryIcon</key>
-        <dict>
-            <key>CFBundleIconFiles</key>
-            <array>
-                <string>Icon</string>
-                <string>Icon-72</string>
-            </array>
-        </dict>
-    </dict>
-</dict>
-</plist>
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/build.gradle b/adventure-composer/src/main/resources/projectTmpl/ios/build.gradle
deleted file mode 100644
index 8261aec35..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/ios/build.gradle
+++ /dev/null
@@ -1,65 +0,0 @@
-sourceSets.main.java.srcDirs = [ "src/" ]
-
-sourceCompatibility = '1.7'
-[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-
-ext {
-	mainClassName = "%PACKAGE%.ios.IOSLauncher"
-}
-
-// Extracts native libs (*.a) from the native-ios.jar and places them
-// under build/libs/ios/.
-task copyNatives << {
-  file("build/libs/ios/").mkdirs();
-  configurations.natives.files.each { jar ->
-    def outputDir = null
-    if (jar.name.endsWith("natives-ios.jar")) outputDir = file("build/libs/ios")
-    if (outputDir != null) {
-      copy {
-        from zipTree(jar)
-        into outputDir
-        include "*.a"
-      }
-    }
-  }
-}
-
-// Updates a robovm.xml file.
-task updateRoboVMXML << {
-  def xml = file('robovm.xml')
-
-  if (!xml.exists()) {
-    return
-  }
-  
-  // Find all native (*.a) libraries beneath libs
-  def libtree = fileTree(dir: 'build/libs', include: '**/*.a')
-  
-  def config = new groovy.util.XmlParser().parse(xml)
-  config.libs.each {libs ->
-      libs.children().clear()
-      libtree.each { File file ->
-          libs.appendNode('lib', 'build/libs/ios/' + file.getName())
-      }
-  }
-  
-  def writer = new FileWriter(xml)
-  def printer = new XmlNodePrinter(new PrintWriter(writer))
-  printer.setPreserveWhitespace true
-  printer.print(config)
-}
-
-updateRoboVMXML.dependsOn copyNatives
-build.dependsOn updateRoboVMXML
-tasks.eclipse.dependsOn updateRoboVMXML
-
-launchIPhoneSimulator.dependsOn build
-launchIPadSimulator.dependsOn build
-launchIOSDevice.dependsOn build
-createIPA.dependsOn build
-
-
-eclipse.project {
-    name = appName + "-ios"
-    natures 'org.robovm.eclipse.RoboVMNature'
-}
\ No newline at end of file
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/data/Default-568h@2x.png b/adventure-composer/src/main/resources/projectTmpl/ios/data/Default-568h@2x.png
deleted file mode 100644
index 101752fe7..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/ios/data/Default-568h@2x.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/data/Default.png b/adventure-composer/src/main/resources/projectTmpl/ios/data/Default.png
deleted file mode 100644
index f1a5582a0..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/ios/data/Default.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/data/Default@2x.png b/adventure-composer/src/main/resources/projectTmpl/ios/data/Default@2x.png
deleted file mode 100644
index ca32f62fc..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/ios/data/Default@2x.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/data/Default@2x~ipad.png b/adventure-composer/src/main/resources/projectTmpl/ios/data/Default@2x~ipad.png
deleted file mode 100644
index bb77ef073..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/ios/data/Default@2x~ipad.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/data/Default~ipad.png b/adventure-composer/src/main/resources/projectTmpl/ios/data/Default~ipad.png
deleted file mode 100644
index 855e4f2ad..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/ios/data/Default~ipad.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon-72.png b/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon-72.png
deleted file mode 100644
index 09d798646..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon-72.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon-72@2x.png b/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon-72@2x.png
deleted file mode 100644
index 055c737ad..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon-72@2x.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon.png b/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon.png
deleted file mode 100644
index 7f4bf3635..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon@2x.png b/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon@2x.png
deleted file mode 100644
index eddc17c57..000000000
Binary files a/adventure-composer/src/main/resources/projectTmpl/ios/data/Icon@2x.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/robovm.xml b/adventure-composer/src/main/resources/projectTmpl/ios/robovm.xml
deleted file mode 100644
index a38af629c..000000000
--- a/adventure-composer/src/main/resources/projectTmpl/ios/robovm.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<config>
-  <executableName>${app.executable}</executableName>
-  <mainClass>${app.mainclass}</mainClass>
-  <os>ios</os>
-  <arch>thumbv7</arch>
-  <target>ios</target>
-  <iosInfoPList>Info.plist.xml</iosInfoPList>
-  <resources>
-    <resource>
-      <directory>../%ASSET_PATH%</directory>
-      <includes>
-        <include>**</include>
-      </includes>
-      <skipPngCrush>true</skipPngCrush>
-    </resource>
-    <resource>
-      <directory>data</directory>
-    </resource>
-  </resources>
-  <forceLinkClasses>
-    <pattern>com.badlogic.gdx.scenes.scene2d.ui.*</pattern>
-    <pattern>com.badlogic.gdx.physics.bullet.**</pattern>
-	<pattern>com.android.okhttp.HttpHandler</pattern>
-    <pattern>com.android.okhttp.HttpsHandler</pattern>
-    <pattern>com.android.org.conscrypt.**</pattern>
-    <pattern>com.android.org.bouncycastle.jce.provider.BouncyCastleProvider</pattern>
-    <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.BC$Mappings</pattern>
-    <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi</pattern>
-    <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std</pattern>
-    <pattern>com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi</pattern>
-    <pattern>com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL</pattern>
-    <pattern>org.apache.harmony.security.provider.cert.DRLCertFactory</pattern>
-    <pattern>org.apache.harmony.security.provider.crypto.CryptoProvider</pattern>
-  </forceLinkClasses>
-  <libs>      
-  </libs>
-  <frameworks>
-    <framework>UIKit</framework>
-    <framework>OpenGLES</framework>
-    <framework>QuartzCore</framework>
-    <framework>CoreGraphics</framework>
-    <framework>OpenAL</framework>
-    <framework>AudioToolbox</framework>
-    <framework>AVFoundation</framework>
-  </frameworks>
-</config>
diff --git a/adventure-composer/src/main/resources/skin/BladeSkin/BladeSkin-ldpi.png b/adventure-composer/src/main/resources/skin/BladeSkin/BladeSkin-ldpi.png
deleted file mode 100644
index 9b234d4ed..000000000
Binary files a/adventure-composer/src/main/resources/skin/BladeSkin/BladeSkin-ldpi.png and /dev/null differ
diff --git a/adventure-composer/src/main/resources/skin/BladeSkin/ubuntu-light-12.fnt b/adventure-composer/src/main/resources/skin/BladeSkin/ubuntu-light-12.fnt
deleted file mode 100644
index d8d22087e..000000000
--- a/adventure-composer/src/main/resources/skin/BladeSkin/ubuntu-light-12.fnt
+++ /dev/null
@@ -1,267 +0,0 @@
-info face=Ubuntu Light size=12 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=0 aa=1 padding=0,0,0,0 spacing=1,1
-common lineHeight=15 base=12 scaleW=1024 scaleH=1024 pages=1 packed=0
-page id=0 file=ubuntu-light-12_00.png
-chars count=190
-char id=33 x=890 y=0 width=4 height=11 xoffset=-1 yoffset=2 xadvance=3 page=0 chnl=0
-char id=34 x=602 y=12 width=4 height=5 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=0
-char id=35 x=943 y=0 width=9 height=10 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=36 x=229 y=0 width=7 height=13 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=37 x=516 y=0 width=11 height=11 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=38 x=610 y=0 width=9 height=11 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=39 x=590 y=12 width=2 height=5 xoffset=0 yoffset=1 xadvance=3 page=0 chnl=0
-char id=40 x=104 y=0 width=4 height=14 xoffset=0 yoffset=1 xadvance=4 page=0 chnl=0
-char id=41 x=109 y=0 width=4 height=14 xoffset=-1 yoffset=1 xadvance=4 page=0 chnl=0
-char id=42 x=682 y=12 width=7 height=7 xoffset=-1 yoffset=2 xadvance=6 page=0 chnl=0
-char id=43 x=771 y=12 width=8 height=8 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=44 x=593 y=12 width=3 height=5 xoffset=-1 yoffset=9 xadvance=3 page=0 chnl=0
-char id=45 x=533 y=12 width=5 height=2 xoffset=-1 yoffset=7 xadvance=5 page=0 chnl=0
-char id=46 x=570 y=12 width=4 height=4 xoffset=-1 yoffset=9 xadvance=3 page=0 chnl=0
-char id=47 x=60 y=0 width=7 height=14 xoffset=-2 yoffset=1 xadvance=4 page=0 chnl=0
-char id=48 x=640 y=0 width=8 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=49 x=904 y=11 width=5 height=10 xoffset=0 yoffset=2 xadvance=7 page=0 chnl=0
-char id=50 x=963 y=11 width=7 height=10 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=51 x=703 y=0 width=7 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=52 x=973 y=0 width=8 height=10 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=53 x=711 y=0 width=7 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=54 x=649 y=0 width=8 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=55 x=955 y=11 width=7 height=10 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=56 x=719 y=0 width=7 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=57 x=727 y=0 width=7 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=58 x=803 y=12 width=4 height=9 xoffset=-1 yoffset=4 xadvance=3 page=0 chnl=0
-char id=59 x=893 y=12 width=4 height=10 xoffset=-1 yoffset=4 xadvance=3 page=0 chnl=0
-char id=60 x=762 y=12 width=8 height=8 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=61 x=629 y=12 width=8 height=6 xoffset=-1 yoffset=5 xadvance=7 page=0 chnl=0
-char id=62 x=753 y=12 width=8 height=8 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=63 x=823 y=0 width=6 height=11 xoffset=-1 yoffset=2 xadvance=5 page=0 chnl=0
-char id=64 x=291 y=0 width=12 height=12 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=65 x=953 y=0 width=9 height=10 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=66 x=735 y=0 width=7 height=11 xoffset=0 yoffset=2 xadvance=8 page=0 chnl=0
-char id=67 x=658 y=0 width=8 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=68 x=667 y=0 width=8 height=11 xoffset=0 yoffset=2 xadvance=8 page=0 chnl=0
-char id=69 x=947 y=11 width=7 height=10 xoffset=0 yoffset=2 xadvance=7 page=0 chnl=0
-char id=70 x=924 y=11 width=6 height=10 xoffset=0 yoffset=2 xadvance=6 page=0 chnl=0
-char id=71 x=620 y=0 width=9 height=11 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=72 x=982 y=0 width=8 height=10 xoffset=0 yoffset=2 xadvance=8 page=0 chnl=0
-char id=73 x=886 y=12 width=2 height=10 xoffset=0 yoffset=2 xadvance=3 page=0 chnl=0
-char id=74 x=830 y=0 width=6 height=11 xoffset=-1 yoffset=2 xadvance=6 page=0 chnl=0
-char id=75 x=991 y=0 width=8 height=10 xoffset=0 yoffset=2 xadvance=7 page=0 chnl=0
-char id=76 x=917 y=11 width=6 height=10 xoffset=0 yoffset=2 xadvance=6 page=0 chnl=0
-char id=77 x=931 y=0 width=11 height=10 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=78 x=1000 y=0 width=8 height=10 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=0
-char id=79 x=588 y=0 width=10 height=11 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=80 x=939 y=11 width=7 height=10 xoffset=0 yoffset=2 xadvance=7 page=0 chnl=0
-char id=81 x=130 y=0 width=10 height=13 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=82 x=1009 y=0 width=8 height=10 xoffset=0 yoffset=2 xadvance=7 page=0 chnl=0
-char id=83 x=743 y=0 width=7 height=11 xoffset=-1 yoffset=2 xadvance=6 page=0 chnl=0
-char id=84 x=1016 y=11 width=8 height=10 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=85 x=676 y=0 width=8 height=11 xoffset=0 yoffset=2 xadvance=8 page=0 chnl=0
-char id=86 x=963 y=0 width=9 height=10 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=87 x=905 y=0 width=12 height=10 xoffset=-1 yoffset=2 xadvance=13 page=0 chnl=0
-char id=88 x=1007 y=11 width=8 height=10 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=89 x=998 y=11 width=8 height=10 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=90 x=989 y=11 width=8 height=10 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=91 x=114 y=0 width=4 height=14 xoffset=0 yoffset=1 xadvance=4 page=0 chnl=0
-char id=92 x=68 y=0 width=7 height=14 xoffset=-2 yoffset=1 xadvance=4 page=0 chnl=0
-char id=93 x=119 y=0 width=4 height=14 xoffset=-1 yoffset=1 xadvance=4 page=0 chnl=0
-char id=94 x=699 y=12 width=8 height=7 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=95 x=551 y=12 width=8 height=3 xoffset=-2 yoffset=12 xadvance=6 page=0 chnl=0
-char id=96 x=575 y=12 width=5 height=4 xoffset=-1 yoffset=1 xadvance=5 page=0 chnl=0
-char id=97 x=839 y=12 width=7 height=9 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
-char id=98 x=379 y=0 width=7 height=12 xoffset=0 yoffset=1 xadvance=7 page=0 chnl=0
-char id=99 x=831 y=12 width=7 height=9 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
-char id=100 x=387 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=101 x=823 y=12 width=7 height=9 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=102 x=872 y=0 width=5 height=11 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=0
-char id=103 x=751 y=0 width=7 height=11 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=104 x=837 y=0 width=6 height=11 xoffset=0 yoffset=1 xadvance=7 page=0 chnl=0
-char id=105 x=889 y=12 width=3 height=10 xoffset=-1 yoffset=2 xadvance=3 page=0 chnl=0
-char id=106 x=281 y=0 width=4 height=13 xoffset=-2 yoffset=2 xadvance=3 page=0 chnl=0
-char id=107 x=844 y=0 width=6 height=11 xoffset=0 yoffset=1 xadvance=6 page=0 chnl=0
-char id=108 x=512 y=0 width=3 height=12 xoffset=0 yoffset=1 xadvance=4 page=0 chnl=0
-char id=109 x=780 y=12 width=10 height=8 xoffset=0 yoffset=4 xadvance=11 page=0 chnl=0
-char id=110 x=721 y=12 width=6 height=8 xoffset=0 yoffset=4 xadvance=7 page=0 chnl=0
-char id=111 x=865 y=12 width=8 height=9 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=112 x=759 y=0 width=7 height=11 xoffset=0 yoffset=4 xadvance=7 page=0 chnl=0
-char id=113 x=767 y=0 width=7 height=11 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=114 x=708 y=12 width=5 height=8 xoffset=0 yoffset=4 xadvance=5 page=0 chnl=0
-char id=115 x=808 y=12 width=6 height=9 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
-char id=116 x=851 y=0 width=6 height=11 xoffset=-1 yoffset=2 xadvance=5 page=0 chnl=0
-char id=117 x=815 y=12 width=7 height=9 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=118 x=736 y=12 width=7 height=8 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=119 x=791 y=12 width=11 height=8 xoffset=-1 yoffset=4 xadvance=11 page=0 chnl=0
-char id=120 x=728 y=12 width=7 height=8 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=121 x=775 y=0 width=7 height=11 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=122 x=714 y=12 width=6 height=8 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
-char id=123 x=92 y=0 width=5 height=14 xoffset=-1 yoffset=1 xadvance=4 page=0 chnl=0
-char id=124 x=124 y=0 width=2 height=14 xoffset=0 yoffset=1 xadvance=3 page=0 chnl=0
-char id=125 x=98 y=0 width=5 height=14 xoffset=-1 yoffset=1 xadvance=4 page=0 chnl=0
-char id=126 x=581 y=12 width=8 height=4 xoffset=-1 yoffset=6 xadvance=7 page=0 chnl=0
-char id=160 x=525 y=12 width=1 height=1 xoffset=-1 yoffset=11 xadvance=3 page=0 chnl=0
-char id=161 x=895 y=0 width=4 height=11 xoffset=-1 yoffset=4 xadvance=3 page=0 chnl=0
-char id=162 x=499 y=0 width=6 height=12 xoffset=0 yoffset=2 xadvance=7 page=0 chnl=0
-char id=163 x=980 y=11 width=8 height=10 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=164 x=690 y=12 width=8 height=7 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=165 x=971 y=11 width=8 height=10 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=166 x=127 y=0 width=2 height=14 xoffset=0 yoffset=1 xadvance=3 page=0 chnl=0
-char id=167 x=395 y=0 width=7 height=12 xoffset=-1 yoffset=2 xadvance=6 page=0 chnl=0
-char id=168 x=545 y=12 width=5 height=3 xoffset=-1 yoffset=2 xadvance=5 page=0 chnl=0
-char id=169 x=528 y=0 width=11 height=11 xoffset=-1 yoffset=2 xadvance=10 page=0 chnl=0
-char id=170 x=655 y=12 width=5 height=7 xoffset=-1 yoffset=2 xadvance=6 page=0 chnl=0
-char id=171 x=675 y=12 width=6 height=7 xoffset=-1 yoffset=5 xadvance=5 page=0 chnl=0
-char id=172 x=620 y=12 width=8 height=6 xoffset=-1 yoffset=6 xadvance=7 page=0 chnl=0
-char id=173 x=527 y=12 width=5 height=2 xoffset=-1 yoffset=7 xadvance=5 page=0 chnl=0
-char id=174 x=540 y=0 width=11 height=11 xoffset=-1 yoffset=2 xadvance=10 page=0 chnl=0
-char id=175 x=539 y=12 width=5 height=3 xoffset=-1 yoffset=2 xadvance=5 page=0 chnl=0
-char id=176 x=607 y=12 width=5 height=5 xoffset=-1 yoffset=1 xadvance=3 page=0 chnl=0
-char id=177 x=856 y=12 width=8 height=9 xoffset=-1 yoffset=3 xadvance=7 page=0 chnl=0
-char id=178 x=649 y=12 width=5 height=7 xoffset=-1 yoffset=2 xadvance=4 page=0 chnl=0
-char id=179 x=643 y=12 width=5 height=7 xoffset=-1 yoffset=2 xadvance=4 page=0 chnl=0
-char id=180 x=565 y=12 width=4 height=4 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=0
-char id=181 x=858 y=0 width=6 height=11 xoffset=0 yoffset=4 xadvance=7 page=0 chnl=0
-char id=182 x=193 y=0 width=8 height=13 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=183 x=560 y=12 width=4 height=4 xoffset=-1 yoffset=6 xadvance=3 page=0 chnl=0
-char id=184 x=597 y=12 width=4 height=5 xoffset=0 yoffset=10 xadvance=5 page=0 chnl=0
-char id=185 x=638 y=12 width=4 height=7 xoffset=-1 yoffset=2 xadvance=4 page=0 chnl=0
-char id=186 x=668 y=12 width=6 height=7 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=187 x=661 y=12 width=6 height=7 xoffset=-1 yoffset=5 xadvance=5 page=0 chnl=0
-char id=188 x=552 y=0 width=11 height=11 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=189 x=564 y=0 width=11 height=11 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=190 x=576 y=0 width=11 height=11 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=191 x=865 y=0 width=6 height=11 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
-char id=192 x=163 y=0 width=9 height=13 xoffset=-1 yoffset=-1 xadvance=7 page=0 chnl=0
-char id=193 x=173 y=0 width=9 height=13 xoffset=-1 yoffset=-1 xadvance=7 page=0 chnl=0
-char id=194 x=183 y=0 width=9 height=13 xoffset=-1 yoffset=-1 xadvance=7 page=0 chnl=0
-char id=195 x=304 y=0 width=9 height=12 xoffset=-1 yoffset=0 xadvance=7 page=0 chnl=0
-char id=196 x=314 y=0 width=9 height=12 xoffset=-1 yoffset=0 xadvance=7 page=0 chnl=0
-char id=197 x=324 y=0 width=9 height=12 xoffset=-1 yoffset=0 xadvance=7 page=0 chnl=0
-char id=198 x=918 y=0 width=12 height=10 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=199 x=202 y=0 width=8 height=13 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=200 x=237 y=0 width=7 height=13 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0
-char id=201 x=245 y=0 width=7 height=13 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0
-char id=202 x=253 y=0 width=7 height=13 xoffset=0 yoffset=-1 xadvance=7 page=0 chnl=0
-char id=203 x=403 y=0 width=7 height=12 xoffset=0 yoffset=0 xadvance=7 page=0 chnl=0
-char id=204 x=269 y=0 width=5 height=13 xoffset=-2 yoffset=-1 xadvance=3 page=0 chnl=0
-char id=205 x=286 y=0 width=4 height=13 xoffset=-1 yoffset=-1 xadvance=3 page=0 chnl=0
-char id=206 x=275 y=0 width=5 height=13 xoffset=-2 yoffset=-1 xadvance=3 page=0 chnl=0
-char id=207 x=506 y=0 width=5 height=12 xoffset=-2 yoffset=0 xadvance=3 page=0 chnl=0
-char id=208 x=630 y=0 width=9 height=11 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=209 x=334 y=0 width=8 height=12 xoffset=0 yoffset=0 xadvance=9 page=0 chnl=0
-char id=210 x=0 y=0 width=10 height=14 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0
-char id=211 x=11 y=0 width=10 height=14 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0
-char id=212 x=22 y=0 width=10 height=14 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0
-char id=213 x=141 y=0 width=10 height=13 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0
-char id=214 x=152 y=0 width=10 height=13 xoffset=-1 yoffset=0 xadvance=9 page=0 chnl=0
-char id=215 x=613 y=12 width=6 height=6 xoffset=0 yoffset=5 xadvance=7 page=0 chnl=0
-char id=216 x=599 y=0 width=10 height=11 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=217 x=33 y=0 width=8 height=14 xoffset=0 yoffset=-1 xadvance=8 page=0 chnl=0
-char id=218 x=42 y=0 width=8 height=14 xoffset=0 yoffset=-1 xadvance=8 page=0 chnl=0
-char id=219 x=51 y=0 width=8 height=14 xoffset=0 yoffset=-1 xadvance=8 page=0 chnl=0
-char id=220 x=211 y=0 width=8 height=13 xoffset=0 yoffset=0 xadvance=8 page=0 chnl=0
-char id=221 x=220 y=0 width=8 height=13 xoffset=-1 yoffset=-1 xadvance=9 page=0 chnl=0
-char id=222 x=931 y=11 width=7 height=10 xoffset=0 yoffset=2 xadvance=7 page=0 chnl=0
-char id=223 x=411 y=0 width=7 height=12 xoffset=0 yoffset=1 xadvance=7 page=0 chnl=0
-char id=224 x=419 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=0
-char id=225 x=427 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=0
-char id=226 x=435 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=0
-char id=227 x=783 y=0 width=7 height=11 xoffset=-1 yoffset=2 xadvance=6 page=0 chnl=0
-char id=228 x=791 y=0 width=7 height=11 xoffset=-1 yoffset=2 xadvance=6 page=0 chnl=0
-char id=229 x=443 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=0
-char id=230 x=874 y=12 width=11 height=9 xoffset=-1 yoffset=4 xadvance=10 page=0 chnl=0
-char id=231 x=799 y=0 width=7 height=11 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
-char id=232 x=451 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=233 x=459 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=234 x=467 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=235 x=807 y=0 width=7 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=236 x=878 y=0 width=5 height=11 xoffset=-2 yoffset=1 xadvance=3 page=0 chnl=0
-char id=237 x=900 y=0 width=4 height=11 xoffset=-1 yoffset=1 xadvance=3 page=0 chnl=0
-char id=238 x=884 y=0 width=5 height=11 xoffset=-2 yoffset=1 xadvance=3 page=0 chnl=0
-char id=239 x=898 y=12 width=5 height=10 xoffset=-2 yoffset=2 xadvance=3 page=0 chnl=0
-char id=240 x=343 y=0 width=8 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=241 x=910 y=11 width=6 height=10 xoffset=0 yoffset=2 xadvance=7 page=0 chnl=0
-char id=242 x=352 y=0 width=8 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=243 x=361 y=0 width=8 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=244 x=370 y=0 width=8 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=245 x=685 y=0 width=8 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=246 x=694 y=0 width=8 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=247 x=744 y=12 width=8 height=8 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=248 x=847 y=12 width=8 height=9 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=249 x=475 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=250 x=483 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=251 x=491 y=0 width=7 height=12 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=252 x=815 y=0 width=7 height=11 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=253 x=76 y=0 width=7 height=14 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=254 x=84 y=0 width=7 height=14 xoffset=0 yoffset=1 xadvance=7 page=0 chnl=0
-char id=255 x=261 y=0 width=7 height=13 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-kernings count=72
-kerning first=39 second=65 amount=-1
-kerning first=39 second=74 amount=-1
-kerning first=39 second=198 amount=-1
-kerning first=42 second=65 amount=-1
-kerning first=42 second=74 amount=-1
-kerning first=42 second=90 amount=-1
-kerning first=42 second=198 amount=-1
-kerning first=46 second=84 amount=-1
-kerning first=46 second=86 amount=-1
-kerning first=46 second=89 amount=-1
-kerning first=47 second=74 amount=-1
-kerning first=47 second=198 amount=-1
-kerning first=58 second=84 amount=-1
-kerning first=64 second=89 amount=-1
-kerning first=65 second=39 amount=-1
-kerning first=65 second=42 amount=-1
-kerning first=65 second=84 amount=-1
-kerning first=65 second=86 amount=-1
-kerning first=65 second=89 amount=-1
-kerning first=70 second=46 amount=-1
-kerning first=70 second=47 amount=-1
-kerning first=70 second=74 amount=-1
-kerning first=70 second=198 amount=-1
-kerning first=76 second=39 amount=-1
-kerning first=76 second=42 amount=-2
-kerning first=76 second=45 amount=-1
-kerning first=76 second=84 amount=-1
-kerning first=76 second=86 amount=-1
-kerning first=76 second=89 amount=-1
-kerning first=80 second=46 amount=-1
-kerning first=80 second=47 amount=-1
-kerning first=80 second=74 amount=-1
-kerning first=80 second=198 amount=-1
-kerning first=84 second=46 amount=-1
-kerning first=84 second=47 amount=-1
-kerning first=84 second=58 amount=-1
-kerning first=84 second=65 amount=-1
-kerning first=84 second=74 amount=-1
-kerning first=84 second=99 amount=-1
-kerning first=84 second=100 amount=-1
-kerning first=84 second=101 amount=-1
-kerning first=84 second=103 amount=-1
-kerning first=84 second=111 amount=-1
-kerning first=84 second=113 amount=-1
-kerning first=84 second=119 amount=-1
-kerning first=84 second=198 amount=-1
-kerning first=84 second=240 amount=-1
-kerning first=86 second=46 amount=-1
-kerning first=86 second=47 amount=-1
-kerning first=86 second=65 amount=-1
-kerning first=86 second=74 amount=-1
-kerning first=86 second=198 amount=-1
-kerning first=87 second=74 amount=-1
-kerning first=89 second=46 amount=-1
-kerning first=89 second=47 amount=-1
-kerning first=89 second=64 amount=-1
-kerning first=89 second=65 amount=-1
-kerning first=89 second=74 amount=-1
-kerning first=89 second=198 amount=-1
-kerning first=89 second=240 amount=-1
-kerning first=90 second=45 amount=-1
-kerning first=91 second=93 amount=1
-kerning first=114 second=46 amount=-1
-kerning first=161 second=84 amount=-1
-kerning first=191 second=74 amount=-1
-kerning first=191 second=84 amount=-1
-kerning first=191 second=88 amount=-1
-kerning first=191 second=89 amount=-1
-kerning first=191 second=90 amount=-1
-kerning first=191 second=198 amount=-1
-kerning first=222 second=46 amount=-1
-kerning first=222 second=74 amount=-1
diff --git a/adventure-composer/src/main/resources/skin/BladeSkin/ubuntu-medium-14.fnt b/adventure-composer/src/main/resources/skin/BladeSkin/ubuntu-medium-14.fnt
deleted file mode 100644
index 979f0e83f..000000000
--- a/adventure-composer/src/main/resources/skin/BladeSkin/ubuntu-medium-14.fnt
+++ /dev/null
@@ -1,195 +0,0 @@
-info face=Ubuntu Medium,Bold size=14 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=0 aa=1 padding=0,0,0,0 spacing=1,1
-common lineHeight=16 base=13 scaleW=1024 scaleH=1024 pages=1 packed=0
-page id=0 file=ubuntu-medium-14_00.png
-chars count=190
-char id=33 x=1013 y=13 width=4 height=12 xoffset=0 yoffset=2 xadvance=4 page=0 chnl=0
-char id=34 x=362 y=15 width=7 height=6 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=0
-char id=35 x=877 y=13 width=10 height=11 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=36 x=382 y=0 width=9 height=14 xoffset=-1 yoffset=1 xadvance=8 page=0 chnl=0
-char id=37 x=692 y=0 width=13 height=12 xoffset=-1 yoffset=2 xadvance=13 page=0 chnl=0
-char id=38 x=745 y=0 width=11 height=12 xoffset=-1 yoffset=2 xadvance=10 page=0 chnl=0
-char id=39 x=350 y=15 width=4 height=6 xoffset=-1 yoffset=1 xadvance=4 page=0 chnl=0
-char id=40 x=223 y=0 width=5 height=15 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=0
-char id=41 x=229 y=0 width=5 height=15 xoffset=-1 yoffset=1 xadvance=5 page=0 chnl=0
-char id=42 x=405 y=15 width=8 height=7 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=43 x=555 y=14 width=9 height=9 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=44 x=345 y=15 width=4 height=6 xoffset=-1 yoffset=10 xadvance=4 page=0 chnl=0
-char id=45 x=276 y=15 width=6 height=3 xoffset=-1 yoffset=7 xadvance=4 page=0 chnl=0
-char id=46 x=312 y=15 width=4 height=5 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
-char id=47 x=142 y=0 width=9 height=15 xoffset=-2 yoffset=1 xadvance=6 page=0 chnl=0
-char id=48 x=813 y=0 width=9 height=12 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=49 x=689 y=14 width=6 height=11 xoffset=0 yoffset=2 xadvance=8 page=0 chnl=0
-char id=50 x=823 y=13 width=9 height=11 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=51 x=823 y=0 width=9 height=12 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=52 x=813 y=13 width=9 height=11 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=53 x=833 y=0 width=9 height=12 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=54 x=843 y=0 width=9 height=12 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=55 x=803 y=13 width=9 height=11 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=56 x=853 y=0 width=9 height=12 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=57 x=863 y=0 width=9 height=12 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=58 x=591 y=14 width=4 height=10 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
-char id=59 x=1008 y=13 width=4 height=12 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
-char id=60 x=545 y=14 width=9 height=9 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=61 x=434 y=15 width=9 height=7 xoffset=-1 yoffset=5 xadvance=8 page=0 chnl=0
-char id=62 x=535 y=14 width=9 height=9 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=63 x=986 y=0 width=7 height=12 xoffset=-1 yoffset=2 xadvance=6 page=0 chnl=0
-char id=64 x=273 y=0 width=14 height=14 xoffset=-1 yoffset=2 xadvance=14 page=0 chnl=0
-char id=65 x=900 y=13 width=11 height=11 xoffset=-1 yoffset=2 xadvance=10 page=0 chnl=0
-char id=66 x=873 y=0 width=9 height=12 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=0
-char id=67 x=769 y=0 width=10 height=12 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=68 x=780 y=0 width=10 height=12 xoffset=0 yoffset=2 xadvance=10 page=0 chnl=0
-char id=69 x=714 y=13 width=8 height=11 xoffset=0 yoffset=2 xadvance=8 page=0 chnl=0
-char id=70 x=705 y=13 width=8 height=11 xoffset=0 yoffset=2 xadvance=8 page=0 chnl=0
-char id=71 x=791 y=0 width=10 height=12 xoffset=-1 yoffset=2 xadvance=10 page=0 chnl=0
-char id=72 x=793 y=13 width=9 height=11 xoffset=0 yoffset=2 xadvance=10 page=0 chnl=0
-char id=73 x=685 y=14 width=3 height=11 xoffset=0 yoffset=2 xadvance=4 page=0 chnl=0
-char id=74 x=923 y=0 width=8 height=12 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=75 x=866 y=13 width=10 height=11 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=0
-char id=76 x=696 y=13 width=8 height=11 xoffset=0 yoffset=2 xadvance=7 page=0 chnl=0
-char id=77 x=954 y=13 width=13 height=11 xoffset=-1 yoffset=2 xadvance=12 page=0 chnl=0
-char id=78 x=855 y=13 width=10 height=11 xoffset=0 yoffset=2 xadvance=10 page=0 chnl=0
-char id=79 x=706 y=0 width=12 height=12 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=80 x=783 y=13 width=9 height=11 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=0
-char id=81 x=288 y=0 width=12 height=14 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=82 x=773 y=13 width=9 height=11 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=0
-char id=83 x=883 y=0 width=9 height=12 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=84 x=763 y=13 width=9 height=11 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=85 x=893 y=0 width=9 height=12 xoffset=0 yoffset=2 xadvance=10 page=0 chnl=0
-char id=86 x=888 y=13 width=11 height=11 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=87 x=983 y=13 width=14 height=11 xoffset=-1 yoffset=2 xadvance=13 page=0 chnl=0
-char id=88 x=844 y=13 width=10 height=11 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=89 x=833 y=13 width=10 height=11 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=90 x=753 y=13 width=9 height=11 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=91 x=235 y=0 width=5 height=15 xoffset=0 yoffset=1 xadvance=5 page=0 chnl=0
-char id=92 x=152 y=0 width=9 height=15 xoffset=-2 yoffset=1 xadvance=6 page=0 chnl=0
-char id=93 x=241 y=0 width=5 height=15 xoffset=-1 yoffset=1 xadvance=5 page=0 chnl=0
-char id=94 x=424 y=15 width=9 height=7 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=95 x=283 y=15 width=8 height=3 xoffset=-1 yoffset=13 xadvance=7 page=0 chnl=0
-char id=96 x=329 y=15 width=5 height=5 xoffset=0 yoffset=0 xadvance=5 page=0 chnl=0
-char id=97 x=622 y=14 width=8 height=10 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=98 x=603 y=0 width=8 height=13 xoffset=0 yoffset=1 xadvance=8 page=0 chnl=0
-char id=99 x=613 y=14 width=8 height=10 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=100 x=523 y=0 width=9 height=13 xoffset=-1 yoffset=1 xadvance=8 page=0 chnl=0
-char id=101 x=661 y=14 width=9 height=10 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=102 x=1010 y=0 width=6 height=12 xoffset=0 yoffset=1 xadvance=6 page=0 chnl=0
-char id=103 x=903 y=0 width=9 height=12 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=104 x=932 y=0 width=8 height=12 xoffset=0 yoffset=1 xadvance=8 page=0 chnl=0
-char id=105 x=1003 y=13 width=4 height=12 xoffset=-1 yoffset=1 xadvance=3 page=0 chnl=0
-char id=106 x=247 y=0 width=5 height=15 xoffset=-2 yoffset=1 xadvance=4 page=0 chnl=0
-char id=107 x=941 y=0 width=8 height=12 xoffset=0 yoffset=1 xadvance=8 page=0 chnl=0
-char id=108 x=687 y=0 width=4 height=13 xoffset=0 yoffset=1 xadvance=4 page=0 chnl=0
-char id=109 x=578 y=14 width=12 height=9 xoffset=0 yoffset=4 xadvance=11 page=0 chnl=0
-char id=110 x=486 y=15 width=8 height=9 xoffset=0 yoffset=4 xadvance=8 page=0 chnl=0
-char id=111 x=651 y=14 width=9 height=10 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=112 x=950 y=0 width=8 height=12 xoffset=0 yoffset=4 xadvance=8 page=0 chnl=0
-char id=113 x=913 y=0 width=9 height=12 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=114 x=452 y=15 width=6 height=9 xoffset=0 yoffset=4 xadvance=6 page=0 chnl=0
-char id=115 x=596 y=14 width=7 height=10 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
-char id=116 x=1017 y=0 width=6 height=12 xoffset=0 yoffset=2 xadvance=6 page=0 chnl=0
-char id=117 x=604 y=14 width=8 height=10 xoffset=0 yoffset=4 xadvance=8 page=0 chnl=0
-char id=118 x=525 y=14 width=9 height=9 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=119 x=565 y=14 width=12 height=9 xoffset=-1 yoffset=4 xadvance=11 page=0 chnl=0
-char id=120 x=515 y=14 width=9 height=9 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=121 x=802 y=0 width=10 height=12 xoffset=-2 yoffset=4 xadvance=7 page=0 chnl=0
-char id=122 x=477 y=15 width=8 height=9 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=123 x=209 y=0 width=6 height=15 xoffset=-1 yoffset=1 xadvance=5 page=0 chnl=0
-char id=124 x=265 y=0 width=3 height=15 xoffset=0 yoffset=1 xadvance=4 page=0 chnl=0
-char id=125 x=216 y=0 width=6 height=15 xoffset=-1 yoffset=1 xadvance=5 page=0 chnl=0
-char id=126 x=335 y=15 width=9 height=5 xoffset=-1 yoffset=6 xadvance=8 page=0 chnl=0
-char id=160 x=267 y=16 width=1 height=1 xoffset=-1 yoffset=12 xadvance=3 page=0 chnl=0
-char id=161 x=998 y=13 width=4 height=12 xoffset=0 yoffset=4 xadvance=4 page=0 chnl=0
-char id=162 x=612 y=0 width=8 height=13 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=163 x=743 y=13 width=9 height=11 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=164 x=505 y=15 width=9 height=9 xoffset=-1 yoffset=3 xadvance=8 page=0 chnl=0
-char id=165 x=733 y=13 width=9 height=11 xoffset=-1 yoffset=2 xadvance=8 page=0 chnl=0
-char id=166 x=269 y=0 width=3 height=15 xoffset=0 yoffset=1 xadvance=4 page=0 chnl=0
-char id=167 x=621 y=0 width=8 height=13 xoffset=-1 yoffset=2 xadvance=7 page=0 chnl=0
-char id=168 x=299 y=15 width=7 height=4 xoffset=-1 yoffset=1 xadvance=6 page=0 chnl=0
-char id=169 x=719 y=0 width=12 height=12 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=170 x=390 y=15 width=6 height=7 xoffset=-1 yoffset=2 xadvance=6 page=0 chnl=0
-char id=171 x=468 y=15 width=8 height=9 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=172 x=414 y=15 width=9 height=7 xoffset=-1 yoffset=6 xadvance=8 page=0 chnl=0
-char id=173 x=269 y=16 width=6 height=3 xoffset=-1 yoffset=7 xadvance=4 page=0 chnl=0
-char id=174 x=732 y=0 width=12 height=12 xoffset=-1 yoffset=2 xadvance=11 page=0 chnl=0
-char id=175 x=292 y=15 width=6 height=4 xoffset=-1 yoffset=1 xadvance=5 page=0 chnl=0
-char id=176 x=355 y=15 width=6 height=6 xoffset=-1 yoffset=1 xadvance=5 page=0 chnl=0
-char id=177 x=641 y=14 width=9 height=10 xoffset=-1 yoffset=3 xadvance=8 page=0 chnl=0
-char id=178 x=383 y=15 width=6 height=7 xoffset=-1 yoffset=2 xadvance=5 page=0 chnl=0
-char id=179 x=376 y=15 width=6 height=7 xoffset=-1 yoffset=2 xadvance=5 page=0 chnl=0
-char id=180 x=323 y=15 width=5 height=5 xoffset=0 yoffset=0 xadvance=5 page=0 chnl=0
-char id=181 x=959 y=0 width=8 height=12 xoffset=0 yoffset=4 xadvance=8 page=0 chnl=0
-char id=182 x=349 y=0 width=10 height=14 xoffset=-1 yoffset=2 xadvance=10 page=0 chnl=0
-char id=183 x=307 y=15 width=4 height=5 xoffset=-1 yoffset=6 xadvance=3 page=0 chnl=0
-char id=184 x=317 y=15 width=5 height=5 xoffset=-1 yoffset=11 xadvance=5 page=0 chnl=0
-char id=185 x=370 y=15 width=5 height=7 xoffset=-1 yoffset=2 xadvance=5 page=0 chnl=0
-char id=186 x=397 y=15 width=7 height=7 xoffset=-1 yoffset=2 xadvance=6 page=0 chnl=0
-char id=187 x=459 y=15 width=8 height=9 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=188 x=940 y=13 width=13 height=11 xoffset=-1 yoffset=2 xadvance=12 page=0 chnl=0
-char id=189 x=926 y=13 width=13 height=11 xoffset=-1 yoffset=2 xadvance=12 page=0 chnl=0
-char id=190 x=912 y=13 width=13 height=11 xoffset=-1 yoffset=2 xadvance=12 page=0 chnl=0
-char id=191 x=994 y=0 width=7 height=12 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
-char id=192 x=96 y=0 width=11 height=15 xoffset=-1 yoffset=-2 xadvance=10 page=0 chnl=0
-char id=193 x=108 y=0 width=11 height=15 xoffset=-1 yoffset=-2 xadvance=10 page=0 chnl=0
-char id=194 x=301 y=0 width=11 height=14 xoffset=-1 yoffset=-1 xadvance=10 page=0 chnl=0
-char id=195 x=313 y=0 width=11 height=14 xoffset=-1 yoffset=-1 xadvance=10 page=0 chnl=0
-char id=196 x=325 y=0 width=11 height=14 xoffset=-1 yoffset=-1 xadvance=10 page=0 chnl=0
-char id=197 x=337 y=0 width=11 height=14 xoffset=-1 yoffset=-1 xadvance=10 page=0 chnl=0
-char id=198 x=968 y=13 width=14 height=11 xoffset=-1 yoffset=2 xadvance=13 page=0 chnl=0
-char id=199 x=360 y=0 width=10 height=14 xoffset=-1 yoffset=2 xadvance=9 page=0 chnl=0
-char id=200 x=182 y=0 width=8 height=15 xoffset=0 yoffset=-2 xadvance=8 page=0 chnl=0
-char id=201 x=191 y=0 width=8 height=15 xoffset=0 yoffset=-2 xadvance=8 page=0 chnl=0
-char id=202 x=432 y=0 width=8 height=14 xoffset=0 yoffset=-1 xadvance=8 page=0 chnl=0
-char id=203 x=441 y=0 width=8 height=14 xoffset=0 yoffset=-1 xadvance=8 page=0 chnl=0
-char id=204 x=253 y=0 width=5 height=15 xoffset=-1 yoffset=-2 xadvance=4 page=0 chnl=0
-char id=205 x=259 y=0 width=5 height=15 xoffset=0 yoffset=-2 xadvance=4 page=0 chnl=0
-char id=206 x=503 y=0 width=6 height=14 xoffset=-2 yoffset=-1 xadvance=4 page=0 chnl=0
-char id=207 x=495 y=0 width=7 height=14 xoffset=-2 yoffset=-1 xadvance=4 page=0 chnl=0
-char id=208 x=757 y=0 width=11 height=12 xoffset=-1 yoffset=2 xadvance=10 page=0 chnl=0
-char id=209 x=371 y=0 width=10 height=14 xoffset=0 yoffset=-1 xadvance=10 page=0 chnl=0
-char id=210 x=0 y=0 width=12 height=16 xoffset=-1 yoffset=-2 xadvance=11 page=0 chnl=0
-char id=211 x=13 y=0 width=12 height=16 xoffset=-1 yoffset=-2 xadvance=11 page=0 chnl=0
-char id=212 x=57 y=0 width=12 height=15 xoffset=-1 yoffset=-1 xadvance=11 page=0 chnl=0
-char id=213 x=70 y=0 width=12 height=15 xoffset=-1 yoffset=-1 xadvance=11 page=0 chnl=0
-char id=214 x=83 y=0 width=12 height=15 xoffset=-1 yoffset=-1 xadvance=11 page=0 chnl=0
-char id=215 x=444 y=15 width=7 height=8 xoffset=0 yoffset=4 xadvance=8 page=0 chnl=0
-char id=216 x=510 y=0 width=12 height=13 xoffset=-1 yoffset=1 xadvance=11 page=0 chnl=0
-char id=217 x=37 y=0 width=9 height=16 xoffset=0 yoffset=-2 xadvance=10 page=0 chnl=0
-char id=218 x=47 y=0 width=9 height=16 xoffset=0 yoffset=-2 xadvance=10 page=0 chnl=0
-char id=219 x=162 y=0 width=9 height=15 xoffset=0 yoffset=-1 xadvance=10 page=0 chnl=0
-char id=220 x=172 y=0 width=9 height=15 xoffset=0 yoffset=-1 xadvance=10 page=0 chnl=0
-char id=221 x=120 y=0 width=10 height=15 xoffset=-1 yoffset=-2 xadvance=9 page=0 chnl=0
-char id=222 x=723 y=13 width=9 height=11 xoffset=0 yoffset=2 xadvance=9 page=0 chnl=0
-char id=223 x=533 y=0 width=9 height=13 xoffset=0 yoffset=1 xadvance=9 page=0 chnl=0
-char id=224 x=450 y=0 width=8 height=14 xoffset=-1 yoffset=0 xadvance=7 page=0 chnl=0
-char id=225 x=459 y=0 width=8 height=14 xoffset=-1 yoffset=0 xadvance=7 page=0 chnl=0
-char id=226 x=630 y=0 width=8 height=13 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=227 x=639 y=0 width=8 height=13 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=228 x=648 y=0 width=8 height=13 xoffset=-1 yoffset=1 xadvance=7 page=0 chnl=0
-char id=229 x=468 y=0 width=8 height=14 xoffset=-1 yoffset=0 xadvance=7 page=0 chnl=0
-char id=230 x=671 y=14 width=13 height=10 xoffset=-1 yoffset=4 xadvance=12 page=0 chnl=0
-char id=231 x=968 y=0 width=8 height=12 xoffset=-1 yoffset=4 xadvance=7 page=0 chnl=0
-char id=232 x=392 y=0 width=9 height=14 xoffset=-1 yoffset=0 xadvance=8 page=0 chnl=0
-char id=233 x=402 y=0 width=9 height=14 xoffset=-1 yoffset=0 xadvance=8 page=0 chnl=0
-char id=234 x=543 y=0 width=9 height=13 xoffset=-1 yoffset=1 xadvance=8 page=0 chnl=0
-char id=235 x=553 y=0 width=9 height=13 xoffset=-1 yoffset=1 xadvance=8 page=0 chnl=0
-char id=236 x=675 y=0 width=5 height=13 xoffset=-1 yoffset=0 xadvance=3 page=0 chnl=0
-char id=237 x=681 y=0 width=5 height=13 xoffset=0 yoffset=0 xadvance=3 page=0 chnl=0
-char id=238 x=1018 y=13 width=6 height=12 xoffset=-2 yoffset=1 xadvance=3 page=0 chnl=0
-char id=239 x=1002 y=0 width=7 height=12 xoffset=-2 yoffset=1 xadvance=3 page=0 chnl=0
-char id=240 x=563 y=0 width=9 height=13 xoffset=-1 yoffset=1 xadvance=8 page=0 chnl=0
-char id=241 x=977 y=0 width=8 height=12 xoffset=0 yoffset=1 xadvance=8 page=0 chnl=0
-char id=242 x=412 y=0 width=9 height=14 xoffset=-1 yoffset=0 xadvance=8 page=0 chnl=0
-char id=243 x=422 y=0 width=9 height=14 xoffset=-1 yoffset=0 xadvance=8 page=0 chnl=0
-char id=244 x=573 y=0 width=9 height=13 xoffset=-1 yoffset=1 xadvance=8 page=0 chnl=0
-char id=245 x=583 y=0 width=9 height=13 xoffset=-1 yoffset=1 xadvance=8 page=0 chnl=0
-char id=246 x=593 y=0 width=9 height=13 xoffset=-1 yoffset=1 xadvance=8 page=0 chnl=0
-char id=247 x=495 y=15 width=9 height=9 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=248 x=631 y=14 width=9 height=10 xoffset=-1 yoffset=4 xadvance=8 page=0 chnl=0
-char id=249 x=477 y=0 width=8 height=14 xoffset=0 yoffset=0 xadvance=8 page=0 chnl=0
-char id=250 x=486 y=0 width=8 height=14 xoffset=0 yoffset=0 xadvance=8 page=0 chnl=0
-char id=251 x=657 y=0 width=8 height=13 xoffset=0 yoffset=1 xadvance=8 page=0 chnl=0
-char id=252 x=666 y=0 width=8 height=13 xoffset=0 yoffset=1 xadvance=8 page=0 chnl=0
-char id=253 x=26 y=0 width=10 height=16 xoffset=-2 yoffset=0 xadvance=7 page=0 chnl=0
-char id=254 x=200 y=0 width=8 height=15 xoffset=0 yoffset=1 xadvance=8 page=0 chnl=0
-char id=255 x=131 y=0 width=10 height=15 xoffset=-2 yoffset=1 xadvance=7 page=0 chnl=0
-kernings count=0
diff --git a/adventure-composer/src/main/resources/versions.properties b/adventure-composer/src/main/resources/versions.properties
deleted file mode 100644
index 5349a4cb1..000000000
--- a/adventure-composer/src/main/resources/versions.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=0.5.0
-libgdxVersion=1.4.1
-roboVMVersion=1.0.0-alpha-04
-buildToolsVersion=20.0.0
-androidAPILevel=20
-gwtVersion=2.6.0
diff --git a/adventure-composer/.gitignore b/adventure-editor/.gitignore
similarity index 100%
rename from adventure-composer/.gitignore
rename to adventure-editor/.gitignore
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_check_off.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_check_off.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_check_off.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_check_off.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_check_on.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_check_on.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_check_on.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_check_on.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_check_on_focused.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_check_on_focused.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_check_on_focused.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_check_on_focused.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_default_disabled.9.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_default_disabled.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_default_disabled.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_default_disabled.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_default_focused.9.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_default_focused.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_default_focused.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_default_focused.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_default_normal.9.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_default_normal.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_default_normal.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_default_normal.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_default_pressed.9.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_default_pressed.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_default_pressed.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_default_pressed.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_radio_off.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_radio_off.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_radio_off.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_radio_off.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_radio_on.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_radio_on.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_radio_on.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_radio_on.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_radio_on_focused.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_radio_on_focused.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_radio_on_focused.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_radio_on_focused.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_off_disabled.9.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_off_disabled.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_off_disabled.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_off_disabled.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_off_focused.9.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_off_focused.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_off_focused.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_off_focused.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_off_normal.9.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_off_normal.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_off_normal.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_off_normal.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_on_focused.9.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_on_focused.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_on_focused.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_on_focused.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_on_normal.9.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_on_normal.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_on_normal.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_on_normal.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_on_pressed.9.png b/adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_on_pressed.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/btn_toggle_on_pressed.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/btn_toggle_on_pressed.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/gen.sh b/adventure-editor/assets-raw/editor/BladeSkin/gen.sh
similarity index 90%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/gen.sh
rename to adventure-editor/assets-raw/editor/BladeSkin/gen.sh
index 27ce09cd7..a4ed603f2 100755
--- a/adventure-composer/assets-raw/editor/BladeSkin-atlas/gen.sh
+++ b/adventure-editor/assets-raw/editor/BladeSkin/gen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-VERSION=1.3.1
+VERSION=1.11.0
 LIBGDX_BASE_PATH=~/.gradle/caches/modules-2/files-2.1/com.badlogicgames.gdx/
 GDX_PATH=`find $LIBGDX_BASE_PATH -name gdx-$VERSION.jar`
 GDX_TOOLS_PATH=`find $LIBGDX_BASE_PATH -name gdx-tools-$VERSION.jar`
 
-java -cp $GDX_PATH:$GDX_TOOLS_PATH com.badlogic.gdx.tools.texturepacker.TexturePacker images ../../../src/main/resources/skin/BladeSkin BladeSkin-ldpi
+java -cp $GDX_PATH:$GDX_TOOLS_PATH com.badlogic.gdx.tools.texturepacker.TexturePacker images ../../../src/main/resources/skin/BladeSkin blade-skin
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/icon-blitz.png b/adventure-editor/assets-raw/editor/BladeSkin/icon-blitz.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/icon-blitz.png
rename to adventure-editor/assets-raw/editor/BladeSkin/icon-blitz.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/icon-blitz_pressed.png b/adventure-editor/assets-raw/editor/BladeSkin/icon-blitz_pressed.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/icon-blitz_pressed.png
rename to adventure-editor/assets-raw/editor/BladeSkin/icon-blitz_pressed.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/pack.json b/adventure-editor/assets-raw/editor/BladeSkin/pack.json
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/pack.json
rename to adventure-editor/assets-raw/editor/BladeSkin/pack.json
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scroll.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scroll.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_corner.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scroll_corner.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_corner.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scroll_corner.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_horizontal.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scroll_horizontal.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_horizontal.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scroll_horizontal.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_horizontal_knob.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scroll_horizontal_knob.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_horizontal_knob.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scroll_horizontal_knob.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_opaque.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scroll_opaque.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_opaque.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scroll_opaque.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_vertical.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scroll_vertical.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_vertical.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scroll_vertical.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_vertical_knob.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scroll_vertical_knob.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scroll_vertical_knob.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scroll_vertical_knob.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_control_normal.png b/adventure-editor/assets-raw/editor/BladeSkin/scrubber_control_normal.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_control_normal.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scrubber_control_normal.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_primary.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scrubber_primary.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_primary.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scrubber_primary.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_secondary.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scrubber_secondary.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_secondary.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scrubber_secondary.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_track.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scrubber_track.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_track.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scrubber_track.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_vertical_primary.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scrubber_vertical_primary.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_vertical_primary.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scrubber_vertical_primary.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_vertical_secondary.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scrubber_vertical_secondary.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_vertical_secondary.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scrubber_vertical_secondary.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_vertical_track.9.png b/adventure-editor/assets-raw/editor/BladeSkin/scrubber_vertical_track.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/scrubber_vertical_track.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/scrubber_vertical_track.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/spinner_default.9.png b/adventure-editor/assets-raw/editor/BladeSkin/spinner_default.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/spinner_default.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/spinner_default.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/spinner_focused.9.png b/adventure-editor/assets-raw/editor/BladeSkin/spinner_focused.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/spinner_focused.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/spinner_focused.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/spinner_pressed.9.png b/adventure-editor/assets-raw/editor/BladeSkin/spinner_pressed.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/spinner_pressed.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/spinner_pressed.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/splitpane_horizontal.9.png b/adventure-editor/assets-raw/editor/BladeSkin/splitpane_horizontal.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/splitpane_horizontal.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/splitpane_horizontal.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/splitpane_vertical.9.png b/adventure-editor/assets-raw/editor/BladeSkin/splitpane_vertical.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/splitpane_vertical.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/splitpane_vertical.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text.9.png b/adventure-editor/assets-raw/editor/BladeSkin/text.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/text.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text_focused.9.png b/adventure-editor/assets-raw/editor/BladeSkin/text_focused.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text_focused.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/text_focused.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text_focused_opaque.9.png b/adventure-editor/assets-raw/editor/BladeSkin/text_focused_opaque.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text_focused_opaque.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/text_focused_opaque.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text_opaque.9.png b/adventure-editor/assets-raw/editor/BladeSkin/text_opaque.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text_opaque.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/text_opaque.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text_selected.9.png b/adventure-editor/assets-raw/editor/BladeSkin/text_selected.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text_selected.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/text_selected.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text_selected_opaque.9.png b/adventure-editor/assets-raw/editor/BladeSkin/text_selected_opaque.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/text_selected_opaque.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/text_selected_opaque.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/textfield_cursor.9.png b/adventure-editor/assets-raw/editor/BladeSkin/textfield_cursor.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/textfield_cursor.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/textfield_cursor.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/textfield_default.9.png b/adventure-editor/assets-raw/editor/BladeSkin/textfield_default.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/textfield_default.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/textfield_default.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/textfield_disabled.9.png b/adventure-editor/assets-raw/editor/BladeSkin/textfield_disabled.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/textfield_disabled.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/textfield_disabled.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/textfield_focused.9.png b/adventure-editor/assets-raw/editor/BladeSkin/textfield_focused.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/textfield_focused.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/textfield_focused.9.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/textfield_selection.png b/adventure-editor/assets-raw/editor/BladeSkin/textfield_selection.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/textfield_selection.png
rename to adventure-editor/assets-raw/editor/BladeSkin/textfield_selection.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/tree_minus.png b/adventure-editor/assets-raw/editor/BladeSkin/tree_minus.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/tree_minus.png
rename to adventure-editor/assets-raw/editor/BladeSkin/tree_minus.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/tree_plus.png b/adventure-editor/assets-raw/editor/BladeSkin/tree_plus.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/tree_plus.png
rename to adventure-editor/assets-raw/editor/BladeSkin/tree_plus.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/white_pixel.png b/adventure-editor/assets-raw/editor/BladeSkin/white_pixel.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/white_pixel.png
rename to adventure-editor/assets-raw/editor/BladeSkin/white_pixel.png
diff --git a/adventure-composer/assets-raw/editor/BladeSkin-atlas/images/window.9.png b/adventure-editor/assets-raw/editor/BladeSkin/window.9.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/BladeSkin-atlas/images/window.9.png
rename to adventure-editor/assets-raw/editor/BladeSkin/window.9.png
diff --git a/adventure-composer/assets-raw/editor/editor-icon.svg b/adventure-editor/assets-raw/editor/editor-icon.svg
similarity index 94%
rename from adventure-composer/assets-raw/editor/editor-icon.svg
rename to adventure-editor/assets-raw/editor/editor-icon.svg
index 04fc0b027..34bc16e43 100644
--- a/adventure-composer/assets-raw/editor/editor-icon.svg
+++ b/adventure-editor/assets-raw/editor/editor-icon.svg
@@ -7,33 +7,19 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="128"
    height="128"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48+devel r"
-   sodipodi:docname="ic_app.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="editor-icon.svg"
    inkscape:export-filename="ic_app16.png"
    inkscape:export-xdpi="11.25"
    inkscape:export-ydpi="11.25">
   <defs
-     id="defs4">
-    <filter
-       inkscape:collect="always"
-       id="filter864"
-       x="-0.23042651"
-       width="1.460853"
-       y="-0.13367997"
-       height="1.2673599">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.2232277"
-         id="feGaussianBlur866" />
-    </filter>
-  </defs>
+     id="defs4" />
   <sodipodi:namedview
      id="base"
      pagecolor="#262626"
@@ -42,17 +28,17 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="2.8"
-     inkscape:cx="1.0379446"
+     inkscape:cx="92.823659"
      inkscape:cy="49.412493"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      showborder="true"
      borderlayer="true"
-     inkscape:window-width="1215"
-     inkscape:window-height="1000"
-     inkscape:window-x="1431"
-     inkscape:window-y="24"
+     inkscape:window-width="1920"
+     inkscape:window-height="1442"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
      inkscape:window-maximized="1"
      inkscape:snap-global="false" />
   <metadata
@@ -72,14 +58,6 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-924.3622)">
-    <image
-       sodipodi:absref="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/player/walk.left_18.png"
-       y="910.89111"
-       x="171.61142"
-       id="image824"
-       xlink:href="file:///home/rgarcia/Dropbox/art/2013.Proyecto%20Indiana/diosa/assets/sprites/player/walk.left_18.png"
-       height="130.70171"
-       width="85.667183" />
     <rect
        style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.12300014000000026;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect2986"
diff --git a/adventure-editor/assets-raw/editor/icons-atlas.svg b/adventure-editor/assets-raw/editor/icons-atlas.svg
new file mode 100644
index 000000000..7f4707567
--- /dev/null
+++ b/adventure-editor/assets-raw/editor/icons-atlas.svg
@@ -0,0 +1,5226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="3126.9619"
+   height="2373.0876"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="icons-atlas.svg"
+   inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_goto.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5"
+   viewBox="0 0 3126.9619 2373.0876">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#2043dd"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.99882975"
+     inkscape:cx="2631.1354"
+     inkscape:cy="529.29897"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     borderlayer="true"
+     inkscape:window-width="1850"
+     inkscape:window-height="1016"
+     inkscape:window-x="70"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:object-paths="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="60.752534 : -73.492579 : 1"
+       inkscape:vp_y="0 : 999.99998 : 0"
+       inkscape:vp_z="-198.14519 : 246.2576 : 1"
+       inkscape:persp3d-origin="63.999999 : 42.666666 : 1"
+       id="perspective4594" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="60.752534 : -73.492579 : 1"
+       inkscape:vp_y="0 : 999.99998 : 0"
+       inkscape:vp_z="-198.14519 : 246.2576 : 1"
+       inkscape:persp3d-origin="63.999999 : 42.666666 : 1"
+       id="perspective4564" />
+    <clipPath
+       id="clipPath5598-8-0-5"
+       clipPathUnits="userSpaceOnUse">
+      <g
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)"
+         style="fill:#ffffff"
+         id="g5600-9-9-5">
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
+           id="path5602-1-7-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc" />
+        <path
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           id="path5604-6-6-2"
+           inkscape:connector-curvature="0" />
+      </g>
+    </clipPath>
+    <linearGradient
+       x1="212.28999"
+       y1="86.987"
+       gradientTransform="scale(0.67336,1.4851)"
+       x2="179.60001"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2446"
+       y2="60.986"
+       id="linearGradient2453" />
+    <linearGradient
+       x1="211.84"
+       y1="162.05"
+       gradientTransform="scale(1.1402,0.87702)"
+       x2="164.58"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2446"
+       y2="115.26"
+       id="linearGradient2449" />
+    <linearGradient
+       x1="118.93"
+       y1="96.167999"
+       gradientTransform="scale(0.88075,1.1354)"
+       x2="137.28999"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2414"
+       y2="112.8"
+       id="linearGradient2445" />
+    <linearGradient
+       x1="286.48001"
+       y1="118.48"
+       gradientTransform="scale(1.0801,0.92582)"
+       x2="272.26999"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2414"
+       y2="142.42"
+       id="linearGradient2441" />
+    <linearGradient
+       x1="77.193001"
+       y1="33.314999"
+       gradientTransform="scale(1.3671,0.73146)"
+       x2="146.55"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2414"
+       y2="114.87"
+       id="linearGradient2437" />
+    <linearGradient
+       x1="293.39001"
+       y1="44.554001"
+       gradientTransform="scale(1.1832,0.84515)"
+       x2="201.5"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2414"
+       y2="119.48"
+       id="linearGradient2433" />
+    <linearGradient
+       x1="59.088001"
+       y1="219.27"
+       gradientTransform="scale(1.1261,0.88801)"
+       x2="154.07001"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2414"
+       y2="158.92"
+       id="linearGradient2429" />
+    <linearGradient
+       x1="242.89"
+       y1="281.31"
+       gradientTransform="scale(1.4649,0.68264)"
+       x2="155.25999"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2414"
+       y2="210.25"
+       id="linearGradient2425" />
+    <linearGradient
+       x1="105.5"
+       y1="249.10001"
+       gradientTransform="scale(0.92394,1.0823)"
+       x2="181.91"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2414"
+       y2="184.14"
+       id="linearGradient2421" />
+    <linearGradient
+       x1="278.57999"
+       y1="292.70001"
+       gradientTransform="scale(1.0748,0.93042)"
+       x2="185.44"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2414"
+       y2="206.96001"
+       id="linearGradient2417" />
+    <linearGradient
+       id="linearGradient2414">
+      <stop
+         offset="0"
+         stop-color="#e3b681"
+         id="stop2415" />
+      <stop
+         offset="1"
+         stop-color="#fde8b0"
+         id="stop2416" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2446">
+      <stop
+         offset="0"
+         stop-color="#e0e0e0"
+         id="stop2447" />
+      <stop
+         offset="1"
+         stop-color="#fff"
+         id="stop2448" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg"
+     style="display:inline"
+     transform="translate(198.89525,307.74899)"
+     sodipodi:insensitive="true">
+    <rect
+       style="fill:#b3b3b3;stroke:none;stroke-width:8.88899517;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect4476"
+       width="3126.9619"
+       height="2373.0876"
+       x="-198.89525"
+       y="-307.74899"
+       rx="15.426912"
+       ry="13.555182" />
+    <rect
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:3.11375809;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       id="rect1406"
+       width="1446.9536"
+       height="380.76144"
+       x="-137.97983"
+       y="1009.1739"
+       rx="9.5082865"
+       ry="14.465546" />
+    <rect
+       ry="18.138868"
+       rx="18.723745"
+       y="1503.7949"
+       x="-131.79247"
+       height="477.45044"
+       width="2849.3455"
+       id="rect1408"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:3.11375809;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" />
+    <rect
+       ry="39.735245"
+       rx="16.003752"
+       y="-822.01562"
+       x="-139.78249"
+       height="1045.9092"
+       width="2435.4216"
+       id="rect1462"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:3.11375809;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       transform="scale(1,-1)" />
+    <rect
+       transform="scale(1,-1)"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:3.25127602;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       id="rect1483"
+       width="2038.8405"
+       height="272.70639"
+       x="-34.939312"
+       y="-142.32904"
+       rx="13.397718"
+       ry="10.360415" />
+    <rect
+       ry="10.36564"
+       rx="4.5970092"
+       y="-450.86063"
+       x="-33.325481"
+       height="272.8439"
+       width="699.56445"
+       id="rect1485"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:3.11375809;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       transform="scale(1,-1)" />
+    <rect
+       transform="scale(1,-1)"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:3.11375785;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       id="rect1487"
+       width="1526.4329"
+       height="272.8439"
+       x="-38.49374"
+       y="-766.70776"
+       rx="10.030563"
+       ry="10.36564" />
+    <rect
+       ry="14.47206"
+       rx="8.4859705"
+       y="1009.0882"
+       x="1425.0554"
+       height="380.93292"
+       width="1291.3794"
+       id="rect1458"
+       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.94226813;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" />
+    <text
+       transform="translate(0,-924.3622)"
+       id="text1464"
+       y="1900.5394"
+       x="1526.2908"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:middle;white-space:normal;shape-padding:0;display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         id="tspan1462"
+         y="1900.5394"
+         x="1526.2908"
+         sodipodi:role="line"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:middle;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">SCENE</tspan></text>
+  </g>
+  <g
+     transform="translate(198.89525,-616.61321)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="icons"
+     style="display:inline">
+    <g
+       inkscape:export-ydpi="22.851562"
+       inkscape:export-xdpi="22.851562"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_sprite_actor.png"
+       id="g3042"
+       transform="translate(-11.326964,-62.298301)">
+      <rect
+         y="926.27539"
+         x="264.41318"
+         height="126.03077"
+         width="126.03078"
+         id="rect3015"
+         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <g
+         id="g3023">
+        <path
+           sodipodi:nodetypes="ccccc"
+           transform="translate(0,924.3622)"
+           inkscape:connector-curvature="0"
+           id="path3007"
+           d="M 313.65236,68.401 334.86557,81.532983 360.62446,18.39845 C 360.46557,9.7742526 357.30423,13.159908 354.56354,14.862916 341.40827,33.057996 327.36107,50.616737 313.65236,68.401 Z"
+           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           transform="translate(0,924.3622)"
+           inkscape:connector-curvature="0"
+           id="path3009"
+           d="m 312.64221,70.926381 19.69798,12.121831 -7.07107,8.08122 -14.64721,-10.606601 z"
+           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           transform="translate(0,924.3622)"
+           inkscape:connector-curvature="0"
+           id="path3011"
+           d="m 310.11683,84.058364 13.13198,9.091373 c 0,0 3.81611,8.215953 -2.52538,15.152293 -17.21129,14.49883 -28.24073,2.98516 -39.39595,-12.121834 24.77147,18.680814 13.67052,-10.014133 28.78935,-12.121832 z"
+           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="22.851562"
+       inkscape:export-xdpi="22.851562"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_base_actor.png"
+       id="g3036"
+       transform="translate(-11.326964,-62.298301)">
+      <rect
+         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="rect2986"
+         width="126.03078"
+         height="126.03077"
+         x="130.84175"
+         y="926.27539" />
+      <rect
+         style="fill:none;stroke:#ffffff;stroke-width:0.99682093"
+         id="rect3013"
+         width="107.77778"
+         height="88.901855"
+         x="141.14188"
+         y="947.67273" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+         x="133.8445"
+         y="1045.9761"
+         id="text3013"><tspan
+           sodipodi:role="line"
+           id="tspan3015"
+           x="133.8445"
+           y="1045.9761"
+           style="font-size:11.43463326px;line-height:1.25;font-family:sans-serif">x,y</tspan></text>
+    </g>
+    <path
+       sodipodi:nodetypes="ccccscccccccsscccccccccccccccccccccccccccccsccccc"
+       inkscape:connector-curvature="0"
+       id="path3017"
+       d="m 24.533451,979.45722 14.647212,1.5153 -0.505076,-5.0508 5.050763,-25.2538 c 0,0 8.08122,-17.17255 8.08122,-15.15225 0,2.0203 2.777919,15.15225 2.777919,15.15225 l 20.960665,17.6776 -6.818528,7.3237 -0.757616,2.7779 12.626907,-8.5863 -4.545686,-4.0406 -18.687822,-17.1726 c 0,0 2.141266,-15.74195 1.104742,-28.26035 -1.035167,-12.502 0.883372,-20.7964 2.430791,-17.7016 3.030458,6.0609 3.030458,9.0914 3.030458,9.0914 l 3.535534,16.6675 -3.030458,3.5356 3.030458,-1.0102 1.010153,4.0406 3.535533,-3.5355 -3.535533,-4.5457 -3.030458,-19.698 -4.545687,-10.6066 -3.535533,-10.6066 -4.040611,-5.3033 1.010153,-2.0203 0.267344,-7.8331 -2.792726,-4.2887 -7.576143,2.0203 c -1.077801,1.6836 -0.345622,3.3672 1.262691,5.0507 l -1.262691,6.8186 h 1.515228 l 2.272843,2.7779 1.767767,-1.0102 2.901131,2.1366 -1.133363,3.6718 -0.757615,6.0609 -2.020305,13.6371 -8.08122,15.1523 -3.535534,1.0101 1.515229,3.5356 3.535534,-3.5356 0.505076,-2.0203 c 0,0 8.586296,-14.1421 7.071068,-11.6167 -1.515229,2.5254 -1.767767,11.1117 -1.767767,11.1117 l -8.838835,28.78925 c 0.904671,9.3807 -1.085684,18.0376 -2.77792,26.769 l -11.169644,0.9903 z"
+       style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <g
+       inkscape:export-ydpi="22.851562"
+       inkscape:export-xdpi="22.851562"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_fg_actor.png"
+       id="g3049"
+       transform="translate(-11.326964,-62.298301)">
+      <rect
+         style="fill:none;stroke:#ffffff"
+         id="rect3021"
+         width="70.328865"
+         height="76.138458"
+         x="409.27252"
+         y="936.12628" />
+      <rect
+         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="rect3023"
+         width="126.03078"
+         height="126.03077"
+         x="400.27869"
+         y="926.27539" />
+      <rect
+         style="fill:none;stroke:#ffffff"
+         id="rect3029"
+         width="48.343479"
+         height="64.884583"
+         x="468.47949"
+         y="954.52216" />
+      <rect
+         y="971.46973"
+         x="414.21808"
+         height="76.468552"
+         width="87.580612"
+         id="rect3019"
+         style="fill:#cccccc;stroke:none" />
+      <g
+         id="g3028"
+         transform="matrix(1.0138417,0,0,1.0138417,146.98573,-17.250149)"
+         style="fill:#000000">
+        <path
+           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 313.65236,68.401 334.86557,81.532983 360.62446,18.39845 C 360.46557,9.7742526 357.30423,13.159908 354.56354,14.862916 341.40827,33.057996 327.36107,50.616737 313.65236,68.401 Z"
+           id="path3030"
+           inkscape:connector-curvature="0"
+           transform="translate(0,924.3622)"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 312.64221,70.926381 19.69798,12.121831 -7.07107,8.08122 -14.64721,-10.606601 z"
+           id="path3032"
+           inkscape:connector-curvature="0"
+           transform="translate(0,924.3622)"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 310.11683,84.058364 13.13198,9.091373 c 0,0 3.81611,8.215953 -2.52538,15.152293 -17.21129,14.49883 -28.24073,2.98516 -39.39595,-12.121834 24.77147,18.680814 13.67052,-10.014133 28.78935,-12.121832 z"
+           id="path3034"
+           inkscape:connector-curvature="0"
+           transform="translate(0,924.3622)"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
+    <text
+       id="text3024"
+       y="1287.2845"
+       x="-8.4478226"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="1287.2845"
+         x="-8.4478226"
+         id="tspan3026"
+         sodipodi:role="line"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">animation</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       x="239.98355"
+       y="1298.6116"
+       id="text3035"><tspan
+         sodipodi:role="line"
+         id="tspan3037"
+         x="239.98355"
+         y="1298.6116"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">repeat</tspan></text>
+    <text
+       id="text3041"
+       y="1611.5168"
+       x="-3.9036942"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="1611.5168"
+         x="-3.9036942"
+         id="tspan3043"
+         sodipodi:role="line"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">pickup</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       x="145.41612"
+       y="1612.9327"
+       id="text3047"><tspan
+         sodipodi:role="line"
+         id="tspan3049"
+         x="145.41612"
+         y="1612.9327"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">lookup</tspan></text>
+    <text
+       id="text3053"
+       y="1617.1804"
+       x="295.81592"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="1617.1804"
+         x="295.81592"
+         id="tspan3055"
+         sodipodi:role="line"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">talk</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       x="432.39352"
+       y="1614.3486"
+       id="text3059"><tspan
+         sodipodi:role="line"
+         id="tspan3061"
+         x="432.39352"
+         y="1614.3486"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">use</tspan></text>
+    <text
+       id="text3065"
+       y="1620.0121"
+       x="560.67462"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="1620.0121"
+         x="560.67462"
+         id="tspan3067"
+         sodipodi:role="line"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">init</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       x="1011.9484"
+       y="1628.9293"
+       id="text3071"><tspan
+         sodipodi:role="line"
+         id="tspan3073"
+         x="1011.9484"
+         y="1628.9293"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">test</tspan></text>
+    <text
+       id="text3077"
+       y="1630.3452"
+       x="1133.5559"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="1630.3452"
+         x="1133.5559"
+         id="tspan3079"
+         sodipodi:role="line"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">leave</tspan></text>
+    <g
+       inkscape:export-ydpi="22.851561"
+       inkscape:export-xdpi="22.851561"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_lookat.png"
+       style="stroke:none"
+       id="g3667"
+       transform="translate(-3.485669,192.55839)">
+      <rect
+         y="1262.6561"
+         x="129.05273"
+         height="126.03077"
+         width="126.03078"
+         id="rect3045"
+         style="fill:none;stroke:none" />
+      <g
+         inkscape:export-ydpi="84"
+         inkscape:export-xdpi="84"
+         transform="matrix(1.043479,0,0,1.043479,-311.76888,-529.98822)"
+         id="g995"
+         style="fill:#000000;stroke:none">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0"
+           id="path997"
+           d="m 442.86429,1754.1491 c 10.78295,-2.0415 22.63506,-3.5484 31.72963,-6.4341 17.41543,4.5145 34.8732,6.2578 52.61828,9.7833 l -0.79324,5.6408 c -13.94799,-3.6905 -30.86751,-7.0314 -52.79456,-9.7833 -14.53933,2.2933 -27.21975,5.5161 -39.92644,8.7257 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ccccssccscsscccssccs"
+           inkscape:connector-curvature="0"
+           id="path999"
+           d="m 469.53272,1756.2959 c -12.32701,5.3522 -23.74909,10.1265 -35.83835,9.8143 l -0.76134,5.3571 c 8.03045,0.5053 15.01189,3.1755 19.07502,11.9461 0,0 -2.79705,8.0239 -3.50216,9.7867 -0.40755,1.0188 10.0109,4.9058 17.9261,9.2745 5.7789,3.1895 9.70362,7.3365 9.70362,7.3365 l -14.9361,-26.7161 c 30.24932,16.4667 62.28535,27.4255 70.27709,9.4129 4.42574,-9.9751 -6.88933,-18.2849 -10.71262,-10.1604 0,0 5.16501,-2.3834 6.00766,1.4396 4.44189,20.1524 -29.73454,11.8551 -43.36869,0.2354 -1.49294,-1.2724 46.44174,-11.7994 46.44174,-10.1189 l 1.61958,-5.8001 c -18.13025,4.301 -40.95965,-10.4622 -61.93155,-11.8076 z m 2.9623,9.4544 c 11.19809,-0.067 24.28852,1.3987 36.94576,6.0077 0.93698,0.3412 -27.67125,6.6029 -27.67125,6.6029 l -32.91758,-9.9667 c 5.34462,-1.3315 13.7624,-2.5851 23.64307,-2.6439 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path1001"
+           d="m 470.73702,1761.8052 c -0.83593,1.3734 -1.3012,2.9024 -1.3012,4.5265 0,5.8124 5.99006,10.5342 13.38574,10.5342 7.39568,0 13.38574,-4.7218 13.38574,-10.5342 0,-0.3491 -0.027,-0.684 -0.0692,-1.0244 -7.51389,-0.9914 -19.42592,-2.5902 -25.40108,-3.5021 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="22.851561"
+       inkscape:export-xdpi="22.851561"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_pickup.png"
+       style="stroke:none"
+       id="g3663"
+       transform="translate(-3.485669,192.55839)">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3039"
+         width="126.03078"
+         height="126.03077"
+         x="-2.2670839"
+         y="1262.6561" />
+      <ellipse
+         inkscape:export-ydpi="84"
+         inkscape:export-xdpi="84"
+         clip-path="url(#clipPath5598-8-0-5)"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.13543987;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="path1003"
+         transform="matrix(0.38619269,0,0,0.37671016,-71.103241,1124.5068)"
+         cx="353.77585"
+         cy="549.35583"
+         rx="173.90331"
+         ry="178.28075" />
+    </g>
+    <g
+       inkscape:export-ydpi="22.851559"
+       inkscape:export-xdpi="22.851559"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+       style="stroke:none"
+       id="g3674"
+       transform="translate(-3.485669,192.55839)">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3051"
+         width="126.03078"
+         height="126.03077"
+         x="261.38272"
+         y="1262.6561" />
+      <g
+         id="g1013"
+         transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+         inkscape:export-xdpi="84"
+         inkscape:export-ydpi="84"
+         style="fill:#000000;stroke:none">
+        <path
+           id="rect1009"
+           transform="matrix(1.0251802,0,0,1.0251802,733.2748,485.65628)"
+           d="m 293.5,358.5625 c -13.50982,0 -24.375,10.86518 -24.375,24.375 v 19.125 c 0,13.50982 10.86518,24.375 24.375,24.375 h 18.875 l 7.65625,24.53125 9.03125,-24.53125 H 356 c 13.50982,0 24.375,-10.86518 24.375,-24.375 v -19.125 c 0,-13.50982 -10.86518,-24.375 -24.375,-24.375 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;marker:none;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="22.851559"
+       inkscape:export-xdpi="22.851559"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_leave.png"
+       style="stroke:none"
+       id="g3698"
+       transform="translate(987.62367,45.307855)">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3075"
+         width="126.03078"
+         height="126.03077"
+         x="132.08318"
+         y="1420.2399" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+         d="m 139.76383,1506.2702 -1.63977,-36.0745 h 68.86975 v -25.4163 l 43.45357,43.4536 c 0,0 -44.09434,26.5217 -45.01577,25.9899 -0.92148,-0.532 0.81989,-22.7105 0.81989,-22.7105 z"
+         id="path936-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
+         inkscape:export-xdpi="100"
+         inkscape:export-ydpi="100" />
+    </g>
+    <g
+       inkscape:export-ydpi="22.851559"
+       inkscape:export-xdpi="22.851559"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_test.png"
+       style="stroke:none"
+       id="g3694"
+       transform="translate(987.62367,45.307855)">
+      <rect
+         y="1420.2399"
+         x="-2.2671149"
+         height="126.03077"
+         width="126.03078"
+         id="rect3069"
+         style="fill:none;stroke:none" />
+      <path
+         style="fill:#ffffff;stroke:none;stroke-width:1.03658688px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 48.549451,1430.9526 28.268952,-1.4293 -8.562007,35.5583 31.147027,74.4052 -80.235419,-0.1294 36.419641,-74.2758 z"
+         id="path3143"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+    <g
+       inkscape:export-ydpi="22.851561"
+       inkscape:export-xdpi="22.851561"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_use.png"
+       style="stroke:none"
+       id="g3680"
+       transform="translate(-3.485669,192.55839)">
+      <rect
+         y="1262.6561"
+         x="393.71271"
+         height="126.03077"
+         width="126.03078"
+         id="rect3057"
+         style="fill:none;stroke:none" />
+      <rect
+         style="fill:#ffffff;stroke:none"
+         id="rect3145"
+         width="112.99651"
+         height="67.142853"
+         x="400.78745"
+         y="1306.6479"
+         rx="9.5146341"
+         ry="9.5146341" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 440.59375,1293.2997 c -1.87244,0 -3.375,1.5026 -3.375,3.375 v 17.0938 c 0,1.8724 1.50256,3.375 3.375,3.375 h 33.375 c 1.87244,0 3.375,-1.5026 3.375,-3.375 v -17.0938 c 0,-1.8724 -1.50256,-3.375 -3.375,-3.375 z m 5,3.5625 h 23.375 c 1.31168,0 2.375,1.0633 2.375,2.375 v 11.9688 c 0,1.3116 -1.06332,2.375 -2.375,2.375 h -23.375 c -1.31168,0 -2.375,-1.0634 -2.375,-2.375 v -11.9688 c 0,-1.3117 1.06332,-2.375 2.375,-2.375 z"
+         id="rect3147"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:export-ydpi="22.851561"
+       inkscape:export-xdpi="22.851561"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_animation.png"
+       style="stroke:none"
+       id="g3556"
+       transform="translate(55.485669,53.60616)">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3014"
+         width="126.03078"
+         height="126.03077"
+         x="0.76336503"
+         y="1092.9506" />
+      <g
+         style="stroke:none"
+         id="g3434">
+        <rect
+           y="1124.4402"
+           x="5.7142863"
+           height="62.987011"
+           width="114.28571"
+           id="rect3156"
+           style="fill:#ffffff;stroke:none" />
+        <rect
+           inkscape:tile-y0="204.42882"
+           inkscape:tile-x0="10.714288"
+           inkscape:tile-h="5.7142835"
+           inkscape:tile-w="5.7142835"
+           inkscape:tile-cy="207.28596"
+           inkscape:tile-cx="13.571429"
+           style="fill:#000000;stroke:none"
+           id="rect3160"
+           width="5.7142835"
+           height="5.7142835"
+           x="12.142859"
+           y="1128.791"
+           rx="0.5360356"
+           ry="0.5360356" />
+        <use
+           style="stroke:none"
+           transform="translate(-7.8571428)"
+           height="128"
+           width="128"
+           id="use3306"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3308"
+           transform="translate(7.9999969)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3310"
+           transform="translate(15.999994)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3312"
+           transform="translate(23.999991)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3314"
+           transform="translate(31.999988)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3316"
+           transform="translate(39.999984)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3318"
+           transform="translate(47.999981)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3320"
+           transform="translate(55.999978)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3322"
+           transform="translate(63.999975)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3324"
+           transform="translate(71.999972)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3326"
+           transform="translate(79.999969)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3328"
+           transform="translate(87.999966)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3330"
+           transform="translate(95.999963)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3332"
+           transform="translate(103.99996)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <rect
+           ry="0.5360356"
+           rx="0.5360356"
+           y="1175.9338"
+           x="12.142859"
+           height="5.7142835"
+           width="5.7142835"
+           id="rect3336"
+           style="fill:#000000;stroke:none"
+           inkscape:tile-cx="13.571429"
+           inkscape:tile-cy="207.28596"
+           inkscape:tile-w="5.7142835"
+           inkscape:tile-h="5.7142835"
+           inkscape:tile-x0="10.714288"
+           inkscape:tile-y0="204.42882" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           id="use3338"
+           width="128"
+           height="128"
+           transform="translate(-7.8571428,47.142857)" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(7.9999969,47.142857)"
+           id="use3340"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(15.999994,47.142857)"
+           id="use3342"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(23.999991,47.142857)"
+           id="use3344"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(31.999988,47.142857)"
+           id="use3346"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(39.999984,47.142857)"
+           id="use3348"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(47.999981,47.142857)"
+           id="use3350"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(55.999978,47.142857)"
+           id="use3352"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(63.999975,47.142857)"
+           id="use3354"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(71.999972,47.142857)"
+           id="use3356"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(79.999969,47.142857)"
+           id="use3358"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(87.999966,47.142857)"
+           id="use3360"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(95.999963,47.142857)"
+           id="use3362"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(103.99996,47.142857)"
+           id="use3364"
+           width="128"
+           height="128" />
+      </g>
+    </g>
+    <text
+       id="text3430"
+       y="1299.3132"
+       x="447.9834"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="1299.3132"
+         x="447.9834"
+         id="tspan3432"
+         sodipodi:role="line"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">yoyo</tspan></text>
+    <g
+       inkscape:export-ydpi="22.851561"
+       inkscape:export-xdpi="22.851561"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_init.png"
+       style="stroke:none"
+       id="g3685"
+       transform="translate(-3.485669,192.55839)">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3063"
+         width="126.03078"
+         height="126.03077"
+         x="529.07312"
+         y="1262.6561" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:xx-small;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.11111116;marker:none;enable-background:accumulate"
+         d="m 641.36875,1270.4067 -17.61397,13.9947 c -9.26356,-7.7681 -21.16067,-12.4866 -34.08183,-12.4866 -29.20278,0 -53.20384,24.0011 -53.20384,53.2039 0,29.2028 24.00106,52.661 53.20384,52.661 22.89394,0 42.56656,-14.3897 50.00678,-34.685 l -19.06168,-4.6449 c -5.10121,12.0294 -16.92245,20.3284 -30.9451,20.3284 -18.77049,0 -33.65958,-14.889 -33.65958,-33.6595 0,-18.7705 14.88909,-34.2024 33.65958,-34.2024 6.96429,0 13.36337,2.1563 18.69976,5.7909 l -17.43301,13.874 50.42905,9.3498 z"
+         id="path3768"
+         inkscape:connector-curvature="0" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       x="1273.5697"
+       y="1630.751"
+       id="text3540"><tspan
+         sodipodi:role="line"
+         id="tspan3542"
+         x="1273.5697"
+         y="1630.751"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">custom</tspan></text>
+    <g
+       inkscape:export-ydpi="22.851564"
+       inkscape:export-xdpi="22.851564"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_custom.png"
+       style="stroke:none"
+       id="g3689"
+       transform="translate(987.62367,45.307855)">
+      <rect
+         y="1419.2297"
+         x="266.43347"
+         height="126.03077"
+         width="126.03078"
+         id="rect3538"
+         style="fill:none;stroke:none" />
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/config.png"
+         id="g3544"
+         inkscape:label="Layer 1"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+         transform="matrix(0.71578752,0,0,0.71578752,43.77428,1081.9921)">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           d="m 393.9375,475.8125 -2.75,6.5 -0.75,4.6875 0.125,1.75 -7,0.90625 -0.3125,-1.71875 -1.9375,-4.3125 -4.3125,-5.5625 -4.4375,1.15625 -0.9375,7 0.5,4.71875 0.5625,1.65625 -6.5,2.6875 -0.75,-1.59375 -3,-3.65625 -5.625,-4.25 -3.9375,2.25 0.875,7 1.6875,4.4375 1,1.4375 -5.625,4.3125 -1.125,-1.34375 -3.875,-2.75 -6.5,-2.6875 -3.25,3.21875 2.6875,6.53125 2.75,3.84375 1.375,1.125 -4.3125,5.625 -1.4375,-1 -4.4375,-1.6875 -7,-0.875 -2.25,3.9375 4.25,5.59375 3.6875,3 1.5625,0.78125 -2.6875,6.53125 -1.6875,-0.59375 L 323.875,534 l -7,0.9375 -1.1875,4.40625 5.5625,4.3125 4.3125,1.9375 1.75,0.3125 -0.9375,7.03125 -1.75,-0.15625 -4.6875,0.78125 -6.5,2.71875 v 4.53125 l 6.5,2.71875 4.6875,0.78125 1.75,-0.15625 0.9375,7.03125 -1.75,0.3125 -4.3125,1.96875 -5.5625,4.28125 1.1875,4.40625 7,0.9375 4.6875,-0.46875 1.6875,-0.59375 2.6875,6.5625 -1.5625,0.75 -3.6875,3 -4.25,5.59375 2.25,3.9375 7,-0.875 4.4375,-1.6875 1.4375,-1 4.3125,5.625 -1.375,1.125 -2.75,3.84375 -2.6875,6.53125 3.25,3.21875 6.5,-2.65625 3.875,-2.78125 1.125,-1.34375 5.625,4.3125 -1,1.4375 -1.6875,4.4375 -0.875,7 3.9375,2.28125 5.625,-4.28125 3,-3.65625 0.75,-1.59375 6.5,2.71875 -0.5625,1.65625 -0.5,4.6875 0.9375,7 4.4375,1.1875 4.3125,-5.59375 1.9375,-4.3125 0.3125,-1.71875 7,0.90625 -0.125,1.75 0.75,4.6875 2.75,6.5 H 398.5 l 2.6875,-6.5 0.75,-4.6875 -0.125,-1.75 7,-0.90625 0.3125,1.71875 2,4.3125 4.3125,5.59375 4.375,-1.1875 0.9375,-7 -0.4375,-4.6875 -0.625,-1.65625 6.5625,-2.71875 0.75,1.59375 3,3.65625 5.5625,4.28125 4,-2.28125 -0.9375,-7 -1.6875,-4.4375 -1,-1.4375 5.625,-4.3125 1.1875,1.34375 3.8125,2.78125 6.5,2.65625 3.25,-3.21875 -2.6875,-6.53125 -2.75,-3.84375 -1.375,-1.125 4.3125,-5.625 1.5,1 4.375,1.6875 7,0.875 2.3125,-3.9375 -4.3125,-5.59375 -3.625,-3 -1.625,-0.75 2.75,-6.5625 1.625,0.59375 4.75,0.46875 6.9375,-0.9375 1.1875,-4.40625 -5.5625,-4.28125 -4.3125,-1.96875 -1.75,-0.3125 0.9375,-7.03125 1.75,0.15625 4.6875,-0.78125 6.5,-2.71875 v -4.53125 l -6.5,-2.71875 -4.6875,-0.78125 -1.75,0.15625 -0.9375,-7.03125 1.75,-0.3125 4.3125,-1.9375 5.5625,-4.3125 L 475.5,534.9375 468.5625,534 l -4.75,0.46875 -1.625,0.59375 -2.75,-6.53125 1.625,-0.78125 3.625,-3 4.3125,-5.59375 -2.3125,-3.9375 -7,0.875 -4.375,1.6875 -1.5,1 -4.3125,-5.625 1.375,-1.125 2.75,-3.84375 2.6875,-6.53125 -3.25,-3.21875 -6.5,2.6875 -3.8125,2.75 -1.1875,1.34375 -5.625,-4.3125 1,-1.4375 1.6875,-4.4375 0.9375,-7 -4,-2.25 -5.5625,4.25 -3,3.65625 -0.75,1.59375 -6.5625,-2.6875 0.625,-1.65625 0.4375,-4.71875 -0.9375,-7 -4.375,-1.15625 -4.3125,5.5625 -2,4.3125 -0.3125,1.71875 -7,-0.90625 0.125,-1.75 -0.75,-4.6875 -2.6875,-6.5 z m 2.25,30.53125 c 0.96651,0 1.95262,0.0421 2.90625,0.0937 -0.0995,4.40159 -1.1276,7.8826 -2.40625,7.875 -1.28164,-0.008 -2.2859,-3.51994 -2.375,-7.9375 0.6301,-0.0225 1.23944,-0.0312 1.875,-0.0312 z m -7.71875,0.5625 3.0625,3.53125 v -0.0625 l 2.375,6.375 v 9.21875 0.25 9.21875 l -2.375,6.375 v 2.84375 c -0.0219,0.007 -0.0407,0.024 -0.0625,0.0312 -0.3299,0.11206 -0.64999,0.2405 -0.96875,0.375 -0.009,0.004 -0.0223,-0.004 -0.0312,0 -0.31212,0.13068 -0.63695,0.28642 -0.9375,0.4375 -0.0291,0.0149 -0.0648,0.0162 -0.0937,0.0312 -0.25899,0.13459 -0.50042,0.28814 -0.75,0.4375 -0.0407,0.0239 -0.0846,0.0382 -0.125,0.0625 -0.0764,0.0467 -0.14326,0.10815 -0.21875,0.15625 -0.19238,0.12073 -0.37635,0.21449 -0.5625,0.34375 -0.0848,0.0595 -0.16656,0.12622 -0.25,0.1875 -0.30297,0.2199 -0.59039,0.47685 -0.875,0.71875 -0.1587,0.13488 -0.31606,0.26482 -0.46875,0.40625 -0.1196,0.11203 -0.22798,0.22779 -0.34375,0.34375 -0.26952,0.26655 -0.53322,0.52575 -0.78125,0.8125 -0.24184,0.27959 -0.4673,0.57741 -0.6875,0.875 -0.67919,0.9179 -1.26881,1.90268 -1.71875,2.96875 h -3.21875 l -6.375,2.375 h -9.21875 -0.25 -9.21875 l -6.28125,-2.34375 -3.375,-2.96875 c 3.71343,-22.19248 21.42713,-39.6804 43.7499,-42.9999 z m 16.375,0.15625 c 22.1913,3.68786 39.6626,21.32274 42.96875,43.78125 l -3.53125,3.0625 h 0.0625 l -6.375,2.375 H 428.75 428.5 419.28125 l -6.375,-2.375 h -2.84375 c -0.007,-0.0221 -0.0238,-0.0404 -0.0312,-0.0625 -0.11419,-0.34119 -0.23712,-0.67069 -0.375,-1 -0.27185,-0.64069 -0.58069,-1.25397 -0.9375,-1.84375 -0.0321,-0.054 -0.0609,-0.10268 -0.0937,-0.15625 -0.0121,-0.0195 -0.019,-0.0431 -0.0312,-0.0625 -0.18907,-0.3054 -0.38347,-0.58528 -0.59375,-0.875 -0.2199,-0.30297 -0.47685,-0.59039 -0.71875,-0.875 -0.23844,-0.28054 -0.49137,-0.55099 -0.75,-0.8125 -0.26655,-0.26952 -0.52575,-0.53322 -0.8125,-0.78125 -0.27959,-0.24184 -0.57741,-0.4673 -0.875,-0.6875 -0.91791,-0.67919 -1.90268,-1.26881 -2.96875,-1.71875 v -3.21875 l -2.375,-6.375 v -9.21875 -0.25 -9.21875 l 2.34375,-6.28125 z m -8.15625,31.65625 c 1.03299,-0.006 1.92692,2.25218 2.28125,5.4375 -0.89409,-0.17199 -1.83752,-0.2484 -2.78125,-0.25 -0.16624,-2.9e-4 -0.33505,0.0264 -0.5,0.0312 -0.33747,0.01 -0.66869,0.0297 -1,0.0625 -0.0313,0.003 -0.0625,-0.003 -0.0937,0 -0.0416,0.004 -0.0835,-0.005 -0.125,0 0.35765,-3.09526 1.20513,-5.27518 2.2187,-5.2812 z m -0.75,12.625 h 0.21875 c 0.49822,8.4e-4 0.99873,0.0596 1.46875,0.15625 0.01,0.002 0.0213,-0.002 0.0312,0 0.22451,0.0472 0.43989,0.0888 0.65625,0.15625 0.20816,0.065 0.42548,0.13578 0.625,0.21875 0.0125,0.005 0.0188,0.026 0.0312,0.0312 0.009,0.004 0.0225,-0.004 0.0312,0 0.20698,0.0885 0.39723,0.20578 0.59375,0.3125 0.008,0.004 0.0231,-0.004 0.0312,0 0.19657,0.10768 0.37757,0.25017 0.5625,0.375 0.007,0.005 0.024,-0.005 0.0312,0 0.18468,0.12561 0.35936,0.26456 0.53125,0.40625 0.007,0.005 0.0248,-0.005 0.0312,0 0.48268,0.40046 0.91685,0.86359 1.28125,1.375 0.0341,0.0479 0.0608,0.10754 0.0937,0.15625 0.12978,0.19189 0.23262,0.38932 0.34375,0.59375 0.11113,0.20443 0.22124,0.40923 0.3125,0.625 0.0635,0.1528 0.13431,0.31078 0.1875,0.46875 0.0107,0.0314 0.021,0.0622 0.0312,0.0937 0.0613,0.19048 0.11051,0.39661 0.15625,0.59375 0.0145,0.0626 0.0184,0.12429 0.0312,0.1875 0.0344,0.16823 0.0711,0.32764 0.0937,0.5 0.004,0.0304 -0.004,0.0632 0,0.0937 0.0245,0.20693 0.0556,0.41296 0.0625,0.625 0.003,0.0822 1.4e-4,0.16711 0,0.25 -0.001,0.23851 -0.007,0.48617 -0.0312,0.71875 -10e-4,0.0101 10e-4,0.0212 0,0.0312 -0.0249,0.23214 -0.0787,0.46241 -0.125,0.6875 -0.002,0.01 0.002,0.0213 0,0.0312 -0.0472,0.22451 -0.0888,0.43989 -0.15625,0.65625 -0.003,0.009 0.003,0.0225 0,0.0312 -0.0629,0.19863 -0.13944,0.40303 -0.21875,0.59375 -0.005,0.0124 -0.026,0.0188 -0.0312,0.0312 -0.004,0.009 0.004,0.0227 0,0.0312 -0.0885,0.20697 -0.20578,0.39723 -0.3125,0.59375 -0.004,0.008 0.004,0.0231 0,0.0312 -0.10768,0.19657 -0.25017,0.37757 -0.375,0.5625 -0.005,0.007 0.005,0.024 0,0.0312 -0.12561,0.18468 -0.26456,0.35936 -0.40625,0.53125 -0.005,0.006 0.005,0.0256 0,0.0312 -0.14271,0.172 -0.31098,0.31077 -0.46875,0.46875 -0.28498,0.28535 -0.57708,0.57796 -0.90625,0.8125 -0.0493,0.0349 -0.10604,0.06 -0.15625,0.0937 -0.38377,0.25956 -0.78722,0.47372 -1.21875,0.65625 -0.1528,0.0635 -0.31078,0.13431 -0.46875,0.1875 -0.0314,0.0106 -0.0622,0.021 -0.0937,0.0312 -0.0316,0.0103 -0.062,0.0214 -0.0937,0.0312 -0.1608,0.0494 -0.33455,0.0866 -0.5,0.125 -0.24437,0.0567 -0.49677,0.0939 -0.75,0.125 -0.1443,0.0177 -0.29063,0.0221 -0.4375,0.0312 -0.0718,0.004 -0.14638,0.0289 -0.21875,0.0312 -0.0822,0.003 -0.16711,1.4e-4 -0.25,0 -0.24902,-10e-4 -0.50748,-0.005 -0.75,-0.0312 -0.23243,-0.0239 -0.46207,-0.0796 -0.6875,-0.125 -0.0102,-0.002 -0.0211,0.002 -0.0312,0 -0.22485,-0.0462 -0.4395,-0.0897 -0.65625,-0.15625 -0.009,-0.003 -0.0218,0.003 -0.0312,0 -0.11777,-0.0367 -0.22864,-0.0825 -0.34375,-0.125 -0.0838,-0.0313 -0.16768,-0.0595 -0.25,-0.0937 -0.0124,-0.005 -0.0189,-0.0261 -0.0312,-0.0312 -0.009,-0.004 -0.0226,0.004 -0.0312,0 -0.20739,-0.0878 -0.39677,-0.20651 -0.59375,-0.3125 -0.008,-0.004 -0.0236,0.004 -0.0312,0 -0.197,-0.10699 -0.37709,-0.25082 -0.5625,-0.375 -0.007,-0.005 -0.0242,0.005 -0.0312,0 -0.18515,-0.12498 -0.35886,-0.26515 -0.53125,-0.40625 -0.006,-0.005 -0.0253,0.005 -0.0312,0 -0.17246,-0.14217 -0.31027,-0.31148 -0.46875,-0.46875 -0.23952,-0.23921 -0.48341,-0.47929 -0.6875,-0.75 -0.039,-0.0518 -0.0873,-0.10338 -0.125,-0.15625 -0.0337,-0.0482 -0.0612,-0.10716 -0.0937,-0.15625 -0.35285,-0.5217 -0.6365,-1.08073 -0.84375,-1.6875 -0.0102,-0.0304 -0.0214,-0.0631 -0.0312,-0.0937 -0.0371,-0.11363 -0.0623,-0.22772 -0.0937,-0.34375 -0.0385,-0.14298 -0.0638,-0.2911 -0.0937,-0.4375 -0.0334,-0.16374 -0.0717,-0.33241 -0.0937,-0.5 -10e-4,-0.0102 0.001,-0.021 0,-0.0312 -10e-4,-0.0102 0.001,-0.0211 0,-0.0312 -0.0175,-0.14283 -0.0222,-0.29219 -0.0312,-0.4375 -0.005,-0.0739 -0.0288,-0.14426 -0.0312,-0.21875 V 558.562 c -3e-5,-0.0104 -2e-5,-0.0209 0,-0.0312 10e-4,-0.24902 0.005,-0.50748 0.0312,-0.75 0.0239,-0.23221 0.0796,-0.46248 0.125,-0.6875 0.002,-0.0102 -0.002,-0.0211 0,-0.0312 0.0462,-0.22444 0.0897,-0.44006 0.15625,-0.65625 0.003,-0.009 -0.003,-0.0219 0,-0.0312 0.0635,-0.20311 0.13824,-0.39889 0.21875,-0.59375 0.005,-0.0125 0.026,-0.0188 0.0312,-0.0312 0.004,-0.009 -0.004,-0.0226 0,-0.0312 0.0878,-0.20668 0.20651,-0.39758 0.3125,-0.59375 0.004,-0.008 -0.004,-0.0236 0,-0.0312 0.10699,-0.1962 0.25082,-0.37797 0.375,-0.5625 0.005,-0.007 -0.005,-0.0243 0,-0.0312 0.12498,-0.18427 0.26515,-0.35978 0.40625,-0.53125 0.005,-0.006 -0.005,-0.0253 0,-0.0312 0.14217,-0.17154 0.31148,-0.31122 0.46875,-0.46875 0.28498,-0.28535 0.57708,-0.57796 0.90625,-0.8125 0.0482,-0.0337 0.10716,-0.0612 0.15625,-0.0937 0.5217,-0.35285 1.08073,-0.6365 1.6875,-0.84375 0.0304,-0.0103 0.0631,-0.0214 0.0937,-0.0312 0.11363,-0.0371 0.22772,-0.0623 0.34375,-0.0937 0.14298,-0.0385 0.2911,-0.0638 0.4375,-0.0937 0.23484,-0.0479 0.47617,-0.10067 0.71875,-0.125 0.16563,-0.0168 0.33067,-0.0259 0.49975,-0.0313 z m -51.84375,4.28125 c 4.38664,0.10376 7.85133,1.13065 7.84375,2.40625 -0.008,1.27857 -3.50356,2.28165 -7.90625,2.375 -0.0213,-0.6126 -0.0625,-1.22597 -0.0625,-1.84375 0,-0.98561 0.071,-1.96528 0.125,-2.9375 z m 37.6875,0.125 c -0.17196,0.89407 -0.2484,1.83752 -0.25,2.78125 -8.3e-4,0.49565 0.0471,0.98559 0.0937,1.46875 10e-4,0.0104 -0.001,0.0208 0,0.0312 0.003,0.0308 -0.003,0.063 0,0.0937 0.004,0.0416 -0.005,0.0835 0,0.125 -3.09528,-0.35772 -5.27523,-1.20518 -5.28125,-2.21875 -0.006,-1.03291 2.25223,-1.92682 5.43755,-2.28115 z m 66.5625,0.9375 c 10e-4,0.0314 -10e-4,0.0624 0,0.0937 l 0.0312,1.78125 c 0,0.97507 -0.0409,1.94435 -0.0937,2.90625 -4.40158,-0.0995 -7.8826,-1.1276 -7.875,-2.40625 0.008,-1.28159 3.51994,-2.28585 7.9375,-2.37495 z m -37.625,0.15625 c 3.09529,0.3577 5.27523,1.20518 5.28125,2.21875 0.006,1.03299 -2.25218,1.92692 -5.4375,2.28125 0.17197,-0.89409 0.2484,-1.83752 0.25,-2.78125 2.8e-4,-0.16624 -0.0264,-0.33505 -0.0312,-0.5 -0.009,-0.29508 -0.0364,-0.58458 -0.0625,-0.875 -0.007,-0.0731 0.008,-0.14599 0,-0.21875 -0.004,-0.0416 0.005,-0.0835 -5e-5,-0.125 z M 354.375,560.8125 h 9.21875 0.25 9.21875 l 6.375,2.375 h 2.84375 c 0.11383,0.3455 0.26817,0.66657 0.40625,1 0.004,0.009 -0.004,0.0222 0,0.0312 0.004,0.009 -0.004,0.0223 0,0.0312 0.13068,0.31212 0.28642,0.63695 0.4375,0.9375 0.14778,0.28911 0.30267,0.56623 0.46875,0.84375 0.0239,0.0407 0.0382,0.0846 0.0625,0.125 0.0467,0.0764 0.10815,0.14326 0.15625,0.21875 0.12073,0.19238 0.21449,0.37635 0.34375,0.5625 0.0595,0.0848 0.12622,0.16656 0.1875,0.25 0.34252,0.4719 0.72993,0.91722 1.125,1.34375 0.10694,0.11417 0.23323,0.20182 0.34375,0.3125 0.005,0.005 -0.005,0.026 0,0.0312 1.32812,1.34288 2.89009,2.44208 4.65625,3.1875 v 3.21875 l 2.375,6.375 v 9.21875 0.25 9.21875 l -2.34375,6.28125 -2.96875,3.40625 C 365.33101,606.31799 347.86932,588.58181 344.5625,566.25 l 3.5,-3.0625 H 348 Z m 64.90625,1.0625 h 9.21875 0.25 9.21875 l 6.28125,2.34375 3.40625,3 c -3.71228,22.20816 -21.43398,39.67617 -43.78125,42.96875 l -3.0625,-3.53125 v 0.0625 l -2.375,-6.375 v -9.21875 -0.25 -9.21875 l 2.375,-6.375 v -2.84375 c 0.0221,-0.007 0.0404,-0.0237 0.0625,-0.0312 0.32296,-0.10809 0.62516,-0.24566 0.9375,-0.375 0.009,-0.004 0.0223,0.004 0.0312,0 0.35117,-0.14624 0.72599,-0.29678 1.0625,-0.46875 0.27979,-0.1454 0.54371,-0.30614 0.8125,-0.46875 0.054,-0.0321 0.10268,-0.061 0.15625,-0.0937 0.23019,-0.14323 0.46613,-0.28205 0.6875,-0.4375 0.39155,-0.27189 0.76289,-0.59848 1.125,-0.90625 0.1587,-0.13639 0.31609,-0.26326 0.46875,-0.40625 0.1119,-0.10364 0.20393,-0.23669 0.3125,-0.34375 0.005,-0.005 0.0258,0.005 0.0312,0 1.34288,-1.32812 2.44208,-2.89009 3.1875,-4.65625 h 3.21875 z M 393.375,572.9375 c 0.8941,0.17197 1.83752,0.2484 2.78125,0.25 0.48503,8.2e-4 0.96444,-0.0491 1.4375,-0.0937 0.0208,-0.002 0.0417,0.002 0.0625,0 0.0313,-0.003 0.0625,0.003 0.0937,0 0.0416,-0.004 0.0835,0.005 0.125,0 -0.35769,3.09529 -1.20518,5.27523 -2.21875,5.28125 -1.03293,0.006 -1.92687,-2.25223 -2.2812,-5.43755 z m 2.28125,29.84375 c 1.28165,0.008 2.2859,3.51994 2.375,7.9375 -0.61253,0.0213 -1.22604,0.0312 -1.84375,0.0312 -0.9961,0 -1.95508,-0.0386 -2.9375,-0.0937 0.0995,-4.40158 1.1276,-7.8826 2.40625,-7.875 z"
+           id="path3546" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="22.851559"
+       inkscape:export-xdpi="22.851559"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_repeat.png"
+       style="stroke:none"
+       id="g3628"
+       transform="translate(113.53636,56.4379)">
+      <rect
+         y="1092.9506"
+         x="133.09335"
+         height="126.03077"
+         width="126.03078"
+         id="rect3033"
+         style="fill:none;stroke:none" />
+      <rect
+         y="1124.4402"
+         x="137.14285"
+         height="62.987011"
+         width="114.28571"
+         id="rect3366"
+         style="fill:#ffffff;stroke:none" />
+      <rect
+         inkscape:tile-y0="204.42882"
+         inkscape:tile-x0="10.714288"
+         inkscape:tile-h="5.7142835"
+         inkscape:tile-w="5.7142835"
+         inkscape:tile-cy="207.28596"
+         inkscape:tile-cx="13.571429"
+         style="fill:#000000;stroke:none"
+         id="rect3368"
+         width="5.7142835"
+         height="5.7142835"
+         x="143.57143"
+         y="1128.791"
+         rx="0.5360356"
+         ry="0.5360356" />
+      <use
+         style="stroke:none"
+         transform="translate(123.57143)"
+         height="128"
+         width="128"
+         id="use3370"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3372"
+         transform="translate(139.42857)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3374"
+         transform="translate(147.42856)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3376"
+         transform="translate(155.42856)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3378"
+         transform="translate(163.42856)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3380"
+         transform="translate(171.42855)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3382"
+         transform="translate(179.42855)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3384"
+         transform="translate(187.42855)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3386"
+         transform="translate(195.42855)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3388"
+         transform="translate(203.42854)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3390"
+         transform="translate(211.42854)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3392"
+         transform="translate(219.42854)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3394"
+         transform="translate(227.42853)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <use
+         style="stroke:none"
+         height="128"
+         width="128"
+         id="use3396"
+         transform="translate(235.42853)"
+         xlink:href="#rect3160"
+         inkscape:tiled-clone-of="#rect3160"
+         y="0"
+         x="0" />
+      <rect
+         ry="0.5360356"
+         rx="0.5360356"
+         y="1175.9338"
+         x="143.57143"
+         height="5.7142835"
+         width="5.7142835"
+         id="rect3398"
+         style="fill:#000000;stroke:none"
+         inkscape:tile-cx="13.571429"
+         inkscape:tile-cy="207.28596"
+         inkscape:tile-w="5.7142835"
+         inkscape:tile-h="5.7142835"
+         inkscape:tile-x0="10.714288"
+         inkscape:tile-y0="204.42882" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         id="use3400"
+         width="128"
+         height="128"
+         transform="translate(123.57143,47.142857)" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(139.42857,47.142857)"
+         id="use3402"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(147.42856,47.142857)"
+         id="use3404"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(155.42856,47.142857)"
+         id="use3406"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(163.42856,47.142857)"
+         id="use3408"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(171.42855,47.142857)"
+         id="use3410"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(179.42855,47.142857)"
+         id="use3412"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(187.42855,47.142857)"
+         id="use3414"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(195.42855,47.142857)"
+         id="use3416"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(203.42854,47.142857)"
+         id="use3418"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(211.42854,47.142857)"
+         id="use3420"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(219.42854,47.142857)"
+         id="use3422"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(227.42853,47.142857)"
+         id="use3424"
+         width="128"
+         height="128" />
+      <use
+         style="stroke:none"
+         x="0"
+         y="0"
+         inkscape:tiled-clone-of="#rect3160"
+         xlink:href="#rect3160"
+         transform="translate(235.42853,47.142857)"
+         id="use3426"
+         width="128"
+         height="128" />
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:xx-small;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.11111116;marker:none;enable-background:accumulate"
+         d="m 206.81038,1138.0564 -5.68284,4.5152 c -2.98872,-2.5063 -6.82711,-4.0286 -10.9959,-4.0286 -9.42176,0 -17.16528,7.7435 -17.16528,17.1653 0,9.4218 7.74352,16.9901 17.16528,16.9901 7.38633,0 13.73336,-4.6426 16.13381,-11.1905 l -6.14992,-1.4986 c -1.64581,3.8811 -5.45972,6.5586 -9.98389,6.5586 -6.05596,0 -10.85967,-4.8037 -10.85967,-10.8596 0,-6.0561 4.80371,-11.0349 10.85967,-11.0349 2.2469,0 4.31146,0.6958 6.03315,1.8683 l -5.62445,4.4762 16.27004,3.0166 z"
+         id="path3550"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:export-ydpi="22.851559"
+       inkscape:export-xdpi="22.851559"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_yoyo.png"
+       id="g3737"
+       transform="translate(156.01248,42.279193)">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3428"
+         width="126.03078"
+         height="126.03077"
+         x="268.09335"
+         y="1092.9506" />
+      <g
+         style="stroke:none"
+         id="g3467"
+         transform="rotate(-90,196.64284,1022.3623)">
+        <rect
+           style="fill:#ffffff;stroke:none"
+           id="rect3469"
+           width="114.28571"
+           height="62.987011"
+           x="5.7142863"
+           y="1124.4402" />
+        <rect
+           ry="0.5360356"
+           rx="0.5360356"
+           y="1128.791"
+           x="12.142859"
+           height="5.7142835"
+           width="5.7142835"
+           id="rect3471"
+           style="fill:#000000;stroke:none"
+           inkscape:tile-cx="13.571429"
+           inkscape:tile-cy="207.28596"
+           inkscape:tile-w="5.7142835"
+           inkscape:tile-h="5.7142835"
+           inkscape:tile-x0="10.714288"
+           inkscape:tile-y0="204.42882" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           id="use3473"
+           width="128"
+           height="128"
+           transform="translate(-7.8571428)" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(7.9999969)"
+           id="use3475"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(15.999994)"
+           id="use3477"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(23.999991)"
+           id="use3479"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(31.999988)"
+           id="use3481"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(39.999984)"
+           id="use3483"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(47.999981)"
+           id="use3485"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(55.999978)"
+           id="use3487"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(63.999975)"
+           id="use3489"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(71.999972)"
+           id="use3491"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(79.999969)"
+           id="use3493"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(87.999966)"
+           id="use3495"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(95.999963)"
+           id="use3497"
+           width="128"
+           height="128" />
+        <use
+           style="stroke:none"
+           x="0"
+           y="0"
+           inkscape:tiled-clone-of="#rect3160"
+           xlink:href="#rect3160"
+           transform="translate(103.99996)"
+           id="use3499"
+           width="128"
+           height="128" />
+        <rect
+           inkscape:tile-y0="204.42882"
+           inkscape:tile-x0="10.714288"
+           inkscape:tile-h="5.7142835"
+           inkscape:tile-w="5.7142835"
+           inkscape:tile-cy="207.28596"
+           inkscape:tile-cx="13.571429"
+           style="fill:#000000;stroke:none"
+           id="rect3501"
+           width="5.7142835"
+           height="5.7142835"
+           x="12.142859"
+           y="1175.9338"
+           rx="0.5360356"
+           ry="0.5360356" />
+        <use
+           style="stroke:none"
+           transform="translate(-7.8571428,47.142857)"
+           height="128"
+           width="128"
+           id="use3503"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3505"
+           transform="translate(7.9999969,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3507"
+           transform="translate(15.999994,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3509"
+           transform="translate(23.999991,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3511"
+           transform="translate(31.999988,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3513"
+           transform="translate(39.999984,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3515"
+           transform="translate(47.999981,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3517"
+           transform="translate(55.999978,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3519"
+           transform="translate(63.999975,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3521"
+           transform="translate(71.999972,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3523"
+           transform="translate(79.999969,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3525"
+           transform="translate(87.999966,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3527"
+           transform="translate(95.999963,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+        <use
+           style="stroke:none"
+           height="128"
+           width="128"
+           id="use3529"
+           transform="translate(103.99996,47.142857)"
+           xlink:href="#rect3160"
+           inkscape:tiled-clone-of="#rect3160"
+           y="0"
+           x="0" />
+      </g>
+      <circle
+         style="fill:#000000;stroke:none"
+         id="path3552"
+         transform="matrix(0,-1.5454545,1.5454545,0,-26.184071,1685.1769)"
+         cx="321.22852"
+         cy="230.02541"
+         r="11.111678" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2.15597081px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 331.25712,1180.5787 -0.35925,-85.7172"
+         id="path3554"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccscccccccsscccccccccccccccccccccccccccccsccccc"
+       inkscape:connector-curvature="0"
+       id="path3017-2"
+       d="m 942.01872,975.74842 14.64721,1.5152 -0.50507,-5.0508 5.05076,-25.2538 c 0,0 8.08122,-17.17235 8.08122,-15.15205 0,2.0203 2.77792,15.15205 2.77792,15.15205 l 20.96064,17.6777 -6.8185,7.3236 -0.75762,2.7779 12.62692,-8.5863 -4.5457,-4.0406 -18.68782,-17.17245 c 0,0 2.14126,-15.7419 1.10474,-28.2604 -1.03517,-12.502 0.88337,-20.7964 2.43079,-17.7015 3.03046,6.0609 3.03046,9.0913 3.03046,9.0913 l 3.53553,16.6676 -3.03046,3.5355 3.03046,-1.0101 1.0102,4.0406 3.5355,-3.5356 -3.5355,-4.5457 -3.0305,-19.6979 -4.54569,-10.6066 -3.53553,-10.6066 -4.04061,-5.3033 1.01015,-2.0204 0.26734,-7.833 -2.79272,-4.2888 -7.57615,2.0203 c -1.0778,1.6836 -0.34562,3.3672 1.2627,5.0508 l -1.2627,6.8185 h 1.51523 l 2.27285,2.7779 1.76776,-1.0101 2.90113,2.1365 -1.13336,3.6719 -0.75761,6.0609 -2.02031,13.637 -8.08122,15.1523 -3.53553,1.0102 1.51523,3.5355 3.53553,-3.5355 0.50508,-2.0203 c 0,0 8.58629,-14.1422 7.07106,-11.6168 -1.51523,2.5254 -1.76776,11.1117 -1.76776,11.1117 l -8.83884,28.78915 c 0.90467,9.3807 -1.08568,18.0376 -2.77792,26.7691 l -11.16964,0.9902 z"
+       style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <g
+       inkscape:export-ydpi="12.1875"
+       inkscape:export-xdpi="12.1875"
+       inkscape:export-filename="images/ic_player_small.png"
+       id="g3991"
+       transform="translate(16.705841,-64.300644)">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3179"
+         width="126.03078"
+         height="126.03077"
+         x="544.41321"
+         y="926.27539" />
+      <g
+         id="g3986"
+         transform="matrix(1.496623,0,0,1.496623,-293.67843,-733.71816)">
+        <path
+           sodipodi:nodetypes="cccccc"
+           transform="translate(0,924.3622)"
+           inkscape:connector-curvature="0"
+           id="path3212"
+           d="m 585.71429,195.14286 -14.28572,24.28571 31.42857,41.42857 31.42857,-40 -12.14286,-25 z"
+           style="fill:none;stroke:#ffffff;stroke-width:6.19999981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <text
+           id="text3214"
+           y="1162.3622"
+           x="590.71429"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+           xml:space="preserve"><tspan
+             y="1162.3622"
+             x="590.71429"
+             id="tspan3216"
+             sodipodi:role="line"
+             style="font-size:40px;line-height:1.25">P</tspan></text>
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="46.72699"
+       inkscape:export-xdpi="46.72699"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/gfx/on.png"
+       id="g3199"
+       transform="translate(2452.2877,-928.81104)">
+      <rect
+         style="fill:#00ff00;stroke:#ffffff;stroke-width:4.64423037;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect3191"
+         width="95.499977"
+         height="48.022785"
+         x="-55.326122"
+         y="1640.5033"
+         rx="24"
+         ry="24" />
+      <circle
+         style="fill:#ffffff;stroke:none"
+         id="path3193"
+         transform="matrix(1.2440211,0,0,1.2440211,-3.1106396,739.97943)"
+         cx="-20.203051"
+         cy="743.18292"
+         r="15.152288" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+         x="-38.695808"
+         y="1669.6108"
+         id="text3195"><tspan
+           style="font-size:14px;line-height:1.25;font-family:sans-serif;fill:#000000"
+           sodipodi:role="line"
+           id="tspan3197"
+           x="-38.695808"
+           y="1669.6108">ON</tspan></text>
+    </g>
+    <g
+       inkscape:export-ydpi="46.72699"
+       inkscape:export-xdpi="46.72699"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/gfx/off.png"
+       transform="translate(2455.5831,-849.52229)"
+       id="g3205">
+      <rect
+         ry="24"
+         rx="24"
+         y="1640.5033"
+         x="-55.326122"
+         height="48.022785"
+         width="95.499977"
+         id="rect3207"
+         style="fill:#ff0000;stroke:#ffffff;stroke-width:4.64423037;stroke-miterlimit:4;stroke-dasharray:none" />
+      <circle
+         transform="matrix(1.2440211,0,0,1.2440211,38.88936,739.97943)"
+         id="path3209"
+         style="fill:#ffffff;stroke:none"
+         cx="-20.203051"
+         cy="743.18292"
+         r="15.152288" />
+      <text
+         id="text3211"
+         y="1669.6108"
+         x="0.20067596"
+         style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           style="font-size:14px;line-height:1.25;font-family:sans-serif;fill:#000000"
+           y="1669.6108"
+           x="0.20067596"
+           id="tspan3213"
+           sodipodi:role="line">OFF</tspan></text>
+    </g>
+    <g
+       id="g4607"
+       inkscape:export-filename="icons/ic_add.png"
+       inkscape:export-xdpi="18.281246"
+       inkscape:export-ydpi="18.281246"
+       transform="translate(-39.217467,730.80645)">
+      <g
+         id="g3674-5"
+         style="stroke:none"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+         inkscape:export-xdpi="22.851559"
+         inkscape:export-ydpi="22.851559"
+         transform="translate(-288.68382,513.5698)">
+        <rect
+           y="1262.6561"
+           x="261.38272"
+           height="126.03077"
+           width="126.03078"
+           id="rect3051-3"
+           style="fill:none;stroke:none" />
+        <g
+           style="fill:#000000;stroke:none"
+           inkscape:export-ydpi="84"
+           inkscape:export-xdpi="84"
+           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+           transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+           id="g1013-6" />
+      </g>
+      <g
+         transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+         id="g4563">
+        <rect
+           style="fill:#ffffff;stroke:none"
+           id="rect4559"
+           width="82.85714"
+           height="17.857143"
+           x="-2.8571429"
+           y="903.71429"
+           transform="translate(0,924.3622)" />
+        <rect
+           transform="rotate(-90)"
+           y="29.642855"
+           x="-1878.4336"
+           height="17.857143"
+           width="82.85714"
+           id="rect4561"
+           style="fill:#ffffff;stroke:none" />
+      </g>
+    </g>
+    <g
+       id="g4615"
+       inkscape:export-filename="icons/ic_delete.png"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-ydpi="18.281252"
+       transform="translate(-39.217467,730.80645)">
+      <g
+         id="g3674-4"
+         style="stroke:none"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+         inkscape:export-xdpi="22.851559"
+         inkscape:export-ydpi="22.851559"
+         transform="translate(4.1733203,523.5698)">
+        <rect
+           y="1262.6561"
+           x="261.38272"
+           height="126.03077"
+           width="126.03078"
+           id="rect3051-37"
+           style="fill:none;stroke:none" />
+        <g
+           style="fill:#000000;stroke:none"
+           inkscape:export-ydpi="84"
+           inkscape:export-xdpi="84"
+           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+           transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+           id="g1013-0" />
+      </g>
+      <g
+         transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
+         id="g4563-2">
+        <rect
+           style="fill:#ffffff;stroke:none"
+           id="rect4559-8"
+           width="82.85714"
+           height="17.857143"
+           x="-2.8571429"
+           y="903.71429"
+           transform="translate(0,924.3622)" />
+        <rect
+           transform="rotate(-90)"
+           y="29.642855"
+           x="-1878.4336"
+           height="17.857143"
+           width="82.85714"
+           id="rect4561-6"
+           style="fill:#ffffff;stroke:none" />
+      </g>
+    </g>
+    <g
+       id="g4599"
+       inkscape:export-filename="icons/ic_edit.png"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-ydpi="18.281252"
+       transform="translate(-39.217467,730.80645)">
+      <g
+         id="g3674-3"
+         style="fill:none;stroke:none"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+         inkscape:export-xdpi="22.851559"
+         inkscape:export-ydpi="22.851559"
+         transform="translate(-142.96954,516.42694)">
+        <rect
+           y="1262.6561"
+           x="261.38272"
+           height="126.03077"
+           width="126.03078"
+           id="rect3051-4"
+           style="fill:none;stroke:none" />
+        <g
+           style="fill:none;stroke:none"
+           inkscape:export-ydpi="84"
+           inkscape:export-xdpi="84"
+           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+           transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+           id="g1013-9" />
+      </g>
+      <g
+         transform="matrix(0.58089536,0.64433569,-0.6672057,0.60151362,1531.3474,550.78291)"
+         id="g4595">
+        <rect
+           style="fill:#ffffff;stroke:none"
+           id="rect4591"
+           width="40.406101"
+           height="123.23861"
+           x="43.436558"
+           y="1079.5637"
+           transform="translate(0,924.3622)" />
+        <path
+           style="fill:#ffffff;stroke:none"
+           d="m 43.43656,2130.195 h 40.911177 l -21.718279,38.8908 z"
+           id="path4593"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+    <g
+       id="g5565"
+       inkscape:export-filename="ic_new.png"
+       inkscape:export-xdpi="31.632902"
+       inkscape:export-ydpi="31.632902"
+       style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="translate(-46.053895,1.6486751)">
+      <g
+         style="fill:#000000;stroke:#ffffff;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="translate(-2.0203051,206.07112)"
+         id="g4635"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782">
+        <g
+           id="g4637"
+           style="fill:#000000;stroke:#ffffff;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(-288.68382,513.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect4639"
+             style="fill:none;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
+          <g
+             style="fill:#000000;stroke:#ffffff;stroke-width:5.12590122;stroke-miterlimit:4;stroke-dasharray:none"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g4641" />
+        </g>
+        <g
+           style="fill:#000000;stroke:#ffffff;stroke-width:3.53658533;stroke-miterlimit:4;stroke-dasharray:none"
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+           id="g4643" />
+      </g>
+      <path
+         id="rect4677"
+         d="m 7.1985045,2086.4601 v -83.3942 H 50.883502 l 13.781141,12.4884 v 70.9058 z"
+         style="fill:none;stroke:#ffffff;stroke-width:3.90262389;stroke-miterlimit:4;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(0.90862148,0,0,0.90862148,16.144977,178.2984)"
+         id="g5474"
+         style="stroke-width:5.50284147;stroke-miterlimit:4;stroke-dasharray:none">
+        <g
+           id="g5470"
+           transform="translate(1.3242213e-6,8.5864751)"
+           style="stroke-width:5.50284147;stroke-miterlimit:4;stroke-dasharray:none">
+          <rect
+             y="2039.0024"
+             x="5.2726517"
+             height="6.9985328"
+             width="32.473194"
+             id="rect4559-6"
+             style="fill:#ffffff;stroke:none" />
+          <rect
+             style="fill:#ffffff;stroke:none"
+             id="rect4561-7"
+             width="32.473194"
+             height="6.9985328"
+             x="-2058.738"
+             y="18.009981"
+             transform="rotate(-90)" />
+        </g>
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path5484"
+         d="m 50.242774,2002.9543 v 13.4036 l 14.586308,-0.7885"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:3.90262389;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    </g>
+    <g
+       id="g5579"
+       inkscape:export-filename="ic_load.png"
+       inkscape:export-xdpi="31.632902"
+       inkscape:export-ydpi="31.632902"
+       style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="translate(-46.053895,1.6486751)">
+      <use
+         height="128"
+         width="128"
+         transform="translate(140.91628)"
+         id="use5513"
+         xlink:href="#g4635"
+         y="0"
+         x="0"
+         style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;marker:none;enable-background:accumulate"
+         d="m 190.55279,2026.0212 -5.93099,-8.8652 17.40328,-10.5317 -3.88673,-6.4226 17.62571,-1.3169 c 0,0 -7.08684,19.0975 -7.40098,19.104 -0.31419,0.01 -3.26576,-5.8642 -3.26576,-5.8642 z"
+         id="path5563"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
+         inkscape:export-xdpi="100"
+         inkscape:export-ydpi="100" />
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="rect5517"
+         d="m 134.37709,2021.7775 -0.61508,11.8608 c 0.0414,13.531 0,38.2634 0,38.2634 l 0.61508,9.8836 h 77.9892 l 0.59083,-9.8836 v -31.0401 l -0.0256,-7.8837 -34.11349,0.184 -3.82121,-11.3844 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    </g>
+    <g
+       id="g5584"
+       inkscape:export-filename="ic_save.png"
+       inkscape:export-xdpi="31.632902"
+       inkscape:export-ydpi="31.632902"
+       style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="translate(-46.053895,1.6486751)">
+      <use
+         height="128"
+         width="128"
+         transform="translate(294.96454)"
+         id="use5515"
+         xlink:href="#g4635"
+         y="0"
+         x="0"
+         style="fill:none;stroke:none;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cccc"
+         transform="translate(0,924.3622)"
+         inkscape:connector-curvature="0"
+         id="path5524"
+         d="m 294.10714,1134.1985 10.53572,-20.1271 48.92857,-0.1786 12.76476,21.0331"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:3.87800002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         y="2060.4944"
+         x="293.95438"
+         height="18.244036"
+         width="72.077965"
+         id="rect5522"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3.87800002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         inkscape:export-ydpi="100"
+         inkscape:export-xdpi="100"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path936-1-3"
+         d="m 321.5193,1995.8714 17.89877,-0.9709 -3.65706,33.6189 12.61562,-0.1106 -18.34905,21.7577 c 0,0 -16.3866,-21.7713 -16.12662,-22.2309 0.25998,-0.4597 11.27603,0.3081 11.27603,0.3081 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;marker:none;enable-background:accumulate" />
+    </g>
+    <g
+       id="g3313"
+       style="stroke:none"
+       inkscape:export-filename="icons/ic_closed.png"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-ydpi="18.281252"
+       transform="translate(857.8323,324.33077)">
+      <g
+         style="stroke:none"
+         inkscape:export-ydpi="11.425782"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         id="g4607-4"
+         transform="translate(-27.142861,404.54946)">
+        <g
+           transform="translate(-288.68382,513.5698)"
+           inkscape:export-ydpi="22.851559"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           style="stroke:none"
+           id="g3674-5-2">
+          <rect
+             style="fill:none;stroke:none"
+             id="rect3051-3-4"
+             width="126.03078"
+             height="126.03077"
+             x="261.38272"
+             y="1262.6561" />
+          <g
+             id="g1013-6-8"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             inkscape:export-xdpi="84"
+             inkscape:export-ydpi="84"
+             style="fill:#000000;stroke:none" />
+        </g>
+        <g
+           style="stroke:none"
+           id="g4563-24"
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path3311"
+         d="m -14.049142,2200.2193 v 82.1429 l 79.526853,-41.8563 z"
+         style="fill:#ffffff;stroke:none" />
+    </g>
+    <g
+       style="stroke:none"
+       id="g3321"
+       transform="translate(1017.8323,324.33077)"
+       inkscape:export-filename="icons/ic_open.png"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-ydpi="18.281252">
+      <g
+         transform="translate(-27.142861,404.54946)"
+         id="g3323"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782"
+         style="stroke:none">
+        <g
+           id="g3325"
+           style="stroke:none"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(-288.68382,513.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect3327"
+             style="fill:none;stroke:none" />
+          <g
+             style="fill:#000000;stroke:none"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g3329" />
+        </g>
+        <g
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+           id="g3331"
+           style="stroke:none" />
+      </g>
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 63.388183,2202.7194 h -78.20494 l 39.849666,75.7143 z"
+         id="path3333"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       id="g1815"
+       transform="matrix(0.24964649,0,0,0.24964645,484.54217,1590.1983)"
+       inkscape:export-filename="ic_exit.png"
+       inkscape:export-xdpi="32.970726"
+       inkscape:export-ydpi="32.970726">
+      <rect
+         y="1582.7637"
+         x="-477.78488"
+         height="504.44907"
+         width="504.4491"
+         id="rect1803"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:8.0113287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="csssc"
+         inkscape:connector-curvature="0"
+         id="path1805"
+         d="m -280.35079,1721.6125 c -46.76834,20.9939 -79.34593,68.0326 -79.34593,122.6945 0,74.2148 60.04826,134.3675 134.13422,134.3675 74.08596,0 134.134218,-60.1527 134.134218,-134.3675 0,-54.6692 -32.570828,-101.7074 -79.345918,-122.6945"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:40;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         ry="25.204872"
+         rx="46.820614"
+         y="1681.4468"
+         x="-237.85724"
+         height="89.585251"
+         width="24.593159"
+         id="rect1813"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    </g>
+    <g
+       id="g4110"
+       inkscape:export-filename="icons/ic_copy.png"
+       inkscape:export-xdpi="18.281246"
+       inkscape:export-ydpi="18.281246"
+       transform="translate(-39.217467,730.80645)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3277"
+         d="m 446.91084,1790.0521 v 94.4841 h 19.91422 v -76.3951 h 47.19477 v -18.089 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         sodipodi:nodetypes="ccccccc" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="rect4049"
+         width="67.111794"
+         height="94.486343"
+         x="466.81018"
+         y="1808.1482"
+         ry="0" />
+      <g
+         style="fill:none;stroke:#ffffff"
+         transform="translate(160.67447,-2.3981265)"
+         id="g4086"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_delete.png"
+         inkscape:export-xdpi="11.425779"
+         inkscape:export-ydpi="11.425779">
+        <g
+           id="g4088"
+           style="fill:none;stroke:#ffffff"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(4.1733203,523.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect4090"
+             style="fill:none;stroke:none" />
+          <g
+             style="fill:none;stroke:#ffffff"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g4092" />
+        </g>
+        <g
+           style="fill:none;stroke:#ffffff"
+           transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
+           id="g4094" />
+      </g>
+    </g>
+    <g
+       id="g4125"
+       inkscape:export-filename="icons/ic_paste.png"
+       inkscape:export-xdpi="18.281216"
+       inkscape:export-ydpi="18.281216"
+       transform="matrix(1,0,0,0.99518639,-39.217467,734.33629)">
+      <rect
+         ry="0"
+         y="1800.9037"
+         x="596.2774"
+         height="99.198151"
+         width="70.458496"
+         id="rect4068"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4082"
+         d="m 600.33342,1816.2191 63.73704,-1.0293 -12.48455,-11.8391 -7.88501,-11.3242 c -11.82619,-15.378 -21.41765,-7.8304 -28.25456,1.5442 l -3.28541,10.2948 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;stroke:none;stroke-width:4.19739103;marker:none;enable-background:accumulate" />
+      <circle
+         transform="matrix(2.246881,0,0,2.246881,-721.16059,-148.64363)"
+         id="path4084"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;enable-background:accumulate"
+         cx="601.13037"
+         cy="865.42389"
+         r="3.9968774" />
+      <g
+         inkscape:export-ydpi="11.425779"
+         inkscape:export-xdpi="11.425779"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_delete.png"
+         id="g4100"
+         transform="translate(302.96331,-2.3981265)"
+         style="fill:none;stroke:#ffffff">
+        <g
+           transform="translate(4.1733203,523.5698)"
+           inkscape:export-ydpi="22.851559"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           style="fill:none;stroke:#ffffff"
+           id="g4102">
+          <rect
+             style="fill:none;stroke:none"
+             id="rect4104"
+             width="126.03078"
+             height="126.03077"
+             x="261.38272"
+             y="1262.6561" />
+          <g
+             id="g4106"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             inkscape:export-xdpi="84"
+             inkscape:export-ydpi="84"
+             style="fill:none;stroke:#ffffff" />
+        </g>
+        <g
+           id="g4108"
+           transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
+           style="fill:none;stroke:#ffffff" />
+      </g>
+    </g>
+    <g
+       style="stroke:none"
+       id="g4154"
+       transform="translate(1206.4849,324.33077)"
+       inkscape:export-filename="icons/ic_down.png"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-ydpi="18.281252">
+      <g
+         transform="translate(-27.142861,404.54946)"
+         id="g4156"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782"
+         style="stroke:none">
+        <g
+           id="g4158"
+           style="stroke:none"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(-288.68382,513.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect4160"
+             style="fill:none;stroke:none" />
+          <g
+             style="fill:#000000;stroke:none"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g4162" />
+        </g>
+        <g
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+           id="g4164"
+           style="stroke:none" />
+      </g>
+      <path
+         style="fill:#ffffff;stroke:none;stroke-width:1.50016773"
+         d="M 66.95847,2187.3801 H -50.362064 l 59.7811862,113.5841 z"
+         id="path4166"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       inkscape:export-ydpi="18.281252"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-filename="icons/ic_up.png"
+       transform="rotate(180,685.35643,2405.9562)"
+       id="g4168"
+       style="stroke:none">
+      <g
+         style="stroke:none"
+         inkscape:export-ydpi="11.425782"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         id="g4170"
+         transform="translate(-27.142861,404.54946)">
+        <g
+           transform="translate(-288.68382,513.5698)"
+           inkscape:export-ydpi="22.851559"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           style="stroke:none"
+           id="g4172">
+          <rect
+             style="fill:none;stroke:none"
+             id="rect4174"
+             width="126.03078"
+             height="126.03077"
+             x="261.38272"
+             y="1262.6561" />
+          <g
+             id="g4176"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             inkscape:export-xdpi="84"
+             inkscape:export-ydpi="84"
+             style="fill:#000000;stroke:none" />
+        </g>
+        <g
+           style="stroke:none"
+           id="g4178"
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4180"
+         d="M 66.95847,2187.3801 H -50.362064 l 59.7811862,113.5841 z"
+         style="fill:#ffffff;stroke:none;stroke-width:1.50016773" />
+    </g>
+    <g
+       inkscape:export-ydpi="18.281252"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-filename="icons/ic_right.png"
+       transform="rotate(-90,1005.2674,1566.2703)"
+       id="g4168-9"
+       style="stroke:none">
+      <g
+         style="stroke:none"
+         inkscape:export-ydpi="11.425782"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         id="g4170-6"
+         transform="translate(-27.142861,404.54946)">
+        <g
+           transform="translate(-288.68382,513.5698)"
+           inkscape:export-ydpi="22.851559"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           style="stroke:none"
+           id="g4172-1">
+          <rect
+             style="fill:none;stroke:none"
+             id="rect4174-1"
+             width="126.03078"
+             height="126.03077"
+             x="261.38272"
+             y="1262.6561" />
+          <g
+             id="g4176-8"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             inkscape:export-xdpi="84"
+             inkscape:export-ydpi="84"
+             style="fill:#000000;stroke:none" />
+        </g>
+        <g
+           style="stroke:none"
+           id="g4178-2"
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4180-8"
+         d="M 66.95847,2187.3801 H -50.362064 l 59.7811862,113.5841 z"
+         style="fill:#ffffff;stroke:none" />
+    </g>
+    <g
+       inkscape:export-ydpi="18.281252"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-filename="icons/ic_left.png"
+       transform="rotate(90,604.55567,3162.1479)"
+       id="g4168-3"
+       style="stroke:none">
+      <g
+         style="stroke:none"
+         inkscape:export-ydpi="11.425782"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         id="g4170-4"
+         transform="translate(-27.142861,404.54946)">
+        <g
+           transform="translate(-288.68382,513.5698)"
+           inkscape:export-ydpi="22.851559"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           style="stroke:none"
+           id="g4172-7">
+          <rect
+             style="fill:none;stroke:none"
+             id="rect4174-3"
+             width="126.03078"
+             height="126.03077"
+             x="261.38272"
+             y="1262.6561" />
+          <g
+             id="g4176-6"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             inkscape:export-xdpi="84"
+             inkscape:export-ydpi="84"
+             style="fill:#000000;stroke:none" />
+        </g>
+        <g
+           style="stroke:none"
+           id="g4178-4"
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4180-2"
+         d="M 66.95847,2187.3801 H -50.362064 l 59.7811862,113.5841 z"
+         style="fill:#ffffff;stroke:none" />
+    </g>
+    <g
+       style="stroke:none"
+       id="g4486"
+       transform="rotate(-90,1092.8537,1644.8105)"
+       inkscape:export-filename="icons/ic_right_disabled.png"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-ydpi="18.281252">
+      <g
+         transform="translate(-27.142861,404.54946)"
+         id="g4488"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782"
+         style="stroke:none">
+        <g
+           id="g4490"
+           style="stroke:none"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(-288.68382,513.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect4492"
+             style="fill:none;stroke:none" />
+          <g
+             style="fill:#000000;stroke:none"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g4494" />
+        </g>
+        <g
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+           id="g4496"
+           style="stroke:none" />
+      </g>
+      <path
+         style="fill:#404040;fill-opacity:1;stroke:none"
+         d="M 66.95847,2187.3801 H -50.362064 l 59.7811862,113.5841 z"
+         id="path4498"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       style="stroke:none"
+       id="g4500"
+       transform="rotate(90,524.41674,3248.1354)"
+       inkscape:export-filename="icons/ic_left_disabled.png"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-ydpi="18.281252">
+      <g
+         transform="translate(-27.142861,404.54946)"
+         id="g4502"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782"
+         style="stroke:none">
+        <g
+           id="g4504"
+           style="stroke:none"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(-288.68382,513.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect4506"
+             style="fill:none;stroke:none" />
+          <g
+             style="fill:#000000;stroke:none"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g4508" />
+        </g>
+        <g
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+           id="g4510"
+           style="stroke:none" />
+      </g>
+      <path
+         style="fill:#404040;fill-opacity:1;stroke:none"
+         d="M 66.95847,2187.3801 H -50.362064 l 59.7811862,113.5841 z"
+         id="path4512"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:export-ydpi="31.632902"
+       inkscape:export-xdpi="31.632902"
+       inkscape:export-filename="ic_save_disabled.png"
+       id="g4514"
+       transform="translate(-49.829269,165.84083)">
+      <g
+         inkscape:export-ydpi="11.425782"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         id="use4516"
+         transform="translate(292.94423,206.07112)"
+         style="fill:#000000;stroke:#404040;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+        <g
+           transform="translate(-288.68382,513.5698)"
+           inkscape:export-ydpi="22.851559"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           style="fill:#000000;stroke:#404040;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="g4526">
+          <rect
+             style="fill:none;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4528"
+             width="126.03078"
+             height="126.03077"
+             x="261.38272"
+             y="1262.6561" />
+          <g
+             id="g4530"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             inkscape:export-xdpi="84"
+             inkscape:export-ydpi="84"
+             style="fill:#000000;stroke:#404040;stroke-width:5.12590122;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        </g>
+        <g
+           id="g4532"
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+           style="fill:#000000;stroke:#404040;stroke-width:3.53658533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 294.10714,1134.1985 10.53572,-20.1271 48.92857,-0.1786 12.76476,21.0331"
+         id="path4518"
+         inkscape:connector-curvature="0"
+         transform="translate(0,924.3622)"
+         sodipodi:nodetypes="cccc" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="rect4520"
+         width="72.077965"
+         height="18.244036"
+         x="293.95438"
+         y="2060.4944" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#404040;fill-opacity:1;stroke:none;stroke-width:5;marker:none;enable-background:accumulate"
+         d="m 321.5193,1995.8714 17.89877,-0.9709 -3.65706,33.6189 12.61562,-0.1106 -18.34905,21.7577 c 0,0 -16.3866,-21.7713 -16.12662,-22.2309 0.25998,-0.4597 11.27603,0.3081 11.27603,0.3081 z"
+         id="path4522"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
+         inkscape:export-xdpi="100"
+         inkscape:export-ydpi="100" />
+    </g>
+    <g
+       id="g4887"
+       inkscape:export-filename="ic_package.png"
+       inkscape:export-xdpi="32.359936"
+       inkscape:export-ydpi="32.359936"
+       transform="translate(-190.22261,3.6510151)">
+      <g
+         id="g4534"
+         transform="matrix(0.24964649,0,0,0.24964645,823.16748,1588.5497)"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_exit.png"
+         inkscape:export-xdpi="32.970726"
+         inkscape:export-ydpi="32.970726">
+        <rect
+           y="1582.7637"
+           x="-477.78488"
+           height="504.44907"
+           width="504.4491"
+           id="rect4536"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:8.0113287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path4855"
+         d="m 757.41873,2100.9683 2.66081,-46.1208 49.66859,-9.7563 -3.54776,46.1208 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4857"
+         d="m 728.14973,2038.4391 -4.43468,48.3382 31.92981,14.191 2.21734,-45.2338 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4859"
+         d="m 727.70627,2036.6652 43.01655,-16.4083 36.36449,23.0604 -48.78165,11.5302 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4861"
+         d="m 758.30567,2056.6214 11.08674,17.2953 52.77287,-21.73 -17.73879,-8.8694 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4863"
+         d="m 725.04545,2037.1086 -11.97367,17.7389 36.3645,22.1734 9.75634,-20.3995 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4865"
+         d="m 726.81934,2035.3348 -16.40837,-16.8517 53.21633,-14.1911 7.09552,14.191 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path4867"
+         d="m 782.25303,2005.1788 -7.98246,15.965 31.9298,20.3995 16.85185,-20.8429 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.12562847;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <path
+         inkscape:export-ydpi="100"
+         inkscape:export-xdpi="100"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path4522-4"
+         d="m 759.75945,1993.3214 15.21574,-0.9018 -3.10888,31.2226 10.72453,-0.1022 -15.5985,20.2067 c 0,0 -13.93025,-20.2194 -13.70924,-20.6462 0.22102,-0.427 9.58574,0.286 9.58574,0.286 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#979797;stroke-width:2.21230483;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    </g>
+    <g
+       id="g3882"
+       inkscape:export-filename="ic_play.png"
+       inkscape:export-xdpi="32.359921"
+       inkscape:export-ydpi="32.359921"
+       transform="translate(-162.1898,11.660395)">
+      <g
+         inkscape:export-ydpi="32.970726"
+         inkscape:export-xdpi="32.970726"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_exit.png"
+         transform="matrix(0.24964649,0,0,0.24964645,973.99338,1591.8845)"
+         id="g1815-0">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:8.0113287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect1803-1"
+           width="504.4491"
+           height="504.44907"
+           x="-477.78488"
+           y="1582.7637" />
+      </g>
+      <g
+         style="stroke:none"
+         id="g4168-9-0"
+         transform="matrix(0,-0.74629197,0.74629197,0,-756.84,2056.3796)"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_right.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782">
+        <g
+           transform="translate(-27.142861,404.54946)"
+           id="g4170-6-1"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+           inkscape:export-xdpi="11.425782"
+           inkscape:export-ydpi="11.425782"
+           style="stroke:none">
+          <g
+             id="g4172-1-1"
+             style="stroke:none"
+             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+             inkscape:export-xdpi="22.851559"
+             inkscape:export-ydpi="22.851559"
+             transform="translate(-288.68382,513.5698)">
+            <rect
+               y="1262.6561"
+               x="261.38272"
+               height="126.03077"
+               width="126.03078"
+               id="rect4174-1-8"
+               style="fill:none;stroke:none" />
+            <g
+               style="fill:#000000;stroke:none"
+               inkscape:export-ydpi="84"
+               inkscape:export-xdpi="84"
+               inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+               transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+               id="g4176-8-9" />
+          </g>
+          <g
+             transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+             id="g4178-2-2"
+             style="stroke:none" />
+        </g>
+        <path
+           style="fill:#ffffff;stroke:none"
+           d="M 66.95847,2187.3801 H -50.362064 l 59.7811862,113.5841 z"
+           id="path4180-8-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+    <g
+       id="g3893"
+       transform="translate(-157.27108,149.82207)"
+       inkscape:export-filename="ic_play_disabled.png"
+       inkscape:export-xdpi="32.359921"
+       inkscape:export-ydpi="32.359921">
+      <g
+         id="g3895"
+         transform="matrix(0.24964649,0,0,0.24964645,973.99338,1591.8845)"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_exit.png"
+         inkscape:export-xdpi="32.970726"
+         inkscape:export-ydpi="32.970726">
+        <rect
+           y="1582.7637"
+           x="-477.78488"
+           height="504.44907"
+           width="504.4491"
+           id="rect3897"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:8.0113287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      </g>
+      <g
+         inkscape:export-ydpi="11.425782"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_right.png"
+         transform="matrix(0,-0.74629197,0.74629197,0,-756.84,2056.3796)"
+         id="g3899"
+         style="stroke:none">
+        <g
+           style="stroke:none"
+           inkscape:export-ydpi="11.425782"
+           inkscape:export-xdpi="11.425782"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+           id="g3901"
+           transform="translate(-27.142861,404.54946)">
+          <g
+             transform="translate(-288.68382,513.5698)"
+             inkscape:export-ydpi="22.851559"
+             inkscape:export-xdpi="22.851559"
+             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+             style="stroke:none"
+             id="g3903">
+            <rect
+               style="fill:none;stroke:none"
+               id="rect3905"
+               width="126.03078"
+               height="126.03077"
+               x="261.38272"
+               y="1262.6561" />
+            <g
+               id="g3907"
+               transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+               inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+               inkscape:export-xdpi="84"
+               inkscape:export-ydpi="84"
+               style="fill:#000000;stroke:none" />
+          </g>
+          <g
+             style="stroke:none"
+             id="g3909"
+             transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
+        </g>
+        <path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           id="path3911"
+           d="M 66.95847,2187.3801 H -50.362064 l 59.7811862,113.5841 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;enable-background:accumulate" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="32.359936"
+       inkscape:export-xdpi="32.359936"
+       inkscape:export-filename="ic_package_disabled.png"
+       id="g3383"
+       transform="translate(-194.56758,149.82207)">
+      <g
+         inkscape:export-ydpi="32.970726"
+         inkscape:export-xdpi="32.970726"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_exit.png"
+         transform="matrix(0.24964649,0,0,0.24964645,823.16748,1588.5497)"
+         id="g3385">
+        <rect
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:8.0113287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect3387"
+           width="504.4491"
+           height="504.44907"
+           x="-477.78488"
+           y="1582.7637" />
+      </g>
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 757.41873,2100.9683 2.66081,-46.1208 49.66859,-9.7563 -3.54776,46.1208 z"
+         id="path3389"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 728.14973,2038.4391 -4.43468,48.3382 31.92981,14.191 2.21734,-45.2338 z"
+         id="path3391"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 727.70627,2036.6652 43.01655,-16.4083 36.36449,23.0604 -48.78165,11.5302 z"
+         id="path3393"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 758.30567,2056.6214 11.08674,17.2953 52.77287,-21.73 -17.73879,-8.8694 z"
+         id="path3395"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 725.04545,2037.1086 -11.97367,17.7389 36.3645,22.1734 9.75634,-20.3995 z"
+         id="path3397"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 726.81934,2035.3348 -16.40837,-16.8517 53.21633,-14.1911 7.09552,14.191 z"
+         id="path3399"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 782.25303,2005.1788 -7.98246,15.965 31.9298,20.3995 16.85185,-20.8429 z"
+         id="path3401"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:#a6a6a6;stroke-width:0.77825594;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 759.73524,1993.3064 15.2566,-0.9029 -3.11722,31.262 10.75332,-0.1024 -15.64039,20.2323 c 0,0 -13.96764,-20.2449 -13.74604,-20.6723 0.22161,-0.4276 9.61148,0.2863 9.61148,0.2863 z"
+         id="path3403"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/leave.png"
+         inkscape:export-xdpi="100"
+         inkscape:export-ydpi="100" />
+    </g>
+    <g
+       id="g4343"
+       inkscape:export-filename="ic_assets.png"
+       inkscape:export-xdpi="32.335857"
+       inkscape:export-ydpi="32.335857"
+       transform="translate(-302.35383,-156.53643)">
+      <g
+         id="g4203">
+        <g
+           style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+           inkscape:export-ydpi="31.632902"
+           inkscape:export-xdpi="31.632902"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_load.png"
+           id="g3402"
+           transform="translate(1046.6839,161.02829)">
+          <use
+             style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+             x="0"
+             y="0"
+             xlink:href="#g4635"
+             id="use3405"
+             transform="translate(140.91628)"
+             width="128"
+             height="128" />
+          <path
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             d="m 122.20452,2006.8797 v 77.1518 h 104.03566 l 0.75404,-62.7515 -45.50655,0.2365 -5.0974,-14.6368 z"
+             id="path3409"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccccc" />
+        </g>
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+           x="1175.0742"
+           y="2221.5337"
+           id="text4199"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.29096222px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans'"
+             sodipodi:role="line"
+             id="tspan4201"
+             x="1175.0742"
+             y="2221.5337">Assets</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g4351"
+       inkscape:export-filename="ic_assets_disabled.png"
+       inkscape:export-xdpi="32.335857"
+       inkscape:export-ydpi="32.335857"
+       transform="translate(-302.35383,-156.53643)">
+      <g
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         transform="translate(1184.9473,512.59255)"
+         id="use4214"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782">
+        <g
+           id="g4312"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(-288.68382,513.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect4314"
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          <g
+             style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:2.0503602;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g4316" />
+        </g>
+        <g
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:1.41463411;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+           id="g4318" />
+      </g>
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4216"
+         d="m 1168.2558,2313.4011 v 77.1518 h 104.0357 l 0.754,-62.7515 -45.5065,0.2365 -5.0974,-14.6368 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <text
+         xml:space="preserve"
+         style="color:#000000;font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;overflow:visible;visibility:visible;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.746292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         x="1174.4417"
+         y="2367.0269"
+         id="text4218"><tspan
+           sodipodi:role="line"
+           id="tspan4220"
+           x="1174.4417"
+           y="2367.0269"
+           style="font-size:28.29096222px;line-height:1.25;font-family:sans-serif">Assets</tspan></text>
+    </g>
+    <g
+       id="g4202"
+       inkscape:export-filename="icons/ic_check_disabled.png"
+       inkscape:export-xdpi="18.137337"
+       inkscape:export-ydpi="18.137337"
+       transform="translate(1512.1497,331.31369)"
+       style="stroke:#404040;stroke-opacity:1">
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path3418"
+         d="m 476.85411,2386.043 12.88931,46.2645 79.68786,-80.2865"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:24.68952751;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <g
+         style="stroke:#404040;stroke-opacity:1"
+         id="g4188"
+         transform="rotate(90,188.95085,2575.6924)"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_left_disabled.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782">
+        <g
+           transform="translate(-27.142861,404.54946)"
+           id="g4190"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+           inkscape:export-xdpi="11.425782"
+           inkscape:export-ydpi="11.425782"
+           style="stroke:#404040;stroke-opacity:1">
+          <g
+             id="g4192"
+             style="stroke:#404040;stroke-opacity:1"
+             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+             inkscape:export-xdpi="22.851559"
+             inkscape:export-ydpi="22.851559"
+             transform="translate(-288.68382,513.5698)">
+            <rect
+               y="1262.6561"
+               x="261.38272"
+               height="126.03077"
+               width="126.03078"
+               id="rect4194"
+               style="fill:none;stroke:none;stroke-opacity:1" />
+            <g
+               style="fill:#000000;stroke:#404040;stroke-opacity:1"
+               inkscape:export-ydpi="84"
+               inkscape:export-xdpi="84"
+               inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+               transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+               id="g4196" />
+          </g>
+          <g
+             transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+             id="g4198"
+             style="stroke:#404040;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g4211"
+       transform="translate(1510.0521,161.40923)"
+       inkscape:export-filename="icons/ic_check.png"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-ydpi="18.281252">
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:24.68952751;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+         d="m 476.85411,2386.043 12.88931,46.2645 79.68786,-80.2865"
+         id="path4213"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
+      <g
+         inkscape:export-ydpi="11.425782"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_left_disabled.png"
+         transform="rotate(90,188.95085,2575.6924)"
+         id="g4215"
+         style="stroke:#ffffff">
+        <g
+           style="stroke:#ffffff"
+           inkscape:export-ydpi="11.425782"
+           inkscape:export-xdpi="11.425782"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+           id="g4217"
+           transform="translate(-27.142861,404.54946)">
+          <g
+             transform="translate(-288.68382,513.5698)"
+             inkscape:export-ydpi="22.851559"
+             inkscape:export-xdpi="22.851559"
+             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+             style="stroke:#ffffff"
+             id="g4219">
+            <rect
+               style="fill:none;stroke:none"
+               id="rect4221"
+               width="126.03078"
+               height="126.03077"
+               x="261.38272"
+               y="1262.6561" />
+            <g
+               id="g4223"
+               transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+               inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+               inkscape:export-xdpi="84"
+               inkscape:export-ydpi="84"
+               style="fill:#000000;stroke:#ffffff" />
+          </g>
+          <g
+             style="stroke:#ffffff"
+             id="g4225"
+             transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g3470"
+       inkscape:export-filename="ic_atlases.png"
+       inkscape:export-xdpi="32"
+       inkscape:export-ydpi="32"
+       transform="translate(-302.35383,-156.53643)">
+      <g
+         transform="translate(155.66068)"
+         id="g3426"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_assets.png"
+         inkscape:export-xdpi="32.335857"
+         inkscape:export-ydpi="32.335857">
+        <g
+           id="g3428">
+          <g
+             style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+             inkscape:export-ydpi="31.632902"
+             inkscape:export-xdpi="31.632902"
+             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_load.png"
+             id="g3430"
+             transform="translate(1046.6839,161.02829)">
+            <use
+               style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+               x="0"
+               y="0"
+               xlink:href="#g4635"
+               id="use3432"
+               transform="translate(140.91628)"
+               width="128"
+               height="128" />
+            <path
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               d="m 122.20452,2006.8797 v 77.1518 h 104.03566 l 0.75404,-62.7515 -45.50655,0.2365 -5.0974,-14.6368 z"
+               id="path3434"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccccccc" />
+          </g>
+          <text
+             xml:space="preserve"
+             style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+             x="1184.0203"
+             y="2223.323"
+             id="text3436"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.29096222px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans'"
+               sodipodi:role="line"
+               id="tspan3438"
+               x="1184.0203"
+               y="2223.323">Atlas</tspan></text>
+        </g>
+      </g>
+      <g
+         style="stroke-width:5.50284147;stroke-miterlimit:4;stroke-dasharray:none"
+         id="g5474-7"
+         transform="matrix(1.1073456,0,0,1.1073456,1282.52,-66.947737)">
+        <circle
+           transform="matrix(0.61022848,0,0,0.61022848,29.665312,1378.3415)"
+           id="path5468-5"
+           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:7.03851795;stroke-miterlimit:4;stroke-dasharray:none"
+           cx="39.901024"
+           cy="1052.7947"
+           r="27.779196" />
+        <g
+           style="stroke-width:5.50284147;stroke-miterlimit:4;stroke-dasharray:none"
+           transform="translate(1.3242213e-6,8.5864751)"
+           id="g5470-3">
+          <rect
+             style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.80612087;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4559-6-4"
+             width="25.203176"
+             height="5.4317188"
+             x="41.412464"
+             y="2009.4846" />
+          <rect
+             transform="rotate(-90)"
+             y="51.298191"
+             x="-2024.8019"
+             height="5.4317188"
+             width="25.203176"
+             id="rect4561-7-1"
+             style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.80612087;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+    <g
+       id="g3478"
+       style="stroke:none"
+       inkscape:export-filename="icons/ic_create_all.png"
+       inkscape:export-xdpi="18.281246"
+       inkscape:export-ydpi="18.281246"
+       transform="translate(-39.217467,730.80645)">
+      <g
+         inkscape:export-ydpi="11.425779"
+         inkscape:export-xdpi="11.425779"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_delete.png"
+         id="g3953"
+         transform="translate(431.41822,-2.3981265)"
+         style="fill:none;stroke:none">
+        <g
+           transform="translate(4.1733203,523.5698)"
+           inkscape:export-ydpi="22.851559"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           style="fill:none;stroke:none"
+           id="g3955">
+          <rect
+             style="fill:none;stroke:none"
+             id="rect3957"
+             width="126.03078"
+             height="126.03077"
+             x="261.38272"
+             y="1262.6561" />
+          <g
+             id="g3959"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             inkscape:export-xdpi="84"
+             inkscape:export-ydpi="84"
+             style="fill:none;stroke:none" />
+        </g>
+        <g
+           id="g3961"
+           transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
+           style="fill:none;stroke:none" />
+      </g>
+      <g
+         transform="matrix(1.4852893,0,0,1.4852893,-357.97764,-884.73489)"
+         style="stroke:none"
+         id="g3468">
+        <rect
+           style="fill:#ffffff;stroke:none"
+           id="rect4559-1"
+           width="43.763706"
+           height="9.4318333"
+           x="748.59918"
+           y="1849.7565" />
+        <rect
+           transform="rotate(-90)"
+           y="765.76508"
+           x="-1876.3541"
+           height="9.4318333"
+           width="43.763706"
+           id="rect4561-60"
+           style="fill:#ffffff;stroke:none" />
+      </g>
+      <g
+         id="g3472"
+         style="stroke:none"
+         transform="matrix(1.4852893,0,0,1.4852893,-406.82517,-931.10465)">
+        <rect
+           y="1849.7565"
+           x="748.59918"
+           height="9.4318333"
+           width="43.763706"
+           id="rect3474"
+           style="fill:#ffffff;stroke:none" />
+        <rect
+           style="fill:#ffffff;stroke:none"
+           id="rect3476"
+           width="43.763706"
+           height="9.4318333"
+           x="-1876.3541"
+           y="765.76508"
+           transform="rotate(-90)" />
+      </g>
+    </g>
+    <g
+       id="g4625"
+       inkscape:export-filename="ic_3d.png"
+       inkscape:export-xdpi="22"
+       inkscape:export-ydpi="22"
+       transform="translate(185.47903,-62.298301)">
+      <rect
+         y="926.27539"
+         x="860.49463"
+         height="126.03077"
+         width="126.03078"
+         id="rect4579"
+         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <g
+         transform="matrix(1.1993051,0,0,1.1993051,-151.82396,-10.851952)"
+         id="g4601">
+        <path
+           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.09797573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 909.64972,820.26643 -0.69229,55.76191 29.0762,-27.88096 v -52.57552 z"
+           id="path4589"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.09797573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 937.30586,796.36742 h -51.19402 l -29.76894,23.89848 53.28556,-0.0255 z"
+           id="path4591"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.09797573;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 855.99675,819.07101 1.38458,52.97434 51.5761,3.98299 0.70151,-55.8658 z"
+           id="path4594"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
+    <g
+       id="g4632"
+       inkscape:export-filename="ic_spine.png"
+       inkscape:export-xdpi="22"
+       inkscape:export-ydpi="22"
+       transform="translate(185.47903,-62.298301)">
+      <rect
+         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="rect4567"
+         width="126.03078"
+         height="126.03077"
+         x="1007.7452"
+         y="926.27539" />
+      <g
+         transform="matrix(0.44811792,0,0,0.44811792,654.42016,641.62884)"
+         id="g4619">
+        <path
+           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 872.17621,658.75021 c 30.20495,-1.78176 54.88455,34.83403 107.60615,18.40631 20.94644,-6.52676 18.18813,58.11134 -21.2381,62.2983 -27.6061,2.93169 -68.61882,-2.72369 -86.36805,-24.06979 -11.86441,-14.26874 -18.52476,-55.54207 0,-56.63482 z"
+           id="path4611"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path4613"
+           d="m 931.09131,861.61288 c 9.65963,-5.54488 22.60422,4.98677 37.69749,-9.96049 5.99662,-5.93857 13.67016,20.07609 1.30855,28.05013 -8.65556,5.5834 -22.84302,9.91775 -31.49077,4.31671 -5.78056,-3.74399 -13.43953,-19.00566 -7.51527,-22.40635 z"
+           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+        <path
+           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 903.60357,811.19117 c 16.65797,-5.80267 36.32304,10.8097 63.28108,-6.78828 10.71052,-6.99171 19.44248,29.70107 -2.00507,38.31919 -15.01746,6.03436 -38.91998,9.38441 -52.2697,0.23438 -8.92358,-6.11631 -19.22269,-28.2065 -9.00631,-31.76529 z"
+           id="path4615"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path4617"
+           d="m 884.51721,740.80676 c 21.5599,-3.52165 42.00187,20.94262 78.6453,5.23137 14.55855,-6.24211 17.3756,40.38349 -10.62817,46.31696 -19.60814,4.15459 -49.48186,3.1374 -63.81322,-10.87514 -9.57976,-9.36665 -17.42664,-38.51335 -4.20391,-40.67319 z"
+           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      </g>
+    </g>
+    <g
+       id="g4686"
+       inkscape:export-filename="images/ic_enter.png"
+       inkscape:export-xdpi="24.375002"
+       inkscape:export-ydpi="24.375002"
+       transform="translate(-3.485669,192.55839)">
+      <rect
+         y="1262.6561"
+         x="683.31213"
+         height="126.03077"
+         width="126.03078"
+         id="rect4620"
+         style="fill:none;stroke:none" />
+      <g
+         id="g4645">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 713.17188,416.88477 v 29.3789 h 82.51367 v -89.9082 h -82.51367 v 29.37891"
+           transform="translate(0,924.3622)"
+           id="rect4636"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.00000095;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect4641"
+           width="25.383162"
+           height="7.2116356"
+           x="693.13544"
+           y="1322.6012" />
+        <path
+           sodipodi:type="star"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:23.60595703;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="path4643"
+           sodipodi:sides="3"
+           sodipodi:cx="732.71295"
+           sodipodi:cy="1324.9172"
+           sodipodi:r1="26.346226"
+           sodipodi:r2="13.173113"
+           sodipodi:arg1="2.1066076"
+           sodipodi:arg2="3.1538051"
+           inkscape:flatsided="false"
+           inkscape:rounded="0"
+           inkscape:randomized="0"
+           d="m 719.26218,1347.5712 0.27864,-22.8148 0.27864,-22.8148 19.61888,11.6487 19.61887,11.6487 -19.89751,11.1661 z"
+           inkscape:transform-center-x="-2.7037296"
+           inkscape:transform-center-y="-0.068822737"
+           transform="matrix(0.419394,0,0,0.42789241,411.56403,759.35386)" />
+      </g>
+    </g>
+    <g
+       id="g4693"
+       inkscape:export-filename="images/ic_exit.png"
+       inkscape:export-xdpi="24.375002"
+       inkscape:export-ydpi="24.375002"
+       transform="translate(-3.485669,192.55839)">
+      <rect
+         transform="scale(-1)"
+         style="fill:none;stroke:none"
+         id="rect4650"
+         width="126.03078"
+         height="126.03077"
+         x="-965.5257"
+         y="-1388.6869" />
+      <g
+         transform="rotate(180,822.5019,1325.6718)"
+         id="g4652">
+        <path
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0"
+           id="path4654"
+           transform="translate(0,924.3622)"
+           d="m 713.17188,416.88477 v 29.3789 h 82.51367 v -89.9082 h -82.51367 v 29.37891"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+        <rect
+           transform="scale(-1,1)"
+           y="1322.6012"
+           x="-721.90808"
+           height="7.2116356"
+           width="25.383162"
+           id="rect4656"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.00000095;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+        <path
+           transform="matrix(-0.419394,0,0,0.42789241,1003.4795,759.35386)"
+           inkscape:transform-center-y="-0.068822737"
+           inkscape:transform-center-x="2.7037519"
+           d="m 719.26218,1347.5712 0.27864,-22.8148 0.27864,-22.8148 19.61888,11.6487 19.61887,11.6487 -19.89751,11.1661 z"
+           inkscape:randomized="0"
+           inkscape:rounded="0"
+           inkscape:flatsided="false"
+           sodipodi:arg2="3.1538051"
+           sodipodi:arg1="2.1066076"
+           sodipodi:r2="13.173113"
+           sodipodi:r1="26.346226"
+           sodipodi:cy="1324.9172"
+           sodipodi:cx="732.71295"
+           sodipodi:sides="3"
+           id="path4658"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:23.60595703;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           sodipodi:type="star" />
+      </g>
+    </g>
+    <text
+       id="text3065-3"
+       y="1626.3745"
+       x="700.38995"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="1626.3745"
+         x="700.38995"
+         id="tspan3067-7"
+         sodipodi:role="line"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">enter</tspan></text>
+    <text
+       id="text3065-1"
+       y="1626.7893"
+       x="856.30035"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="1626.7893"
+         x="856.30035"
+         id="tspan3067-75"
+         sodipodi:role="line"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:39.2677536px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">exit</tspan></text>
+    <g
+       id="g4673"
+       inkscape:export-filename="icons/ic_eye.png"
+       inkscape:export-xdpi="18.281233"
+       inkscape:export-ydpi="18.281233"
+       transform="translate(1670.7272,161.40923)">
+      <rect
+         y="2345.7507"
+         x="129.543"
+         height="126.03077"
+         width="126.03078"
+         id="rect3045-6"
+         style="fill:none;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccsc"
+         inkscape:connector-curvature="0"
+         id="path4669"
+         d="m 140.11388,2406.7748 c 25.24059,61.5475 99.33395,41.3008 106.25476,-1.2726 0,0 -21.04732,-36.3525 -53.73805,-35.6317 -31.10767,0.6858 -52.51671,36.9043 -52.51671,36.9043 z"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         ry="31.149151"
+         rx="30.241541"
+         cy="2398.8552"
+         cx="195.39015"
+         id="path4671"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <g
+       inkscape:export-ydpi="24.374998"
+       inkscape:export-xdpi="24.374998"
+       inkscape:export-filename="images/eye.png"
+       id="g4687"
+       transform="translate(1982.2187,143.00292)">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect4689"
+         width="126.03078"
+         height="126.03077"
+         x="129.543"
+         y="2345.7507" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 140.11388,2406.7748 c 25.24059,61.5475 99.33395,41.3008 106.25476,-1.2726 0,0 -21.04732,-36.3525 -53.73805,-35.6317 -31.10767,0.6858 -52.51671,36.9043 -52.51671,36.9043 z"
+         id="path4691"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccsc" />
+      <ellipse
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="ellipse4693"
+         cx="195.39015"
+         cy="2398.8552"
+         rx="30.241541"
+         ry="31.149151" />
+    </g>
+    <g
+       inkscape:export-ydpi="24.375002"
+       inkscape:export-xdpi="24.375002"
+       inkscape:export-filename="images/eye_disabled.png"
+       transform="translate(2013.3678,318.57086)"
+       id="g4695">
+      <rect
+         y="2345.7507"
+         x="129.543"
+         height="126.03077"
+         width="126.03078"
+         id="rect4697"
+         style="fill:none;stroke:none" />
+      <path
+         sodipodi:nodetypes="ccsc"
+         inkscape:connector-curvature="0"
+         id="path4699"
+         d="m 140.11388,2406.7748 c 25.24059,61.5475 99.33395,41.3008 106.25476,-1.2726 0,0 -21.04732,-36.3525 -53.73805,-35.6317 -31.10767,0.6858 -52.51671,36.9043 -52.51671,36.9043 z"
+         style="fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         ry="31.149151"
+         rx="30.241541"
+         cy="2398.8552"
+         cx="195.39015"
+         id="ellipse4701"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <g
+       id="g4691"
+       inkscape:export-filename="images/ic_obstacle_actor.png"
+       inkscape:export-xdpi="24.375002"
+       inkscape:export-ydpi="24.375002"
+       transform="translate(20.710528,-60.295958)">
+      <rect
+         y="926.27539"
+         x="702.99072"
+         height="126.03077"
+         width="126.03078"
+         id="rect4666"
+         style="fill:none;stroke:none"
+         inkscape:export-filename="images/ic_obstacle_actor.png"
+         inkscape:export-xdpi="24.375"
+         inkscape:export-ydpi="24.375" />
+      <path
+         id="path4683"
+         transform="translate(0,924.3622)"
+         d="M 766.00586,6.109375 A 58.818829,58.818829 0 0 0 707.1875,64.927734 58.818829,58.818829 0 0 0 766.00586,123.74805 58.818829,58.818829 0 0 0 824.82422,64.927734 58.818829,58.818829 0 0 0 766.00586,6.109375 Z m -45.55274,45.216797 h 91.10547 V 78.53125 h -91.10547 z"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10.2528944;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="2324.8594"
+       y="2543.2739"
+       id="text4695"><tspan
+         sodipodi:role="line"
+         id="tspan4693"
+         x="2324.8594"
+         y="2543.2739"
+         style="font-size:70px;line-height:1.25"> </tspan></text>
+    <g
+       id="g4709"
+       inkscape:export-filename="icons/ic_flip.png"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-ydpi="18.281252"
+       transform="translate(1982.2187,-8.4952269)">
+      <g
+         style="stroke:#000000"
+         id="g4682"
+         transform="rotate(90,33.5722,2570.396)"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_left_disabled.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782">
+        <g
+           transform="translate(-27.142861,404.54946)"
+           id="g4680"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+           inkscape:export-xdpi="11.425782"
+           inkscape:export-ydpi="11.425782"
+           style="stroke:#000000">
+          <g
+             id="g4676"
+             style="stroke:#000000"
+             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+             inkscape:export-xdpi="22.851559"
+             inkscape:export-ydpi="22.851559"
+             transform="translate(-288.68382,513.5698)">
+            <rect
+               y="1262.6561"
+               x="261.38272"
+               height="126.03077"
+               width="126.03078"
+               id="rect4672"
+               style="fill:none;stroke:none" />
+            <g
+               style="fill:#000000;stroke:#000000"
+               inkscape:export-ydpi="84"
+               inkscape:export-xdpi="84"
+               inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+               transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+               id="g4674" />
+          </g>
+          <g
+             transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+             id="g4678"
+             style="stroke:#000000" />
+        </g>
+      </g>
+      <text
+         id="text4699"
+         y="2600.6936"
+         x="309.46921"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-size:153.72576904px;line-height:1.25;fill:#ffffff;stroke-width:1px"
+           y="2600.6936"
+           x="309.46921"
+           id="tspan4697"
+           sodipodi:role="line">F</tspan></text>
+    </g>
+    <g
+       id="g4705"
+       inkscape:export-filename="images/ic_anchor.png"
+       inkscape:export-xdpi="24.379999"
+       inkscape:export-ydpi="24.379999"
+       transform="translate(-29.73328,-62.298301)">
+      <rect
+         y="928.18427"
+         x="1360.6228"
+         height="126.03077"
+         width="126.03078"
+         id="rect4684"
+         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4698"
+         d="m 1369.6028,991.29073 h 110.1288"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 1424.6672,1046.3551 V 936.22633"
+         id="path4700"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:export-ydpi="24.375002"
+       inkscape:export-xdpi="24.375002"
+       inkscape:export-filename="images/ic_text.png"
+       id="g1344"
+       transform="translate(116.10138,-62.298301)"
+       style="stroke:#000000">
+      <g
+         id="g5041">
+        <rect
+           y="928.18427"
+           x="1360.6228"
+           height="126.03077"
+           width="126.03078"
+           id="rect1338"
+           style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <text
+           id="text1348"
+           y="1045.8882"
+           x="1360.2886"
+           style="font-style:normal;font-weight:normal;font-size:168.9322052px;line-height:84.4661026px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1"
+           xml:space="preserve"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Bell MT';-inkscape-font-specification:'Bell MT Bold';fill:#ffffff;stroke-width:1"
+             y="1045.8882"
+             x="1360.2886"
+             id="tspan1346"
+             sodipodi:role="line">T</tspan></text>
+      </g>
+    </g>
+    <g
+       style="stroke:none"
+       transform="translate(288.83758,-70.685756)"
+       id="g5051"
+       inkscape:export-filename="images/ic_particles.png"
+       inkscape:export-xdpi="24.375002"
+       inkscape:export-ydpi="24.375002">
+      <g
+         id="g5049"
+         style="stroke:none">
+        <rect
+           style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="rect5043"
+           width="126.03078"
+           height="126.03077"
+           x="1360.6228"
+           y="928.18427" />
+        <g
+           id="g5128"
+           transform="matrix(2.6000014,0,0,2.6000014,-2095.4333,-1179.0401)"
+           style="stroke:none;stroke-width:0.38461518">
+          <circle
+             r="3.5041006"
+             cy="832.60504"
+             cx="1334.5618"
+             id="path5053"
+             style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53846061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <circle
+             r="3.5041006"
+             cy="845.62024"
+             cx="1336.5641"
+             id="path5053-7"
+             style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53846061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <circle
+             r="5.0058579"
+             cy="828.09973"
+             cx="1351.5817"
+             id="path5053-2"
+             style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53846049;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <circle
+             r="1.5017574"
+             cy="850.6261"
+             cx="1359.0905"
+             id="path5053-9"
+             style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53846061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <circle
+             r="5.0058579"
+             cy="842.61676"
+             cx="1371.1045"
+             id="path5053-1"
+             style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53846049;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <circle
+             r="3.5041006"
+             cy="839.61322"
+             cx="1356.0869"
+             id="path5053-94"
+             style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53846061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <circle
+             r="3.5041006"
+             cy="851.62732"
+             cx="1346.0752"
+             id="path5053-18"
+             style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53846061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <circle
+             r="3.5041006"
+             cy="817.08691"
+             cx="1337.5652"
+             id="path5053-28"
+             style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53846061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <circle
+             r="2.502929"
+             cy="832.10443"
+             cx="1369.6027"
+             id="path5053-91"
+             style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53846073;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <circle
+             r="3.5041006"
+             cy="823.59448"
+             cx="1363.0951"
+             id="path5053-79"
+             style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.53846061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="32"
+       inkscape:export-xdpi="32"
+       inkscape:export-filename="icons/ic_atlases_disabled.png"
+       id="g1381"
+       transform="translate(-305.18557,-8.0489609)">
+      <g
+         inkscape:export-ydpi="32.335857"
+         inkscape:export-xdpi="32.335857"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_assets.png"
+         id="g1369"
+         transform="translate(155.66068)">
+        <g
+           id="g1367">
+          <g
+             transform="translate(1046.6839,161.02829)"
+             id="g1361"
+             inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_load.png"
+             inkscape:export-xdpi="31.632902"
+             inkscape:export-ydpi="31.632902"
+             style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none">
+            <use
+               height="128"
+               width="128"
+               transform="translate(140.91628)"
+               id="use1357"
+               xlink:href="#g4635"
+               y="0"
+               x="0"
+               style="stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none" />
+            <path
+               sodipodi:nodetypes="ccccccc"
+               inkscape:connector-curvature="0"
+               id="path1359"
+               d="m 122.20452,2006.8797 v 77.1518 h 104.03566 l 0.75404,-62.7515 -45.50655,0.2365 -5.0974,-14.6368 z"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#404040;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+          </g>
+          <text
+             id="text1365"
+             y="2223.323"
+             x="1184.0203"
+             style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#404040;fill-opacity:1;stroke:none"
+             xml:space="preserve"><tspan
+               y="2223.323"
+               x="1184.0203"
+               id="tspan1363"
+               sodipodi:role="line"
+               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.29096222px;line-height:1.25;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';fill:#404040;fill-opacity:1">Atlas</tspan></text>
+        </g>
+      </g>
+      <g
+         transform="matrix(1.1073456,0,0,1.1073456,1282.52,-66.947737)"
+         id="g1379"
+         style="stroke-width:5.50284147;stroke-miterlimit:4;stroke-dasharray:none">
+        <circle
+           r="27.779196"
+           cy="1052.7947"
+           cx="39.901024"
+           style="fill:#404040;fill-opacity:1;stroke:#404040;stroke-width:7.03851795;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="circle1371"
+           transform="matrix(0.61022848,0,0,0.61022848,29.665312,1378.3415)" />
+        <g
+           id="g1377"
+           transform="translate(1.3242213e-6,8.5864751)"
+           style="stroke-width:5.50284147;stroke-miterlimit:4;stroke-dasharray:none">
+          <rect
+             y="2009.4846"
+             x="41.412464"
+             height="5.4317188"
+             width="25.203176"
+             id="rect1373"
+             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.80612087;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <rect
+             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.80612087;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect1375"
+             width="25.203176"
+             height="5.4317188"
+             x="-2024.8019"
+             y="51.298191"
+             transform="rotate(-90)" />
+        </g>
+      </g>
+    </g>
+    <text
+       id="text3430-3"
+       y="1563.4437"
+       x="1509.8492"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="1563.4437"
+         x="1509.8492"
+         id="tspan3432-3"
+         sodipodi:role="line"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">VERBS</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       x="711.29828"
+       y="1263.2792"
+       id="text1509"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:role="line"
+         id="tspan1507"
+         x="711.29828"
+         y="1263.2792">ANIMATION TYPES</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:middle;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       x="2134.4067"
+       y="922.0968"
+       id="text1509-4"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:middle;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:role="line"
+         id="tspan1507-3"
+         x="2134.4067"
+         y="922.0968">ACTOR</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:middle;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:role="line"
+         x="2134.4067"
+         y="998.40161"
+         id="tspan1529">TYPES</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:middle;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       x="155.72806"
+       y="1897.7076"
+       id="text1509-4-1"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:61.04383087px;line-height:1.25;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:center;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:middle;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.92677522;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:role="line"
+         x="155.72807"
+         y="1897.7076"
+         id="tspan1554">PROJECT TOOLBAR</tspan></text>
+    <g
+       transform="translate(-39.217467,906.37439)"
+       inkscape:export-ydpi="18.281252"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-filename="icons/ic_add_disabled.png"
+       id="g1568">
+      <g
+         transform="translate(-288.68382,513.5698)"
+         inkscape:export-ydpi="22.851559"
+         inkscape:export-xdpi="22.851559"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+         style="stroke:none"
+         id="g1560">
+        <rect
+           style="fill:none;stroke:none"
+           id="rect1556"
+           width="126.03078"
+           height="126.03077"
+           x="261.38272"
+           y="1262.6561" />
+        <g
+           id="g1558"
+           transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+           inkscape:export-xdpi="84"
+           inkscape:export-ydpi="84"
+           style="fill:#000000;stroke:none" />
+      </g>
+      <g
+         id="g1566"
+         transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)">
+        <rect
+           transform="translate(0,924.3622)"
+           y="903.71429"
+           x="-2.8571429"
+           height="17.857143"
+           width="82.85714"
+           id="rect1562"
+           style="fill:#404040;fill-opacity:1;stroke:none" />
+        <rect
+           style="fill:#404040;fill-opacity:1;stroke:none"
+           id="rect1564"
+           width="82.85714"
+           height="17.857143"
+           x="-1878.4336"
+           y="29.642855"
+           transform="rotate(-90)" />
+      </g>
+    </g>
+    <g
+       transform="translate(-39.217467,906.37439)"
+       inkscape:export-ydpi="18.281252"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-filename="icons/ic_delete_disabled.png"
+       id="g1582">
+      <g
+         transform="translate(4.1733203,523.5698)"
+         inkscape:export-ydpi="22.851559"
+         inkscape:export-xdpi="22.851559"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+         style="stroke:none"
+         id="g1574">
+        <rect
+           style="fill:none;stroke:none"
+           id="rect1570"
+           width="126.03078"
+           height="126.03077"
+           x="261.38272"
+           y="1262.6561" />
+        <g
+           id="g1572"
+           transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+           inkscape:export-xdpi="84"
+           inkscape:export-ydpi="84"
+           style="fill:#000000;stroke:none" />
+      </g>
+      <g
+         id="g1580"
+         transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)">
+        <rect
+           transform="translate(0,924.3622)"
+           y="903.71429"
+           x="-2.8571429"
+           height="17.857143"
+           width="82.85714"
+           id="rect1576"
+           style="fill:#404040;fill-opacity:1;stroke:none" />
+        <rect
+           style="fill:#404040;fill-opacity:1;stroke:none"
+           id="rect1578"
+           width="82.85714"
+           height="17.857143"
+           x="-1878.4336"
+           y="29.642855"
+           transform="rotate(-90)" />
+      </g>
+    </g>
+    <g
+       transform="translate(-39.217467,906.37439)"
+       inkscape:export-ydpi="18.281246"
+       inkscape:export-xdpi="18.281246"
+       inkscape:export-filename="icons/ic_edit_disabled.png"
+       id="g1596">
+      <g
+         transform="translate(-142.96954,516.42694)"
+         inkscape:export-ydpi="22.851559"
+         inkscape:export-xdpi="22.851559"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+         style="fill:none;stroke:none"
+         id="g1588">
+        <rect
+           style="fill:none;stroke:none"
+           id="rect1584"
+           width="126.03078"
+           height="126.03077"
+           x="261.38272"
+           y="1262.6561" />
+        <g
+           id="g1586"
+           transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+           inkscape:export-xdpi="84"
+           inkscape:export-ydpi="84"
+           style="fill:none;stroke:none" />
+      </g>
+      <g
+         id="g1594"
+         transform="matrix(0.58089536,0.64433569,-0.6672057,0.60151362,1531.3474,550.78291)">
+        <rect
+           transform="translate(0,924.3622)"
+           y="1079.5637"
+           x="43.436558"
+           height="123.23861"
+           width="40.406101"
+           id="rect1590"
+           style="fill:#404040;fill-opacity:1;stroke:none" />
+        <path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           id="path1592"
+           d="m 43.43656,2130.195 h 40.911177 l -21.718279,38.8908 z"
+           style="fill:#404040;fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+    <g
+       transform="translate(857.8323,499.89871)"
+       inkscape:export-ydpi="18.281248"
+       inkscape:export-xdpi="18.281248"
+       inkscape:export-filename="icons/ic_closed_disabled.png"
+       style="stroke:none"
+       id="g1610">
+      <g
+         transform="translate(-27.142861,404.54946)"
+         id="g1606"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782"
+         style="stroke:none">
+        <g
+           id="g1602"
+           style="stroke:none"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(-288.68382,513.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect1598"
+             style="fill:none;stroke:none" />
+          <g
+             style="fill:#000000;stroke:none"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g1600" />
+        </g>
+        <g
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+           id="g1604"
+           style="stroke:none" />
+      </g>
+      <path
+         style="fill:#404040;fill-opacity:1;stroke:none"
+         d="m -14.049142,2200.2193 v 82.1429 l 79.526853,-41.8563 z"
+         id="path1608"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       inkscape:export-ydpi="18.281252"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-filename="icons/ic_open_disabled.png"
+       transform="translate(1017.8323,499.89871)"
+       id="g1624"
+       style="stroke:none">
+      <g
+         style="stroke:none"
+         inkscape:export-ydpi="11.425782"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         id="g1620"
+         transform="translate(-27.142861,404.54946)">
+        <g
+           transform="translate(-288.68382,513.5698)"
+           inkscape:export-ydpi="22.851559"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           style="stroke:none"
+           id="g1616">
+          <rect
+             style="fill:none;stroke:none"
+             id="rect1612"
+             width="126.03078"
+             height="126.03077"
+             x="261.38272"
+             y="1262.6561" />
+          <g
+             id="g1614"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             inkscape:export-xdpi="84"
+             inkscape:export-ydpi="84"
+             style="fill:#000000;stroke:none" />
+        </g>
+        <g
+           style="stroke:none"
+           id="g1618"
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path1622"
+         d="m 63.388183,2202.7194 h -78.20494 l 39.849666,75.7143 z"
+         style="fill:#404040;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       transform="translate(-39.217467,906.37439)"
+       inkscape:export-ydpi="18.281252"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-filename="icons/ic_copy_disabled.png"
+       id="g1640">
+      <path
+         sodipodi:nodetypes="ccccccc"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m 446.91084,1790.0521 v 94.4841 h 19.91422 v -76.3951 h 47.19477 v -18.089 z"
+         id="path1626"
+         inkscape:connector-curvature="0" />
+      <rect
+         ry="0"
+         y="1808.1482"
+         x="466.81018"
+         height="94.486343"
+         width="67.111794"
+         id="rect1628"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <g
+         inkscape:export-ydpi="11.425779"
+         inkscape:export-xdpi="11.425779"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_delete.png"
+         id="g1638"
+         transform="translate(160.67447,-2.3981265)"
+         style="fill:none;stroke:#ffffff">
+        <g
+           transform="translate(4.1733203,523.5698)"
+           inkscape:export-ydpi="22.851559"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           style="fill:none;stroke:#ffffff"
+           id="g1634">
+          <rect
+             style="fill:none;stroke:none"
+             id="rect1630"
+             width="126.03078"
+             height="126.03077"
+             x="261.38272"
+             y="1262.6561" />
+          <g
+             id="g1632"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             inkscape:export-xdpi="84"
+             inkscape:export-ydpi="84"
+             style="fill:none;stroke:#ffffff" />
+        </g>
+        <g
+           id="g1636"
+           transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
+           style="fill:none;stroke:#ffffff" />
+      </g>
+    </g>
+    <g
+       transform="matrix(1,0,0,0.99518639,-39.217467,909.90423)"
+       inkscape:export-ydpi="18.281252"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-filename="icons/ic_paste_disabled.png"
+       id="g1658">
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#404040;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="rect1642"
+         width="70.458496"
+         height="99.198151"
+         x="596.2774"
+         y="1800.9037"
+         ry="0" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#404040;fill-opacity:1;stroke:none;stroke-width:4.19739103;marker:none;enable-background:accumulate"
+         d="m 600.33342,1816.2191 63.73704,-1.0293 -12.48455,-11.8391 -7.88501,-11.3242 c -11.82619,-15.378 -21.41765,-7.8304 -28.25456,1.5442 l -3.28541,10.2948 z"
+         id="path1644"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <circle
+         r="3.9968774"
+         cy="865.42389"
+         cx="601.13037"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;enable-background:accumulate"
+         id="circle1646"
+         transform="matrix(2.246881,0,0,2.246881,-721.16059,-148.64363)" />
+      <g
+         style="fill:none;stroke:#ffffff"
+         transform="translate(302.96331,-2.3981265)"
+         id="g1656"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_delete.png"
+         inkscape:export-xdpi="11.425779"
+         inkscape:export-ydpi="11.425779">
+        <g
+           id="g1652"
+           style="fill:none;stroke:#ffffff"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(4.1733203,523.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect1648"
+             style="fill:none;stroke:none" />
+          <g
+             style="fill:none;stroke:#ffffff"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g1650" />
+        </g>
+        <g
+           style="fill:none;stroke:#ffffff"
+           transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
+           id="g1654" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="18.281248"
+       inkscape:export-xdpi="18.281248"
+       inkscape:export-filename="icons/ic_down_disabled.png"
+       transform="translate(1206.4849,499.89871)"
+       id="g1672"
+       style="stroke:none">
+      <g
+         style="stroke:none"
+         inkscape:export-ydpi="11.425782"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         id="g1668"
+         transform="translate(-27.142861,404.54946)">
+        <g
+           transform="translate(-288.68382,513.5698)"
+           inkscape:export-ydpi="22.851559"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           style="stroke:none"
+           id="g1664">
+          <rect
+             style="fill:none;stroke:none"
+             id="rect1660"
+             width="126.03078"
+             height="126.03077"
+             x="261.38272"
+             y="1262.6561" />
+          <g
+             id="g1662"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             inkscape:export-xdpi="84"
+             inkscape:export-ydpi="84"
+             style="fill:#000000;stroke:none" />
+        </g>
+        <g
+           style="stroke:none"
+           id="g1666"
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path1670"
+         d="M 66.95847,2187.3801 H -50.362064 l 59.7811862,113.5841 z"
+         style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50016773" />
+    </g>
+    <g
+       style="stroke:none"
+       id="g1686"
+       transform="rotate(180,685.35643,2493.7402)"
+       inkscape:export-filename="icons/ic_up_disabled.png"
+       inkscape:export-xdpi="18.281252"
+       inkscape:export-ydpi="18.281252">
+      <g
+         transform="translate(-27.142861,404.54946)"
+         id="g1682"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_add.png"
+         inkscape:export-xdpi="11.425782"
+         inkscape:export-ydpi="11.425782"
+         style="stroke:none">
+        <g
+           id="g1678"
+           style="stroke:none"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(-288.68382,513.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect1674"
+             style="fill:none;stroke:none" />
+          <g
+             style="fill:#000000;stroke:none"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g1676" />
+        </g>
+        <g
+           transform="matrix(1.4137931,0,0,1.4137931,-18.817729,-757.90375)"
+           id="g1680"
+           style="stroke:none" />
+      </g>
+      <path
+         style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50016773"
+         d="M 66.95847,2187.3801 H -50.362064 l 59.7811862,113.5841 z"
+         id="path1684"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       transform="translate(-39.217467,906.37439)"
+       inkscape:export-ydpi="11.425776"
+       inkscape:export-xdpi="11.425776"
+       inkscape:export-filename="icons/ic_create_all_disabled.png"
+       style="stroke:none"
+       id="g1710">
+      <g
+         style="fill:none;stroke:none"
+         transform="translate(431.41822,-2.3981265)"
+         id="g1696"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_delete.png"
+         inkscape:export-xdpi="11.425779"
+         inkscape:export-ydpi="11.425779">
+        <g
+           id="g1692"
+           style="fill:none;stroke:none"
+           inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_talkto.png"
+           inkscape:export-xdpi="22.851559"
+           inkscape:export-ydpi="22.851559"
+           transform="translate(4.1733203,523.5698)">
+          <rect
+             y="1262.6561"
+             x="261.38272"
+             height="126.03077"
+             width="126.03078"
+             id="rect1688"
+             style="fill:none;stroke:none" />
+          <g
+             style="fill:none;stroke:none"
+             inkscape:export-ydpi="84"
+             inkscape:export-xdpi="84"
+             inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/talkto.png"
+             transform="matrix(0.97543825,0,0,0.97543825,-715.26429,450.63449)"
+             id="g1690" />
+        </g>
+        <g
+           style="fill:none;stroke:none"
+           transform="matrix(1.1893761,1.1893761,-1.1893761,1.1893761,2467.5855,-381.52445)"
+           id="g1694" />
+      </g>
+      <g
+         id="g1702"
+         style="stroke:none"
+         transform="matrix(1.4852893,0,0,1.4852893,-357.97764,-884.73489)">
+        <rect
+           y="1849.7565"
+           x="748.59918"
+           height="9.4318333"
+           width="43.763706"
+           id="rect1698"
+           style="fill:#404040;fill-opacity:1;stroke:none" />
+        <rect
+           style="fill:#404040;fill-opacity:1;stroke:none"
+           id="rect1700"
+           width="43.763706"
+           height="9.4318333"
+           x="-1876.3541"
+           y="765.76508"
+           transform="rotate(-90)" />
+      </g>
+      <g
+         transform="matrix(1.4852893,0,0,1.4852893,-406.82517,-931.10465)"
+         style="stroke:none"
+         id="g1708">
+        <rect
+           style="fill:#404040;fill-opacity:1;stroke:none"
+           id="rect1704"
+           width="43.763706"
+           height="9.4318333"
+           x="748.59918"
+           y="1849.7565" />
+        <rect
+           transform="rotate(-90)"
+           y="765.76508"
+           x="-1876.3541"
+           height="9.4318333"
+           width="43.763706"
+           id="rect1706"
+           style="fill:#404040;fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="18.281246"
+       inkscape:export-xdpi="18.281246"
+       inkscape:export-filename="icons/ic_player_small.png"
+       id="g3991-8"
+       transform="translate(1891.1343,1558.0345)">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect3179-6"
+         width="126.03078"
+         height="126.03077"
+         x="544.41321"
+         y="926.27539" />
+      <g
+         id="g3986-0"
+         transform="matrix(1.496623,0,0,1.496623,-293.67843,-733.71816)">
+        <path
+           sodipodi:nodetypes="cccccc"
+           transform="translate(0,924.3622)"
+           inkscape:connector-curvature="0"
+           id="path3212-8"
+           d="m 585.71429,195.14286 -14.28572,24.28571 31.42857,41.42857 31.42857,-40 -12.14286,-25 z"
+           style="fill:none;stroke:#ffffff;stroke-width:6.19999981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <text
+           id="text3214-6"
+           y="1162.3622"
+           x="590.71429"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+           xml:space="preserve"><tspan
+             y="1162.3622"
+             x="590.71429"
+             id="tspan3216-5"
+             sodipodi:role="line"
+             style="font-size:40px;line-height:1.25">P</tspan></text>
+      </g>
+    </g>
+    <g
+       transform="translate(1893.9661,1723.1567)"
+       id="g1752"
+       inkscape:export-filename="icons/ic_player_small_disabled.png"
+       inkscape:export-xdpi="18.281248"
+       inkscape:export-ydpi="18.281248">
+      <rect
+         y="926.27539"
+         x="544.41321"
+         height="126.03077"
+         width="126.03078"
+         id="rect1742"
+         style="fill:none;stroke:none" />
+      <g
+         transform="matrix(1.496623,0,0,1.496623,-293.67843,-733.71816)"
+         id="g1750">
+        <path
+           style="fill:none;stroke:#404040;stroke-width:6.19999981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 585.71429,195.14286 -14.28572,24.28571 31.42857,41.42857 31.42857,-40 -12.14286,-25 z"
+           id="path1744"
+           inkscape:connector-curvature="0"
+           transform="translate(0,924.3622)"
+           sodipodi:nodetypes="cccccc" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';letter-spacing:0px;word-spacing:0px;fill:#404040;fill-opacity:1;stroke:none"
+           x="590.71429"
+           y="1162.3622"
+           id="text1748"><tspan
+             style="font-size:40px;line-height:1.25;fill:#404040;fill-opacity:1"
+             sodipodi:role="line"
+             id="tspan1746"
+             x="590.71429"
+             y="1162.3622">P</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g1768"
+       transform="translate(1676.9741,318.57086)"
+       inkscape:export-filename="icons/ic_eye_disabled.png"
+       inkscape:export-xdpi="18.281248"
+       inkscape:export-ydpi="18.281248">
+      <rect
+         style="fill:none;stroke:none"
+         id="rect1762"
+         width="126.03078"
+         height="126.03077"
+         x="129.543"
+         y="2345.7507" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 140.11388,2406.7748 c 25.24059,61.5475 99.33395,41.3008 106.25476,-1.2726 0,0 -21.04732,-36.3525 -53.73805,-35.6317 -31.10767,0.6858 -52.51671,36.9043 -52.51671,36.9043 z"
+         id="path1764"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccsc" />
+      <ellipse
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="ellipse1766"
+         cx="195.39015"
+         cy="2398.8552"
+         rx="30.241541"
+         ry="31.149151" />
+    </g>
+    <g
+       id="g1516"
+       transform="matrix(0.7927322,0,0,0.7927322,195.59569,427.92844)">
+      <circle
+         r="66.077324"
+         cy="1094.2023"
+         cx="1649.2676"
+         id="path1500"
+         style="color:#000000;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+         transform="translate(0,924.3622)" />
+      <g
+         transform="matrix(0.87289814,0,0,0.87289814,1363.4558,1155.0144)"
+         id="g3042-3"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_sprite_actor.png"
+         inkscape:export-xdpi="22.851562"
+         inkscape:export-ydpi="22.851562"
+         style="display:inline">
+        <rect
+           style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="rect3015-6"
+           width="126.03078"
+           height="126.03077"
+           x="264.41318"
+           y="926.27539" />
+        <g
+           id="g3023-7">
+          <path
+             style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 313.65236,68.401 334.86557,81.532983 360.62446,18.39845 C 360.46557,9.7742526 357.30423,13.159908 354.56354,14.862916 341.40827,33.057996 327.36107,50.616737 313.65236,68.401 Z"
+             id="path3007-5"
+             inkscape:connector-curvature="0"
+             transform="translate(0,924.3622)"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 312.64221,70.926381 19.69798,12.121831 -7.07107,8.08122 -14.64721,-10.606601 z"
+             id="path3009-3"
+             inkscape:connector-curvature="0"
+             transform="translate(0,924.3622)"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 310.11683,84.058364 13.13198,9.091373 c 0,0 3.81611,8.215953 -2.52538,15.152293 -17.21129,14.49883 -28.24073,2.98516 -39.39595,-12.121834 24.77147,18.680814 13.67052,-10.014133 28.78935,-12.121832 z"
+             id="path3011-5"
+             inkscape:connector-curvature="0"
+             transform="translate(0,924.3622)"
+             sodipodi:nodetypes="ccccc" />
+        </g>
+      </g>
+    </g>
+    <g
+       transform="matrix(0.7927322,0,0,0.7927322,322.42758,427.92844)"
+       id="g1532"
+       inkscape:export-filename="icons/scn_sprite.png"
+       inkscape:export-xdpi="27.857866"
+       inkscape:export-ydpi="27.857866">
+      <path
+         transform="translate(0,924.3622)"
+         style="color:#000000;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+         d="m 1715.3449,1094.2023 c 0,36.4935 -55.0695,66.0773 -66.0773,107.1375 -13.8396,-42.4761 -66.0773,-70.644 -66.0773,-107.1375 0,-36.4935 29.5838,-66.0774 66.0773,-66.0774 36.4935,0 66.0773,29.5839 66.0773,66.0774 z"
+         id="circle1518"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="scsss" />
+      <g
+         style="display:inline"
+         inkscape:export-ydpi="22.851562"
+         inkscape:export-xdpi="22.851562"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_sprite_actor.png"
+         id="g1530"
+         transform="matrix(0.87289814,0,0,0.87289814,1363.4558,1155.0144)">
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 264.41318,926.27539 H 390.44395 V 1052.3062 H 264.41318 Z"
+           id="rect1520"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g1528">
+          <path
+             sodipodi:nodetypes="ccccc"
+             transform="translate(0,924.3622)"
+             inkscape:connector-curvature="0"
+             id="path1522"
+             d="M 313.65236,68.401 334.86557,81.532983 360.62446,18.39845 C 360.46557,9.7742526 357.30423,13.159908 354.56354,14.862916 341.40827,33.057996 327.36107,50.616737 313.65236,68.401 Z"
+             style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             transform="translate(0,924.3622)"
+             inkscape:connector-curvature="0"
+             id="path1524"
+             d="m 312.64221,70.926381 19.69798,12.121831 -7.07107,8.08122 -14.64721,-10.606601 z"
+             style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             transform="translate(0,924.3622)"
+             inkscape:connector-curvature="0"
+             id="path1526"
+             d="m 310.11683,84.058364 13.13198,9.091373 c 0,0 3.81611,8.215953 -2.52538,15.152293 -17.21129,14.49883 -28.24073,2.98516 -39.39595,-12.121834 24.77147,18.680814 13.67052,-10.014133 28.78935,-12.121832 z"
+             style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="27.649496"
+       inkscape:export-xdpi="27.649496"
+       inkscape:export-filename="icons/scn_character.png"
+       id="g1552"
+       transform="matrix(0.7927322,0,0,0.7927322,449.65468,420.92024)">
+      <path
+         sodipodi:nodetypes="scsss"
+         inkscape:connector-curvature="0"
+         id="path1538"
+         d="m 1715.3449,1094.2023 c 0,36.4935 -55.0695,66.0773 -66.0773,107.1375 -13.8396,-42.4761 -66.0773,-70.644 -66.0773,-107.1375 0,-36.4935 29.5838,-66.0774 66.0773,-66.0774 36.4935,0 66.0773,29.5839 66.0773,66.0774 z"
+         style="color:#000000;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+         transform="translate(0,924.3622)" />
+      <path
+         sodipodi:nodetypes="ccccscccccccsscccccccccccccccccccccccccccccsccccc"
+         inkscape:connector-curvature="0"
+         id="path3017-6"
+         d="m 1626.4439,2068.7903 13.8181,1.4294 -0.4765,-4.7648 4.7649,-23.8244 c 0,0 7.6237,-16.2006 7.6237,-14.2946 0,1.906 2.6207,14.2946 2.6207,14.2946 l 19.7743,16.6771 -6.4326,6.9091 -0.7147,2.6207 11.9121,-8.1003 -4.2884,-3.812 -17.6299,-16.2006 c 0,0 2.02,-14.8509 1.0422,-26.6607 -0.9766,-11.7943 0.8333,-19.6193 2.2931,-16.6996 2.859,5.7178 2.859,8.5768 2.859,8.5768 l 3.3355,15.724 -2.859,3.3356 2.859,-0.9531 0.9529,3.812 3.3355,-3.3355 -3.3355,-4.2884 -2.859,-18.583 -4.2884,-10.0062 -3.3353,-10.0063 -3.8119,-5.0031 0.9529,-1.906 0.2522,-7.3897 -2.6347,-4.0459 -7.1472,1.9059 c -1.0168,1.5884 -0.3261,3.1767 1.1911,4.7648 l -1.1911,6.4326 h 1.4294 l 2.1442,2.6207 1.6677,-0.953 2.7369,2.0156 -1.0692,3.4641 -0.7147,5.7178 -1.9059,12.8652 -7.6238,14.2946 -3.3355,0.9529 1.4295,3.3355 3.3354,-3.3355 0.4764,-1.9059 c 0,0 8.1004,-13.3416 6.6709,-10.9592 -1.4294,2.3825 -1.6677,10.4828 -1.6677,10.4828 l -8.3385,27.1597 c 0.8534,8.8497 -1.0243,17.0166 -2.6207,25.2538 l -10.5373,0.9342 z"
+         style="display:inline;fill:#ffffff;stroke:none;stroke-width:0.9433977px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g1653"
+       inkscape:export-filename="icons/scn_move.png"
+       inkscape:export-xdpi="27.649496"
+       inkscape:export-ydpi="27.649496">
+      <path
+         sodipodi:nodetypes="scsss"
+         inkscape:connector-curvature="0"
+         id="path1571"
+         d="m 1951.2521,2028.1095 c 0,28.9296 -43.6554,52.3816 -52.3816,84.9313 -10.9711,-33.6721 -52.3816,-56.0017 -52.3816,-84.9313 0,-28.9296 23.452,-52.3817 52.3816,-52.3817 28.9296,0 52.3816,23.4521 52.3816,52.3817 z"
+         style="color:#000000;display:inline;overflow:visible;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:6.34185743;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4698-1"
+         d="m 1866.5496,2029.6684 h 64.075"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1898.5871,2061.7059 v -64.075"
+         id="path4700-2"
+         inkscape:connector-curvature="0" />
+      <path
+         style="display:inline;fill:#ffffff;stroke:none;stroke-width:0.21663864"
+         d="m 1922.7915,2020.7708 v 17.7953 l 17.2285,-9.0677 z"
+         id="path3311-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path1639"
+         d="m 1875.5979,2020.7708 v 17.7953 l -17.2285,-9.0677 z"
+         style="display:inline;fill:#ffffff;stroke:none;stroke-width:0.21663864" />
+      <path
+         style="display:inline;fill:#ffffff;stroke:none;stroke-width:0.21663864"
+         d="m 1907.4847,2005.0097 h -17.7953 l 9.0677,-17.2285 z"
+         id="path1641"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path1643"
+         d="m 1907.4847,2056.7874 h -17.7953 l 9.0677,17.2285 z"
+         style="display:inline;fill:#ffffff;stroke:none;stroke-width:0.21663864" />
+    </g>
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 1522.9228,2192.9958 -17.2286,9.0664 17.2286,8.7285 v -4.8106 c 26.7062,0.065 48.3035,21.4416 48.7421,48.0567 h -5.373 l 9.0683,17.2285 8.7286,-17.2285 h -5.4258 c -0.4422,-30.4013 -25.2504,-54.9914 -55.7402,-55.0567 z"
+       id="path1500-0"
+       inkscape:export-filename="icons/scn_rotate.png"
+       inkscape:export-xdpi="36.561573"
+       inkscape:export-ydpi="36.561573"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g1639"
+       inkscape:export-filename="icons/ic_walkzone.png"
+       inkscape:export-xdpi="24"
+       inkscape:export-ydpi="24">
+      <g
+         inkscape:export-ydpi="22.851562"
+         inkscape:export-xdpi="22.851562"
+         inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_base_actor.png"
+         id="g1509"
+         transform="translate(1691.2572,-118.22518)">
+        <rect
+           style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="rect1501"
+           width="126.03078"
+           height="126.03077"
+           x="130.84175"
+           y="926.27539" />
+        <rect
+           style="fill:none;stroke:#ffffff;stroke-width:0.99682093"
+           id="rect1503"
+           width="107.77778"
+           height="88.901855"
+           x="141.14188"
+           y="947.67273" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+           x="133.8445"
+           y="1045.9761"
+           id="text1507"><tspan
+             sodipodi:role="line"
+             id="tspan1505"
+             x="133.8445"
+             y="1045.9761"
+             style="font-size:11.43463326px;line-height:1.25;font-family:sans-serif">x,y</tspan></text>
+      </g>
+      <g
+         id="g1517"
+         style="display:inline"
+         transform="matrix(0.16060007,-0.02003016,0.02687338,0.21546845,1561.3137,855.59156)">
+        <path
+           style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1805.9773,354.38301 h 104.7745 c -0.2184,30.97932 -12.0943,75.24188 -60.8824,73.62526 -22.3089,-0.73922 -43.7355,-43.25887 -43.8921,-73.62526 z"
+           id="path1511"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsc" />
+        <path
+           style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1804.5615,342.2243 h 107.9426 c 3.9848,-24.82864 13.2377,-53.74575 10.9904,-89.19984 -2.3168,-36.54937 -31.199,-66.88342 -67.9616,-66.54591 -27.716,0.25445 -65.6083,40.93591 -65.1301,76.457 0.343,25.4849 14.1587,79.28875 14.1587,79.28875 z"
+           id="path1513"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsssc" />
+      </g>
+      <g
+         transform="matrix(0.16012747,0.02351135,-0.03154391,0.21483439,1612.6585,753.5576)"
+         style="display:inline"
+         id="g1527">
+        <path
+           sodipodi:nodetypes="ccsc"
+           inkscape:connector-curvature="0"
+           id="path1523"
+           d="m 1805.9773,354.38301 h 104.7745 c -0.2184,30.97932 -12.0943,75.24188 -60.8824,73.62526 -22.3089,-0.73922 -43.7355,-43.25887 -43.8921,-73.62526 z"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="ccsssc"
+           inkscape:connector-curvature="0"
+           id="path1525"
+           d="m 1804.5615,342.2243 h 107.9426 c 3.9848,-24.82864 13.2377,-53.74575 10.9904,-89.19984 -2.3168,-36.54937 -31.199,-66.88342 -67.9616,-66.54591 -27.716,0.25445 -65.6083,40.93591 -65.1301,76.457 0.343,25.4849 14.1587,79.28875 14.1587,79.28875 z"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="22.851562"
+       inkscape:export-xdpi="22.851562"
+       inkscape:export-filename="/home/rgarcia/WORKSPACES/ENGINE/engine-editor/src/res/images/ic_base_actor.png"
+       id="g1557"
+       transform="translate(1684.5178,14.773169)">
+      <rect
+         style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1.96923077px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="rect1549"
+         width="126.03078"
+         height="126.03077"
+         x="130.84175"
+         y="926.27539" />
+      <rect
+         style="fill:none;stroke:#ffffff;stroke-width:0.99682093"
+         id="rect1551"
+         width="107.77778"
+         height="88.901855"
+         x="141.14188"
+         y="947.67273" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+         x="133.8445"
+         y="1045.9761"
+         id="text1555"><tspan
+           sodipodi:role="line"
+           id="tspan1553"
+           x="133.8445"
+           y="1045.9761"
+           style="font-size:11.43463326px;line-height:1.25;font-family:sans-serif">x,y</tspan></text>
+      <g
+         transform="matrix(0.06341244,-0.01596829,0.01596829,0.06341244,176.38092,959.13383)"
+         id="g18"
+         style="display:inline;fill:#ffffff">
+        <g
+           transform="matrix(0.1,0,0,-0.1,0,511)"
+           id="g16"
+           style="fill:#ffffff">
+          <path
+             inkscape:connector-curvature="0"
+             d="m 4065.5,4991.4 c -186.8,-60.7 -364.3,-228.9 -455.4,-429.7 -207.8,-453 -51.4,-1039.2 326.9,-1237.7 130.8,-67.7 362,-67.7 495.1,2.3 488.1,254.6 607.1,1057.9 219.5,1482.9 -142.4,156.5 -410.9,240.6 -586.1,182.2 z"
+             id="path4"
+             style="fill:#ffffff" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 5543.7,4477.7 c -287.2,-133.1 -474.1,-462.4 -406.3,-719.3 112.1,-411 623.5,-413.3 833.7,-7 25.7,51.4 44.4,154.1 51.4,270.9 9.4,154.1 2.3,207.8 -37.4,296.6 -84.1,189.1 -245.2,247.5 -441.4,158.8 z"
+             id="path6"
+             style="fill:#ffffff" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 6389.1,3917.2 c -86.4,-51.4 -252.2,-231.2 -298.9,-319.9 -18.7,-37.4 -46.7,-114.4 -63.1,-170.5 -58.4,-217.2 67.7,-455.4 275.6,-518.4 196.2,-58.4 429.7,53.7 537.1,261.6 46.7,88.7 53.7,128.4 44.4,289.6 -18.8,385.2 -254.6,604.7 -495.1,457.6 z"
+             id="path8"
+             style="fill:#ffffff" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 7082.6,3095.2 c -130.8,-65.4 -301.3,-256.9 -333.9,-376 -14,-51.4 -16.3,-135.4 -9.3,-186.8 28,-163.5 226.5,-310.6 383,-280.2 212.5,42 399.3,518.4 296.6,763.6 -58.5,135.5 -168.2,163.5 -336.4,79.4 z"
+             id="path10"
+             style="fill:#ffffff" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 4404.1,3064.9 c -312.9,-100.4 -681.9,-364.3 -789.3,-562.8 -65.4,-121.4 -70.1,-387.6 -7,-572.1 60.7,-182.1 259.2,-572.1 455.4,-896.7 324.6,-534.8 418,-773 439,-1125.6 30.4,-490.4 -161.1,-910.7 -611.8,-1335.7 -245.2,-233.5 -532.4,-425 -920.1,-616.5 -350.3,-172.8 -485.7,-296.6 -616.5,-558.1 -378.3,-768.4 -186.8,-1858.9 371.3,-2122.8 291.9,-135.4 642.2,-58.4 1076.5,235.8 226.5,156.5 973.8,896.7 1338.1,1328.7 1254,1489.9 2013,3031.2 2017.7,4098.4 0,203.2 -11.7,294.2 -53.7,432 -219.5,723.9 -1069.5,1454.8 -1954.6,1681.3 -210.2,53.7 -595.5,60.8 -745,14.1 z"
+             id="path12"
+             style="fill:#ffffff" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 7526.3,2184.5 c -214.8,-107.4 -284.9,-329.3 -147.1,-467 46.7,-44.4 93.4,-67.7 137.8,-67.7 135.4,0 289.6,186.8 322.3,392.3 27.9,175.1 -114.5,240.5 -313,142.4 z"
+             id="path14"
+             style="fill:#ffffff" />
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.06450762,-0.01071882,-0.01071882,0.06450762,216.56664,973.28773)"
+         id="g18-3"
+         style="display:inline;fill:#ffffff">
+        <g
+           transform="matrix(0.1,0,0,-0.1,0,511)"
+           id="g16-6"
+           style="fill:#ffffff">
+          <path
+             inkscape:connector-curvature="0"
+             d="m 4065.5,4991.4 c -186.8,-60.7 -364.3,-228.9 -455.4,-429.7 -207.8,-453 -51.4,-1039.2 326.9,-1237.7 130.8,-67.7 362,-67.7 495.1,2.3 488.1,254.6 607.1,1057.9 219.5,1482.9 -142.4,156.5 -410.9,240.6 -586.1,182.2 z"
+             id="path4-7"
+             style="fill:#ffffff" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 5543.7,4477.7 c -287.2,-133.1 -474.1,-462.4 -406.3,-719.3 112.1,-411 623.5,-413.3 833.7,-7 25.7,51.4 44.4,154.1 51.4,270.9 9.4,154.1 2.3,207.8 -37.4,296.6 -84.1,189.1 -245.2,247.5 -441.4,158.8 z"
+             id="path6-5"
+             style="fill:#ffffff" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 6389.1,3917.2 c -86.4,-51.4 -252.2,-231.2 -298.9,-319.9 -18.7,-37.4 -46.7,-114.4 -63.1,-170.5 -58.4,-217.2 67.7,-455.4 275.6,-518.4 196.2,-58.4 429.7,53.7 537.1,261.6 46.7,88.7 53.7,128.4 44.4,289.6 -18.8,385.2 -254.6,604.7 -495.1,457.6 z"
+             id="path8-3"
+             style="fill:#ffffff" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 7082.6,3095.2 c -130.8,-65.4 -301.3,-256.9 -333.9,-376 -14,-51.4 -16.3,-135.4 -9.3,-186.8 28,-163.5 226.5,-310.6 383,-280.2 212.5,42 399.3,518.4 296.6,763.6 -58.5,135.5 -168.2,163.5 -336.4,79.4 z"
+             id="path10-5"
+             style="fill:#ffffff" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 4404.1,3064.9 c -312.9,-100.4 -681.9,-364.3 -789.3,-562.8 -65.4,-121.4 -70.1,-387.6 -7,-572.1 60.7,-182.1 259.2,-572.1 455.4,-896.7 324.6,-534.8 418,-773 439,-1125.6 30.4,-490.4 -161.1,-910.7 -611.8,-1335.7 -245.2,-233.5 -532.4,-425 -920.1,-616.5 -350.3,-172.8 -485.7,-296.6 -616.5,-558.1 -378.3,-768.4 -186.8,-1858.9 371.3,-2122.8 291.9,-135.4 642.2,-58.4 1076.5,235.8 226.5,156.5 973.8,896.7 1338.1,1328.7 1254,1489.9 2013,3031.2 2017.7,4098.4 0,203.2 -11.7,294.2 -53.7,432 -219.5,723.9 -1069.5,1454.8 -1954.6,1681.3 -210.2,53.7 -595.5,60.8 -745,14.1 z"
+             id="path12-6"
+             style="fill:#ffffff" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 7526.3,2184.5 c -214.8,-107.4 -284.9,-329.3 -147.1,-467 46.7,-44.4 93.4,-67.7 137.8,-67.7 135.4,0 289.6,186.8 322.3,392.3 27.9,175.1 -114.5,240.5 -313,142.4 z"
+             id="path14-2"
+             style="fill:#ffffff" />
+        </g>
+      </g>
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path1565"
+       d="m 1774.1456,2193.086 -24.0458,12.6779 24.0458,12.6783 v -8.1439 h 30.3425 v 8.1439 l 24.0457,-12.6783 -24.0457,-12.6779 v 8.1437 h -30.3425 z"
+       style="color:#000000;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.99999952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       style="color:#000000;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       d="m 1777.0939,2258.8851 -36.0555,13.831 36.0555,13.831 v -8.8843 h 37.022 v 8.8843 l 36.0554,-13.831 -36.0554,-13.831 v 8.8843 h -37.022 z"
+       id="path1567"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1572"
+       d="m 1666.8463,2272.3508 -37.921,11.7384 11.7382,-37.9212 8.4095,8.4093 31.3317,-31.3316 -8.4094,-8.4095 37.9212,-11.738 -11.7384,37.9208 -8.4093,-8.4091 -31.3316,31.3317 z"
+       style="color:#000000;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.99999952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:export-filename="icons/scn_scale.png"
+       inkscape:export-xdpi="36"
+       inkscape:export-ydpi="36" />
+    <g
+       id="g1605"
+       inkscape:export-filename="icons/scn_scale_lock.png"
+       inkscape:export-xdpi="20.201239"
+       inkscape:export-ydpi="20.201239"
+       transform="translate(-222.29167,16.990446)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1569"
+         d="m 2253.7246,1993.1802 -37.921,-11.7384 11.7382,37.9212 8.4095,-8.4093 31.3317,31.3316 -8.4094,8.4095 37.9212,11.738 -11.7384,-37.9208 -8.4093,8.4091 -31.3316,-31.3317 z"
+         style="color:#000000;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.99999952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+         sodipodi:nodetypes="ccccccccccc" />
+      <g
+         transform="matrix(1.3276836,0,0,1.3276836,-719.00548,-680.24271)"
+         id="g1597">
+        <circle
+           style="color:#000000;overflow:visible;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.89230764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+           id="path1591"
+           cx="2256.7551"
+           cy="2018.9447"
+           r="14.512671" />
+        <g
+           id="g1578"
+           transform="matrix(0.13758887,0,0,0.21814009,2244.8193,1986.2141)">
+          <rect
+             id="rect1574"
+             ry="2.2"
+             rx="2.2"
+             style="fill:#ffffff;stroke:none"
+             y="138.8916"
+             x="39.125"
+             height="52.916664"
+             width="95.25" />
+          <path
+             id="path1576"
+             style="fill:none;stroke:#ffffff;stroke-width:8.0264349"
+             d="m 119.36431,139.67287 v -7.46717 c 0,-13.27497 -16.30716,-19.91245 -32.61431,-19.91245 -16.307153,0 -32.614306,6.63748 -32.614306,19.91245 v 7.46717"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+    <path
+       inkscape:export-ydpi="24.609156"
+       inkscape:export-xdpi="24.609156"
+       inkscape:export-filename="icons/scn_rotate.png"
+       id="path1609"
+       d="m 2223.7786,1998.4373 -17.2286,11.0664 17.2286,10.7285 v -4.8106 c 26.7062,0.065 46.3035,19.4416 46.7421,46.0567 h -5.373 l 11.0683,17.2285 10.7286,-17.2285 h -5.4258 c -0.4422,-30.4013 -27.2504,-56.9914 -57.7402,-57.0567 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       inkscape:export-ydpi="17.913513"
+       inkscape:export-xdpi="17.913513"
+       inkscape:export-filename="icons/scn_scale.png"
+       sodipodi:nodetypes="ccccccccccc"
+       style="color:#000000;overflow:visible;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.99999952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
+       d="m 2145.3374,2060.2106 -32.9991,10.2148 10.2147,-32.9992 7.3181,7.3177 27.2649,-27.2648 -7.3178,-7.318 32.9991,-10.2145 -10.2148,32.9988 -7.3179,-7.3175 -27.2648,27.265 z"
+       id="path1533"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g1617"
+       inkscape:export-filename="icons/ic_reload_small.png"
+       inkscape:export-xdpi="18"
+       inkscape:export-ydpi="18">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3768-3"
+         d="m 2706.8937,2481.3644 -19.2952,15.3304 c -10.1476,-8.5095 -23.1802,-13.6783 -37.3346,-13.6783 -31.99,0 -58.2817,26.2918 -58.2817,58.2817 0,31.99 26.2917,57.687 58.2817,57.687 25.0789,0 46.6293,-15.763 54.7796,-37.9953 l -20.881,-5.0883 c -5.5881,13.1775 -18.5375,22.2686 -33.8986,22.2686 -20.562,0 -36.8722,-16.31 -36.8722,-36.872 0,-20.562 16.3102,-37.4667 36.8722,-37.4667 7.629,0 14.6388,2.3621 20.4845,6.3436 l -19.0968,15.1981 55.2421,10.2422 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:xx-small;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.11111116;marker:none;enable-background:accumulate" />
+      <rect
+         y="-2712.4534"
+         x="2477.1594"
+         height="126.03077"
+         width="126.03078"
+         id="rect1557-7"
+         style="display:inline;fill:none;stroke:none"
+         transform="rotate(90)" />
+    </g>
+    <g
+       id="g1598"
+       inkscape:export-filename="icons/ic_reload_small_disabled.png"
+       inkscape:export-xdpi="18"
+       inkscape:export-ydpi="18">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:xx-small;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.11111116;marker:none;enable-background:accumulate"
+         d="m 2704.8911,2640.5506 -19.2951,15.3304 c -10.1477,-8.5095 -23.1802,-13.6784 -37.3346,-13.6784 -31.99,0 -58.2817,26.2918 -58.2817,58.2818 0,31.9899 26.2917,57.687 58.2817,57.687 25.0789,0 46.6292,-15.7631 54.7795,-37.9954 l -20.881,-5.0882 c -5.5881,13.1775 -18.5375,22.2686 -33.8985,22.2686 -20.562,0 -36.8721,-16.3101 -36.8721,-36.872 0,-20.562 16.3101,-37.4667 36.8721,-37.4667 7.6289,0 14.6388,2.3621 20.4845,6.3435 l -19.0968,15.1982 55.242,10.2421 z"
+         id="path1554"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="-2710.4509"
+         x="2636.3457"
+         height="126.03077"
+         width="126.03078"
+         id="rect1557-5"
+         style="display:inline;fill:none;stroke:none"
+         transform="rotate(90)" />
+    </g>
+  </g>
+</svg>
diff --git a/adventure-editor/assets-raw/editor/icons/eye.png b/adventure-editor/assets-raw/editor/icons/eye.png
new file mode 100644
index 000000000..3788e2cfa
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/eye.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/eye_disabled.png b/adventure-editor/assets-raw/editor/icons/eye_disabled.png
new file mode 100644
index 000000000..5a767cf59
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/eye_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_3d.png b/adventure-editor/assets-raw/editor/icons/ic_3d.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_3d.png
rename to adventure-editor/assets-raw/editor/icons/ic_3d.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_add.png b/adventure-editor/assets-raw/editor/icons/ic_add.png
new file mode 100644
index 000000000..e4227c9b4
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_add.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_add_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_add_disabled.png
new file mode 100644
index 000000000..3522aef0d
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_add_disabled.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_anchor.png b/adventure-editor/assets-raw/editor/icons/ic_anchor.png
new file mode 100644
index 000000000..409e0ca7b
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_anchor.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_animation.png b/adventure-editor/assets-raw/editor/icons/ic_animation.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_animation.png
rename to adventure-editor/assets-raw/editor/icons/ic_animation.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_assets.png b/adventure-editor/assets-raw/editor/icons/ic_assets.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_assets.png
rename to adventure-editor/assets-raw/editor/icons/ic_assets.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_assets_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_assets_disabled.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_assets_disabled.png
rename to adventure-editor/assets-raw/editor/icons/ic_assets_disabled.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_atlases.png b/adventure-editor/assets-raw/editor/icons/ic_atlases.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_atlases.png
rename to adventure-editor/assets-raw/editor/icons/ic_atlases.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_atlases_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_atlases_disabled.png
new file mode 100644
index 000000000..8a9a72c52
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_atlases_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_base_actor.png b/adventure-editor/assets-raw/editor/icons/ic_base_actor.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_base_actor.png
rename to adventure-editor/assets-raw/editor/icons/ic_base_actor.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_character_actor.png b/adventure-editor/assets-raw/editor/icons/ic_character_actor.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_character_actor.png
rename to adventure-editor/assets-raw/editor/icons/ic_character_actor.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_check.png b/adventure-editor/assets-raw/editor/icons/ic_check.png
new file mode 100644
index 000000000..e3b55df09
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_check.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_check_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_check_disabled.png
new file mode 100644
index 000000000..d8b7c607e
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_check_disabled.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_closed.png b/adventure-editor/assets-raw/editor/icons/ic_closed.png
new file mode 100644
index 000000000..d69bf25c2
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_closed.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_closed_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_closed_disabled.png
new file mode 100644
index 000000000..bf6efd453
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_closed_disabled.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_copy.png b/adventure-editor/assets-raw/editor/icons/ic_copy.png
new file mode 100644
index 000000000..8aa3f88ac
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_copy.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_copy_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_copy_disabled.png
new file mode 100644
index 000000000..373512bc7
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_copy_disabled.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_create_all.png b/adventure-editor/assets-raw/editor/icons/ic_create_all.png
new file mode 100644
index 000000000..9d5e6eb04
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_create_all.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_create_all_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_create_all_disabled.png
new file mode 100644
index 000000000..dafc0ba1c
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_create_all_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_custom.png b/adventure-editor/assets-raw/editor/icons/ic_custom.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_custom.png
rename to adventure-editor/assets-raw/editor/icons/ic_custom.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_delete.png b/adventure-editor/assets-raw/editor/icons/ic_delete.png
new file mode 100644
index 000000000..3724bda37
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_delete.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_delete_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_delete_disabled.png
new file mode 100644
index 000000000..ad3310af2
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_delete_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_dialog.png b/adventure-editor/assets-raw/editor/icons/ic_dialog.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_dialog.png
rename to adventure-editor/assets-raw/editor/icons/ic_dialog.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_down.png b/adventure-editor/assets-raw/editor/icons/ic_down.png
new file mode 100644
index 000000000..7daa95fea
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_down.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_down_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_down_disabled.png
new file mode 100644
index 000000000..a8bc9e19d
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_down_disabled.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_edit.png b/adventure-editor/assets-raw/editor/icons/ic_edit.png
new file mode 100644
index 000000000..b94aa073c
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_edit.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_edit_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_edit_disabled.png
new file mode 100644
index 000000000..ceb402586
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_edit_disabled.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_enter.png b/adventure-editor/assets-raw/editor/icons/ic_enter.png
new file mode 100644
index 000000000..3741e759d
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_enter.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_exit.png b/adventure-editor/assets-raw/editor/icons/ic_exit.png
new file mode 100644
index 000000000..a7a4f0af5
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_exit.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_eye.png b/adventure-editor/assets-raw/editor/icons/ic_eye.png
new file mode 100644
index 000000000..1b9761c60
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_eye.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_eye_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_eye_disabled.png
new file mode 100644
index 000000000..484e08716
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_eye_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_fg_actor.png b/adventure-editor/assets-raw/editor/icons/ic_fg_actor.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_fg_actor.png
rename to adventure-editor/assets-raw/editor/icons/ic_fg_actor.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_flip.png b/adventure-editor/assets-raw/editor/icons/ic_flip.png
new file mode 100644
index 000000000..b28cb4b3a
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_flip.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_goto.png b/adventure-editor/assets-raw/editor/icons/ic_goto.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_goto.png
rename to adventure-editor/assets-raw/editor/icons/ic_goto.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_init.png b/adventure-editor/assets-raw/editor/icons/ic_init.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_init.png
rename to adventure-editor/assets-raw/editor/icons/ic_init.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_leave.png b/adventure-editor/assets-raw/editor/icons/ic_leave.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_leave.png
rename to adventure-editor/assets-raw/editor/icons/ic_leave.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_left.png b/adventure-editor/assets-raw/editor/icons/ic_left.png
new file mode 100644
index 000000000..c5262d377
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_left.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_left_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_left_disabled.png
new file mode 100644
index 000000000..d1b432d70
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_left_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_load.png b/adventure-editor/assets-raw/editor/icons/ic_load.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_load.png
rename to adventure-editor/assets-raw/editor/icons/ic_load.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_lookat.png b/adventure-editor/assets-raw/editor/icons/ic_lookat.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_lookat.png
rename to adventure-editor/assets-raw/editor/icons/ic_lookat.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_new.png b/adventure-editor/assets-raw/editor/icons/ic_new.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_new.png
rename to adventure-editor/assets-raw/editor/icons/ic_new.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_no_scene.png b/adventure-editor/assets-raw/editor/icons/ic_no_scene.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_no_scene.png
rename to adventure-editor/assets-raw/editor/icons/ic_no_scene.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_obstacle_actor.png b/adventure-editor/assets-raw/editor/icons/ic_obstacle_actor.png
new file mode 100644
index 000000000..0a6a0b957
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_obstacle_actor.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_open.png b/adventure-editor/assets-raw/editor/icons/ic_open.png
new file mode 100644
index 000000000..881f0c6c4
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_open.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_open_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_open_disabled.png
new file mode 100644
index 000000000..89d4b8003
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_open_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_package.png b/adventure-editor/assets-raw/editor/icons/ic_package.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_package.png
rename to adventure-editor/assets-raw/editor/icons/ic_package.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_package_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_package_disabled.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_package_disabled.png
rename to adventure-editor/assets-raw/editor/icons/ic_package_disabled.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_particles.png b/adventure-editor/assets-raw/editor/icons/ic_particles.png
new file mode 100644
index 000000000..7f93c9a7f
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_particles.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_paste.png b/adventure-editor/assets-raw/editor/icons/ic_paste.png
new file mode 100644
index 000000000..bd6e27d6a
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_paste.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_paste_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_paste_disabled.png
new file mode 100644
index 000000000..9dcc0eebe
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_paste_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_pickup.png b/adventure-editor/assets-raw/editor/icons/ic_pickup.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_pickup.png
rename to adventure-editor/assets-raw/editor/icons/ic_pickup.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_play.png b/adventure-editor/assets-raw/editor/icons/ic_play.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_play.png
rename to adventure-editor/assets-raw/editor/icons/ic_play.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_play_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_play_disabled.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_play_disabled.png
rename to adventure-editor/assets-raw/editor/icons/ic_play_disabled.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_player.png b/adventure-editor/assets-raw/editor/icons/ic_player.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_player.png
rename to adventure-editor/assets-raw/editor/icons/ic_player.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_player_small.png b/adventure-editor/assets-raw/editor/icons/ic_player_small.png
new file mode 100644
index 000000000..3eae793a6
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_player_small.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_player_small_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_player_small_disabled.png
new file mode 100644
index 000000000..1892eb9da
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_player_small_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_exit.png b/adventure-editor/assets-raw/editor/icons/ic_quit.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_exit.png
rename to adventure-editor/assets-raw/editor/icons/ic_quit.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_reload_small.png b/adventure-editor/assets-raw/editor/icons/ic_reload_small.png
new file mode 100644
index 000000000..549a03cc2
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_reload_small.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_reload_small_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_reload_small_disabled.png
new file mode 100644
index 000000000..f88e20a35
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_reload_small_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_repeat.png b/adventure-editor/assets-raw/editor/icons/ic_repeat.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_repeat.png
rename to adventure-editor/assets-raw/editor/icons/ic_repeat.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_right.png b/adventure-editor/assets-raw/editor/icons/ic_right.png
new file mode 100644
index 000000000..6f74a1c6d
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_right.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_right_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_right_disabled.png
new file mode 100644
index 000000000..4c2a3e80a
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_right_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_save.png b/adventure-editor/assets-raw/editor/icons/ic_save.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_save.png
rename to adventure-editor/assets-raw/editor/icons/ic_save.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_save_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_save_disabled.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_save_disabled.png
rename to adventure-editor/assets-raw/editor/icons/ic_save_disabled.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_spine.png b/adventure-editor/assets-raw/editor/icons/ic_spine.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_spine.png
rename to adventure-editor/assets-raw/editor/icons/ic_spine.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_sprite_actor.png b/adventure-editor/assets-raw/editor/icons/ic_sprite_actor.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_sprite_actor.png
rename to adventure-editor/assets-raw/editor/icons/ic_sprite_actor.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_talkto.png b/adventure-editor/assets-raw/editor/icons/ic_talkto.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_talkto.png
rename to adventure-editor/assets-raw/editor/icons/ic_talkto.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_test.png b/adventure-editor/assets-raw/editor/icons/ic_test.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_test.png
rename to adventure-editor/assets-raw/editor/icons/ic_test.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_text.png b/adventure-editor/assets-raw/editor/icons/ic_text.png
new file mode 100644
index 000000000..05bc004f2
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_text.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_up.png b/adventure-editor/assets-raw/editor/icons/ic_up.png
new file mode 100644
index 000000000..ca3f36283
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_up.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/ic_up_disabled.png b/adventure-editor/assets-raw/editor/icons/ic_up_disabled.png
new file mode 100644
index 000000000..0c6dfc8ec
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_up_disabled.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_use.png b/adventure-editor/assets-raw/editor/icons/ic_use.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_use.png
rename to adventure-editor/assets-raw/editor/icons/ic_use.png
diff --git a/adventure-editor/assets-raw/editor/icons/ic_walkzone.png b/adventure-editor/assets-raw/editor/icons/ic_walkzone.png
new file mode 100644
index 000000000..f28824b4f
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/ic_walkzone.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/ic_yoyo.png b/adventure-editor/assets-raw/editor/icons/ic_yoyo.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/ic_yoyo.png
rename to adventure-editor/assets-raw/editor/icons/ic_yoyo.png
diff --git a/adventure-editor/assets-raw/editor/icons/scn_character.png b/adventure-editor/assets-raw/editor/icons/scn_character.png
new file mode 100644
index 000000000..63b983c1a
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/scn_character.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/scn_move.png b/adventure-editor/assets-raw/editor/icons/scn_move.png
new file mode 100644
index 000000000..17e46d95f
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/scn_move.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/scn_rotate.png b/adventure-editor/assets-raw/editor/icons/scn_rotate.png
new file mode 100644
index 000000000..f2df06e98
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/scn_rotate.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/scn_scale.png b/adventure-editor/assets-raw/editor/icons/scn_scale.png
new file mode 100644
index 000000000..de76062e2
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/scn_scale.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/scn_scale_lock.png b/adventure-editor/assets-raw/editor/icons/scn_scale_lock.png
new file mode 100644
index 000000000..ddcbf81d3
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/scn_scale_lock.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/scn_sprite.png b/adventure-editor/assets-raw/editor/icons/scn_sprite.png
new file mode 100644
index 000000000..21662dfec
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/scn_sprite.png differ
diff --git a/adventure-editor/assets-raw/editor/icons/title.png b/adventure-editor/assets-raw/editor/icons/title.png
new file mode 100644
index 000000000..604d3e59b
Binary files /dev/null and b/adventure-editor/assets-raw/editor/icons/title.png differ
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/transparent-dark.png b/adventure-editor/assets-raw/editor/icons/transparent-dark.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/transparent-dark.png
rename to adventure-editor/assets-raw/editor/icons/transparent-dark.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/images/transparent-light.png b/adventure-editor/assets-raw/editor/icons/transparent-light.png
similarity index 100%
rename from adventure-composer/assets-raw/editor/icons-atlas/images/transparent-light.png
rename to adventure-editor/assets-raw/editor/icons/transparent-light.png
diff --git a/adventure-composer/assets-raw/editor/icons-atlas/gen.sh b/adventure-editor/assets-raw/editor/pack_icons.sh
similarity index 50%
rename from adventure-composer/assets-raw/editor/icons-atlas/gen.sh
rename to adventure-editor/assets-raw/editor/pack_icons.sh
index a17f2fcae..7523e59d1 100755
--- a/adventure-composer/assets-raw/editor/icons-atlas/gen.sh
+++ b/adventure-editor/assets-raw/editor/pack_icons.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
-VERSION=1.3.1
-LIBGDX_BASE_PATH=~/.gradle/caches/modules-2/files-2.1/com.badlogicgames.gdx/
+VERSION=1.9.9
+LIBGDX_BASE_PATH=$HOME/.gradle/caches/modules-2/files-2.1/com.badlogicgames.gdx/
 GDX_PATH=`find $LIBGDX_BASE_PATH -name gdx-$VERSION.jar`
 GDX_TOOLS_PATH=`find $LIBGDX_BASE_PATH -name gdx-tools-$VERSION.jar`
+OUT_DIR=../../src/main/resources/images
+
+cp pack.json $target
+java -cp $GDX_PATH:$GDX_TOOLS_PATH com.badlogic.gdx.tools.texturepacker.TexturePacker icons $OUT_DIR icons
 
-java -cp $GDX_PATH:$GDX_TOOLS_PATH com.badlogic.gdx.tools.texturepacker.TexturePacker images ../../../src/main/resources/images icons
diff --git a/adventure-editor/assets-raw/editor/title.svg b/adventure-editor/assets-raw/editor/title.svg
new file mode 100644
index 000000000..b639747cb
--- /dev/null
+++ b/adventure-editor/assets-raw/editor/title.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="207.11"
+   height="53.66"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="title.svg"
+   inkscape:export-filename="images/title.png"
+   inkscape:export-xdpi="108.63792"
+   inkscape:export-ydpi="108.63792"
+   viewBox="0 0 207.11 53.66">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#51c577"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="36.626108"
+     inkscape:cy="-71.40974"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     borderlayer="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1442"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.12300014;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="rect2989"
+       width="430.71429"
+       height="300"
+       x="-141.42857"
+       y="-139.91142"
+       rx="5.2145171"
+       ry="7.74085" />
+  </g>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0.66431808,-999.6792)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none"
+       x="42.680729"
+       y="1026.0645"
+       id="text810"><tspan
+         sodipodi:role="line"
+         id="tspan812"
+         x="42.680729"
+         y="1026.0645"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:100%;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';text-align:start;text-anchor:start">Adventure</tspan><tspan
+         sodipodi:role="line"
+         x="42.680729"
+         y="1047.7382"
+         id="tspan814"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:100%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';text-align:start;text-anchor:start">EDITOR</tspan></text>
+    <path
+       style="fill:#ffffff"
+       d="m 24.96836,1051.628 c -0.282985,0 -0.522463,-0.1464 -0.721591,-0.2267 -0.374987,-0.3379 -0.153711,-0.1662 0.249091,-0.3194 -0.22906,0.039 0.05321,0.022 0.29488,-0.1334 0.08414,0 0.248295,-0.041 0.364811,-0.091 0.116512,-0.05 0.25066,-0.1005 0.298112,-0.1116 0.04745,-0.011 0.261073,-0.087 0.474721,-0.1677 0.213644,-0.081 0.488334,-0.1843 0.610414,-0.2295 0.208491,-0.077 0.58733,-0.2702 1.021905,-0.5209 0.18785,-0.1084 0.295669,-0.1879 0.517306,-0.3811 0.06314,-0.055 0.140117,-0.1002 0.171052,-0.1002 0.03094,0 0.04264,-0.014 0.02602,-0.031 -0.01664,-0.017 0.0666,-0.135 0.184975,-0.2621 0.118369,-0.127 0.214389,-0.2611 0.213371,-0.2979 -0.0055,-0.2004 -0.395497,-0.4641 -1.773913,-1.1995 -0.350992,-0.1872 -0.687422,-0.3759 -0.747625,-0.4193 -0.0602,-0.044 -0.151765,-0.079 -0.203472,-0.079 -0.05171,0 -0.102339,-0.021 -0.112511,-0.045 -2.070039,-0.9916 -3.395082,-1.6949 -5.405571,-2.5308 -0.02141,0 -0.157863,-0.075 -0.303238,-0.1677 -0.376758,-0.2151 -0.578571,-0.2624 -0.913298,-0.5325 -0.03052,-0.025 -0.150658,-0.1205 -0.266968,-0.2126 -0.467542,-0.3704 -0.63933,-0.7331 -0.576385,-1.217 0.01791,-0.1377 0.342048,-0.8781 0.786859,-1.7973 0.416024,-0.8597 0.752866,-1.5804 0.748539,-1.6014 -0.0043,-0.021 0.0152,-0.054 0.04341,-0.073 0.09794,-0.067 1.011814,-2.0215 0.975646,-2.0867 -0.02001,-0.036 -0.01615,-0.046 0.0086,-0.024 0.04489,0.042 0.539351,-0.8937 0.543882,-1.0291 0.0015,-0.039 0.02737,-0.071 0.05789,-0.071 0.03052,0 0.04116,-0.015 0.02365,-0.033 -0.04012,-0.041 -0.375108,0.134 -0.375108,0.1964 0,0.026 -0.03492,0.046 -0.0776,0.046 -1.767277,0.7112 -3.753698,1.8065 -5.309941,2.5356 -0.414656,0.1949 -0.816965,0.4101 -0.89402,0.4783 -0.08266,0.073 -0.202373,0.3057 -0.291975,0.567 -0.08354,0.2435 -0.198566,0.504 -0.255633,0.5789 -0.05707,0.074 -0.09164,0.1485 -0.07683,0.1637 0.01483,0.015 -0.245429,0.5789 -0.578319,1.2524 -0.812599,1.644 -0.858709,1.733 -0.922805,1.7815 -0.03052,0.023 -0.03289,0.043 -0.0053,0.043 0.02763,0 0.01384,0.046 -0.03063,0.101 -0.04446,0.055 -0.151155,0.2546 -0.237093,0.4434 -0.08594,0.1889 -0.220276,0.4315 -0.298528,0.5392 -0.07825,0.1076 -0.106529,0.1735 -0.06284,0.1464 0.06809,-0.042 0.06848,-0.036 0.0026,0.048 -0.841707,1.6961 -1.899721,3.2744 -2.6225976,5.0012 -0.218085,0.4009 -0.348209,0.7779 -0.541335,1.2752 h 0.260756 c 0.8780356,0.1076 -0.140681,0.2154 -0.432899,0.2483 -1.05987,0.1179 -5.123415,0.038 -5.260809,-0.1042 -0.139263,-0.1437 0.53987,-0.208 2.333447,-0.2211 0.724799,-0.01 1.317874,-0.012 1.317946,-0.016 5.8e-5,0 -0.152129,-0.1292 -0.338232,-0.28 -0.1861,-0.1508 -0.392115,-0.3291 -0.457813,-0.3961 -0.0657,-0.067 -0.198127,-0.1729 -0.294294,-0.2351 -0.09617,-0.062 -0.333395,-0.2488 -0.527178,-0.4148 -0.193783,-0.1661 -0.384473,-0.3289 -0.423756,-0.3619 -0.03928,-0.033 -0.226572,-0.1906 -0.416193,-0.3501 -0.400096,-0.3366 -0.784733,-0.7511 -0.900879,-0.971 -0.07619,-0.1442 -0.07354,-0.1563 0.04324,-0.1969 0.199618,-0.069 0.435494,-0.01 1.176981,0.3128 0.121095,0.052 0.233468,0.097 0.249715,0.1 0.03696,0.01 0.201338,0.072 0.417992,0.1656 0.09156,0.039 0.291335,0.1188 0.44394,0.1755 0.152606,0.057 0.302436,0.1206 0.332957,0.1424 0.06756,0.048 0.372647,0.1348 0.429452,0.1221 0.02256,-0.01 0.134928,0.028 0.249718,0.073 0.380449,0.1501 1.007771,0.2049 1.555852,0.1361 0.485356,-0.3835 0.827668,-0.9888 1.039037,-1.4777 0.05524,-0.063 0.07784,-0.1148 0.05022,-0.1153 -0.02763,0 -0.02244,-0.02 0.01151,-0.043 0.3257786,-0.65 0.6820606,-1.3717 0.9618996,-1.9877 0.345945,-0.7467 0.51962,-1.1442 0.535094,-1.2245 0.0085,-0.045 0.0483,-0.1017 0.08848,-0.1279 0.04018,-0.027 0.05382,-0.048 0.03031,-0.048 -0.02351,0 0.0049,-0.097 0.06318,-0.2155 0.05826,-0.118 0.137636,-0.3241 0.176389,-0.4578 0.03875,-0.1338 0.08732,-0.2432 0.10792,-0.2432 0.02059,0 0.03777,-0.032 0.03815,-0.071 2.9e-4,-0.039 0.119544,-0.3806 0.264812,-0.7582 0.299433,-0.7785 0.595272,-1.5682 0.761049,-2.0316 0.06194,-0.173 0.133818,-0.3662 0.159731,-0.4291 0.0259,-0.063 0.100648,-0.2561 0.166085,-0.4291 0.06544,-0.1732 0.168007,-0.4307 0.227931,-0.5723 0.05993,-0.1417 0.112456,-0.2833 0.116736,-0.3149 0.0043,-0.031 0.02826,-0.083 0.05329,-0.1144 0.952922,-1.4376 2.637354,-2.423 3.808719,-3.4959 0.02573,0.016 0.194288,-0.1045 0.374573,-0.2684 0.180286,-0.1641 0.352766,-0.3179 0.383288,-0.3419 0.160225,-0.1256 0.838135,-0.6858 1.193828,-0.9866 0.223373,-0.1888 0.533088,-0.4437 0.688254,-0.5664 0.15517,-0.1227 0.294612,-0.2399 0.309872,-0.2603 0.01526,-0.021 0.190049,-0.1645 0.388421,-0.3204 0.198373,-0.1559 0.40157,-0.3256 0.451552,-0.3772 0.422696,-0.4779 1.082718,-0.8486 1.906911,-1.5561 0.06104,-0.059 0.166956,-0.1463 0.235364,-0.1937 0.06841,-0.047 0.110254,-0.1097 0.09299,-0.1385 -0.01728,-0.029 -0.0076,-0.045 0.02154,-0.037 0.08301,0.025 0.406232,-0.2411 0.368927,-0.3034 0.182585,-0.095 0.351145,-0.2502 0.552761,-0.4237 0.109443,-0.1097 0.198987,-0.1851 0.198987,-0.1677 0,0.018 0.03218,0 0.07151,-0.044 0.09147,-0.097 0.297516,-0.5961 0.338109,-0.8196 0.01717,-0.094 0.0685,-0.3258 0.11408,-0.5144 0.148766,-0.6151 0.245195,-1.6912 0.27953,-3.1193 0.01854,-0.7711 0.04658,-1.5307 0.06229,-1.6881 l 0.02858,-0.2862 -0.368182,0.4006 c -0.346198,0.3767 -0.562398,0.692 -0.538009,0.7848 0.0059,0.022 -0.02449,0.027 -0.06757,0.01 -0.135795,0.034 -0.174159,0.1415 -0.247742,0.2642 -0.01831,0.015 -0.07077,0.079 -0.116549,0.1396 -0.06565,0.088 -0.06677,0.101 -0.0053,0.063 0.0529,-0.033 0.06522,-0.027 0.03835,0.018 -0.02177,0.037 -0.06533,0.066 -0.0968,0.066 -0.07601,0 -0.379739,0.2979 -0.351606,0.3447 0.01211,0.021 -0.01324,0.037 -0.05633,0.037 -0.04309,0 -0.06268,-0.028 -0.04352,-0.063 0.01919,-0.034 -0.01315,-0.02 -0.0718,0.031 -0.05865,0.051 -0.168861,0.113 -0.244899,0.1369 -0.07604,0.024 -0.28829,0.1147 -0.471685,0.2014 -0.183392,0.087 -0.695529,0.3166 -1.138081,0.5107 -0.442552,0.1941 -0.941986,0.4137 -1.109851,0.488 -0.167865,0.075 -0.441188,0.1901 -0.607387,0.2573 -0.166198,0.067 -0.653145,0.2834 -1.082104,0.4808 -0.428959,0.1974 -0.885376,0.4053 -1.014258,0.4622 -0.128882,0.057 -0.220668,0.1262 -0.203971,0.154 0.0167,0.028 0.0098,0.047 -0.01537,0.043 -0.129113,-0.023 -0.191799,0.024 -0.291441,0.2199 -0.155299,0.3051 -0.50666,0.6599 -0.893302,0.9021 -0.192376,0.1206 -0.317142,0.2345 -0.295807,0.2701 0.02077,0.034 0.0111,0.045 -0.02212,0.024 -0.03246,-0.021 -0.19239,0 -0.355402,0.041 -0.261508,0.07 -0.302193,0.069 -0.345766,-0.01 -0.03067,-0.055 -0.02524,-0.1279 0.01433,-0.1932 0.07645,-0.1263 0.05839,-0.1288 -0.181217,-0.026 -0.214799,0.092 -0.281877,0.063 -0.362777,-0.1557 -0.03721,-0.1009 -0.03849,-0.1464 -0.0035,-0.1242 0.03043,0.02 0.05532,0.01 0.05532,-0.021 0,-0.031 -0.05618,-0.064 -0.124856,-0.075 -0.163238,-0.024 -0.211126,-0.3094 -0.05872,-0.3501 0.09203,-0.025 0.0923,-0.028 0.0033,-0.034 -0.06984,-0.01 -0.09711,-0.056 -0.09711,-0.181 0,-0.137 0.03363,-0.1893 0.156539,-0.2432 0.0861,-0.038 0.238444,-0.1653 0.338546,-0.2832 0.100104,-0.1179 0.200882,-0.2023 0.22395,-0.1877 0.02307,0.014 0.214086,-0.026 0.424477,-0.089 0.243075,-0.074 0.514027,-0.112 0.743232,-0.1048 0.732525,0.022 0.801799,0.013 1.220836,-0.1873 0.228907,-0.1089 0.57851,-0.2691 0.776897,-0.356 1.052137,-0.4607 1.418839,-0.6341 1.454353,-0.6881 0.0216,-0.033 0.0718,-0.06 0.11153,-0.061 0.153531,0 0.870695,-0.3346 0.837723,-0.3897 -0.01901,-0.032 -0.0076,-0.04 0.02532,-0.02 0.535739,-0.1846 0.888631,-0.3613 1.390031,-0.5888 0.713838,-0.2901 0.989223,-0.4542 1.129587,-0.6729 0.07699,-0.1201 0.146499,-0.2439 0.154472,-0.2754 0.008,-0.031 0.05877,-0.1216 0.112885,-0.2003 0.445204,-0.8138 0.871915,-1.5229 1.280636,-2.2874 0.682152,-1.239 0.777595,-1.4758 0.884724,-2.1955 0.129987,-0.8732 0.18616,-1.1416 0.37128,-1.7743 l 0.148097,-0.5061 -0.224997,-0.2092 c -0.737422,-0.6856 -0.918005,-0.8086 -1.219339,-0.8301 -0.06576,-0.01 -0.107983,-0.028 -0.09384,-0.051 0.04528,-0.076 -0.387599,-0.045 -0.674483,0.048 -0.382177,0.1234 -0.572735,0.1528 -0.729439,0.1123 -0.147238,-0.038 -0.500736,-0.3967 -0.550525,-0.5585 -0.01736,-0.056 -0.05488,-0.1026 -0.08335,-0.1026 -0.02847,0 -0.05175,-0.046 -0.05175,-0.1022 0,-0.056 -0.07641,-0.1486 -0.169787,-0.2054 -0.211008,-0.1286 -0.290375,-0.3336 -0.245484,-0.6341 0.03406,-0.2279 0.213896,-1.2697 0.277023,-1.6049 0.140703,-0.7467 0.152724,-0.8858 0.08393,-0.9713 -0.03864,-0.048 -0.09323,-0.087 -0.121295,-0.087 -0.02807,0 -0.08121,-0.026 -0.118063,-0.057 -0.03687,-0.032 -0.124443,-0.1024 -0.194619,-0.1575 -0.07018,-0.056 -0.151701,-0.2031 -0.181156,-0.3289 -0.11315,-0.4837 -0.146601,-0.7117 -0.100035,-0.682 0.02645,0.017 0.04808,0 0.04808,-0.029 0,-0.1081 0.3585,-0.5644 0.471689,-0.6005 0.266651,-0.085 1.371627,-0.2052 1.884742,-0.2052 0.571845,0 0.716905,0.045 0.903893,0.2835 0.06022,0.077 0.06522,0.073 0.03743,-0.026 -0.03208,-0.1145 -0.03208,-0.1145 0.03721,0 0.03811,0.063 0.119633,0.1515 0.181171,0.1968 0.144625,0.1064 0.246801,0.2178 0.451586,0.492 0.09156,0.1227 0.214135,0.2731 0.272382,0.3342 0.100709,0.1055 0.102726,0.1519 0.04107,0.946 -0.07894,1.0166 -0.07858,1.6661 0.0011,2.0081 0.03298,0.1416 0.06311,0.3991 0.06695,0.5723 0.0064,0.29 0.02552,0.3338 0.243142,0.5579 0.129892,0.1338 0.249377,0.2432 0.265523,0.2432 0.753037,0.7563 1.983813,1.624 2.356991,2.5056 0.252945,0.4735 0.533646,1.0375 0.691644,1.5147 0.06648,0.2127 0.131411,0.3762 0.144281,0.3635 0.01286,-0.012 0.03013,0.1572 0.03835,0.3775 0.0082,0.2203 0.03698,0.4431 0.0639,0.495 0.115052,0.2216 0.604035,0.8019 0.644194,0.7645 0.02414,-0.022 0.02685,-0.01 0.006,0.028 -0.02097,0.038 0.04305,0.1653 0.143615,0.286 0.572218,0.5542 0.434023,0.5612 0.884614,0.9561 0.03999,-0.026 0.04808,-0.015 0.02191,0.029 -0.02619,0.044 0.139107,0.2582 0.449238,0.5829 0.269864,0.2827 0.50831,0.5581 0.529881,0.6121 0.05103,0.1278 0.247491,1.1066 0.599819,2.9882 0.156179,0.834 0.372878,1.9284 0.481551,2.432 0.108672,0.5036 0.209689,0.973 0.224479,1.0429 0.02772,0.1311 0.104751,0.2235 0.514236,0.6166 0.131143,0.1259 0.28573,0.3319 0.343527,0.4578 0.05779,0.1259 0.157771,0.319 0.222165,0.4292 0.09458,0.1618 0.118094,0.2993 0.122369,0.7153 0.0051,0.4995 0.0015,0.5149 -0.119569,0.5082 -0.111156,-0.01 -0.124859,0.02 -0.124859,0.2392 0,0.2847 -0.194903,0.6485 -0.349478,0.6522 -0.145997,0 -0.357459,-0.258 -0.575031,-0.7113 -0.228625,-0.4763 -0.21841,-0.464 -0.315698,-0.3807 -0.10348,0.089 -0.238836,0.029 -0.282704,-0.1256 -0.01956,-0.068 -0.05067,-0.3768 -0.06915,-0.6847 -0.0272,-0.4537 -0.01401,-0.6267 0.06935,-0.9107 l 0.102942,-0.3506 -0.147895,-0.7501 c -0.08134,-0.4126 -0.299534,-1.3935 -0.48487,-2.1796 -0.185335,-0.7861 -0.391118,-1.661 -0.457291,-1.9443 -0.06617,-0.2833 -0.140494,-0.5237 -0.16516,-0.5343 -0.02466,-0.01 -0.0338,-0.037 -0.0203,-0.06 0.04829,-0.081 -0.185471,-1.0059 -0.270273,-1.0697 -0.0476,-0.036 -0.0871,-0.088 -0.08779,-0.1162 -5.78e-4,-0.028 -0.139627,-0.2055 -0.308738,-0.3943 -0.169112,-0.1889 -0.376484,-0.4206 -0.460828,-0.5151 -0.345119,-0.3863 -0.794293,-0.7721 -0.856293,-0.7356 -0.03597,0.021 -0.04732,0.018 -0.0252,-0.01 0.03744,-0.043 -0.273855,-0.3703 -0.353818,-0.3722 -0.05126,0 -0.08957,0.4221 -0.214761,2.3739 -0.14855,2.316 -0.246239,3.2858 -0.466889,4.6351 -0.108021,0.6607 -0.426819,1.8494 -0.588553,2.1947 -0.05968,0.1274 -0.115955,0.2819 -0.125058,0.3434 -0.0091,0.062 -0.04364,0.1465 -0.07675,0.189 -0.193428,0.7649 -0.548695,0.9109 -0.818442,1.6004 0.02503,0.042 0.01719,0.053 -0.02033,0.029 -0.03671,-0.023 -0.178784,0.1502 -0.355402,0.4344 -0.161838,0.2604 -0.375212,0.5894 -0.474164,0.7311 -0.09895,0.1417 -0.270669,0.3993 -0.381591,0.5724 -0.110925,0.1732 -0.360839,0.5392 -0.555363,0.8135 -0.194528,0.2742 -0.353684,0.5268 -0.353684,0.5613 0,0.034 -0.02094,0.049 -0.04654,0.033 -0.02561,-0.016 -0.09943,0.066 -0.164082,0.1827 -0.06465,0.1167 -0.205234,0.3126 -0.312415,0.4352 -0.107182,0.1226 -0.179173,0.2514 -0.159978,0.2861 0.0192,0.035 0.01474,0.044 -0.0099,0.02 -0.02463,-0.022 -0.172215,0.1338 -0.327978,0.3482 -0.440047,0.6058 -1.218889,1.5922 -1.746245,2.2117 -0.08043,0.095 -0.344617,0.4098 -0.587076,0.7009 -0.242457,0.2911 -0.460959,0.5293 -0.485559,0.5293 -0.0246,0 -0.04472,0.029 -0.04472,0.064 0,0.036 -0.05627,0.1194 -0.125035,0.1859 -0.06876,0.066 -0.196166,0.2111 -0.283103,0.3213 -0.08694,0.1101 -0.139185,0.1641 -0.116108,0.12 0.02777,-0.053 0.0203,-0.067 -0.02212,-0.039 -0.03524,0.022 -0.06407,0.072 -0.06407,0.1111 0,0.039 -0.236464,0.3269 -0.525477,0.6404 -0.289013,0.3135 -0.526244,0.6004 -0.527179,0.6375 -8.29e-4,0.038 -0.08024,0.1308 -0.176219,0.2082 l -0.174514,0.1409 0.188388,0.041 c 0.319285,0.07 0.852109,0.271 0.89507,0.3375 0.02241,0.035 0.04115,0.04 0.04162,0.013 5.77e-4,-0.027 0.03575,-0.021 0.07843,0.016 0.04267,0.037 0.124824,0.075 0.182573,0.087 0.05775,0.012 0.236784,0.1011 0.397861,0.199 0.161076,0.098 0.278101,0.1534 0.260054,0.1233 -0.04043,-0.068 0.483671,0.2266 0.530946,0.2979 0.01866,0.028 0.05056,0.047 0.07085,0.043 2.093964,0.9231 3.377822,2.0524 5.222486,3.0043 0.122084,0.063 0.234453,0.1291 0.249714,0.1486 0.01526,0.02 0.157284,0.1051 0.315609,0.1901 0.158321,0.085 0.317451,0.1913 0.353622,0.2362 0.03616,0.045 0.09711,0.081 0.135412,0.081 0.03831,0 0.100507,0.038 0.138225,0.085 0.03772,0.046 0.0881,0.072 0.111963,0.057 0.02388,-0.015 0.05832,0.013 0.07656,0.062 0.01825,0.049 0.05662,0.074 0.08527,0.056 0.06129,-0.039 0.9008,0.8235 0.862957,0.8865 -0.01416,0.024 0.0054,0.056 0.04329,0.072 0.03798,0.015 0.117754,0.1277 0.177283,0.2491 0.05953,0.1215 0.144558,0.266 0.188953,0.3211 0.0444,0.055 0.06265,0.1001 0.04059,0.1001 -0.02207,0 0.0065,0.071 0.06347,0.1574 0.283405,0.4305 0.305848,0.6998 0.07259,0.8711 -0.17946,0.1318 -0.631355,0.305 -0.959394,0.3676 -0.114453,0.021 -0.208095,0.069 -0.208095,0.1039 0,0.035 0.01644,0.047 0.03651,0.026 0.02007,-0.021 0.07144,-0.01 0.114118,0.029 0.04268,0.037 0.07324,0.043 0.0679,0.014 -0.02423,-0.1314 0.01021,-0.1512 0.08563,-0.049 0.06628,0.09 0.09178,0.096 0.131792,0.033 0.02957,-0.046 0.06318,-0.055 0.08321,-0.021 0.01849,0.031 0.142207,0.058 0.274961,0.061 0.266568,0.01 0.537703,0.093 0.537703,0.1728 0,0.1921 -0.365848,0.2418 -1.927591,0.2619 -0.670667,0.01 -1.24626,0.033 -1.279095,0.054 -0.03284,0.021 -0.07614,0.011 -0.09622,-0.022 -0.02519,-0.042 -0.06216,-0.039 -0.11905,0.01 -0.04917,0.042 -0.09764,0.049 -0.119919,0.017 -0.839669,0.069 -1.411788,-0.041 -2.273703,-0.089 z"
+       id="path3004"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccscscscccccsccccccscccccscsccccccsccccccccccccccccccccccccccccccccccccccsscsccsccccsccscscccccccsccssscsccccccscsccccsccsccccsccccccccscccscsccscccccccccccsscccccccssccscsccscscsscccscscscccccsscccccscsscsccscscscccccsssccccsccccsscccccccccscccccccsssccccscccccccccscccccscscccccccsscccsccccsccssccccc" />
+    <text
+       id="text4172"
+       y="1088.2295"
+       x="43.610382"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46589661px;line-height:100%;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';text-align:start;text-anchor:start"
+         y="1088.2295"
+         x="43.610382"
+         id="tspan4168"
+         sodipodi:role="line">Adventure</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.15907669px;line-height:100%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';text-align:start;text-anchor:start"
+         id="tspan4170"
+         y="1116.5444"
+         x="43.610382"
+         sodipodi:role="line">COMPOSER</tspan></text>
+    <path
+       sodipodi:nodetypes="ccccccscscscccccsccccccscccccscsccccccsccccccccccccccccccccccccccccccccccccccsscsccsccccsccscscccccccsccssscsccccccscsccccsccsccccsccccccccscccscsccscccccccccccsscccccccssccscsccscscsscccscscscccccsscccccscsscsccscscscccccsssccccsccccsscccccccccscccccccsssccccscccccccccscccccscscccccccsscccsccccsccssccccc"
+       inkscape:connector-curvature="0"
+       id="path4174"
+       d="m 25.898014,1117.793 c -0.282985,0 -0.522463,-0.1464 -0.721591,-0.2267 -0.374987,-0.3379 -0.153711,-0.1662 0.249091,-0.3194 -0.22906,0.039 0.05321,0.022 0.29488,-0.1334 0.08414,0 0.248295,-0.041 0.364811,-0.091 0.116512,-0.05 0.25066,-0.1005 0.298112,-0.1116 0.04745,-0.011 0.261073,-0.087 0.474721,-0.1677 0.213644,-0.081 0.488334,-0.1843 0.610414,-0.2295 0.208491,-0.077 0.58733,-0.2702 1.021905,-0.5209 0.18785,-0.1084 0.295669,-0.1879 0.517306,-0.3811 0.06314,-0.055 0.140117,-0.1002 0.171052,-0.1002 0.03094,0 0.04264,-0.014 0.02602,-0.031 -0.01664,-0.017 0.0666,-0.135 0.184975,-0.2621 0.118369,-0.127 0.214389,-0.2611 0.213371,-0.2979 -0.0055,-0.2004 -0.395497,-0.4641 -1.773913,-1.1995 -0.350992,-0.1872 -0.687422,-0.3759 -0.747625,-0.4193 -0.0602,-0.044 -0.151765,-0.079 -0.203472,-0.079 -0.05171,0 -0.102339,-0.021 -0.112511,-0.045 -2.070039,-0.9916 -3.395082,-1.6949 -5.405571,-2.5308 -0.02141,0 -0.157863,-0.075 -0.303238,-0.1677 -0.376758,-0.2151 -0.578571,-0.2624 -0.913298,-0.5325 -0.03052,-0.025 -0.150658,-0.1205 -0.266968,-0.2126 -0.467542,-0.3704 -0.63933,-0.7331 -0.576385,-1.217 0.01791,-0.1377 0.342048,-0.8781 0.786859,-1.7973 0.416024,-0.8597 0.752866,-1.5804 0.748539,-1.6014 -0.0043,-0.021 0.0152,-0.054 0.04341,-0.073 0.09794,-0.067 1.011814,-2.0215 0.975646,-2.0867 -0.02001,-0.036 -0.01615,-0.046 0.0086,-0.024 0.04489,0.042 0.539351,-0.8937 0.543882,-1.0291 0.0015,-0.039 0.02737,-0.071 0.05789,-0.071 0.03052,0 0.04116,-0.015 0.02365,-0.033 -0.04012,-0.041 -0.375108,0.134 -0.375108,0.1964 0,0.026 -0.03492,0.046 -0.0776,0.046 -1.767277,0.7112 -3.753698,1.8065 -5.309941,2.5356 -0.414656,0.1949 -0.816965,0.4101 -0.89402,0.4783 -0.08266,0.073 -0.202373,0.3057 -0.291975,0.567 -0.08354,0.2435 -0.198566,0.504 -0.255633,0.5789 -0.05707,0.074 -0.09164,0.1485 -0.07683,0.1637 0.01483,0.015 -0.245429,0.5789 -0.578319,1.2524 -0.812599,1.644 -0.858709,1.733 -0.922805,1.7815 -0.03052,0.023 -0.03289,0.043 -0.0053,0.043 0.02763,0 0.01384,0.046 -0.03063,0.101 -0.04446,0.055 -0.151155,0.2546 -0.237093,0.4434 -0.08594,0.1889 -0.220276,0.4315 -0.298528,0.5392 -0.07825,0.1076 -0.106529,0.1735 -0.06284,0.1464 0.06809,-0.042 0.06848,-0.036 0.0026,0.048 -0.841707,1.6961 -1.899721,3.2744 -2.622598,5.0012 -0.218085,0.4009 -0.348209,0.7779 -0.5413351,1.2752 h 0.2607561 c 0.878036,0.1076 -0.140681,0.2154 -0.4328991,0.2483 -1.05987,0.1179 -5.123415,0.038 -5.260809,-0.1042 -0.139263,-0.1437 0.53987,-0.208 2.333447,-0.2211 0.724799,-0.01 1.317874,-0.012 1.317946,-0.016 5.8e-5,0 -0.152129,-0.1292 -0.338232,-0.28 -0.1861,-0.1508 -0.392115,-0.3291 -0.457813,-0.3961 -0.0657,-0.067 -0.198127,-0.1729 -0.294294,-0.2351 -0.09617,-0.062 -0.333395,-0.2488 -0.527178,-0.4148 -0.193783,-0.1661 -0.384473,-0.3289 -0.423756,-0.3619 -0.03928,-0.033 -0.226572,-0.1906 -0.416193,-0.3501 -0.400096,-0.3366 -0.784733,-0.7511 -0.900879,-0.971 -0.07619,-0.1442 -0.07354,-0.1563 0.04324,-0.1969 0.199618,-0.069 0.435494,-0.01 1.176981,0.3128 0.121095,0.052 0.233468,0.097 0.249715,0.1 0.03696,0.01 0.201338,0.072 0.417992,0.1656 0.09156,0.039 0.291335,0.1188 0.44394,0.1755 0.152606,0.057 0.302436,0.1206 0.332957,0.1424 0.06756,0.048 0.372647,0.1348 0.429452,0.1221 0.02256,-0.01 0.134928,0.028 0.249718,0.073 0.380449,0.1501 1.007771,0.2049 1.555852,0.1361 0.4853561,-0.3835 0.8276681,-0.9888 1.0390371,-1.4777 0.05524,-0.063 0.07784,-0.1148 0.05022,-0.1153 -0.02763,0 -0.02244,-0.02 0.01151,-0.043 0.325779,-0.65 0.682061,-1.3717 0.9619,-1.9877 0.345945,-0.7467 0.51962,-1.1442 0.535094,-1.2245 0.0085,-0.045 0.0483,-0.1017 0.08848,-0.1279 0.04018,-0.027 0.05382,-0.048 0.03031,-0.048 -0.02351,0 0.0049,-0.097 0.06318,-0.2155 0.05826,-0.118 0.137636,-0.3241 0.176389,-0.4578 0.03875,-0.1338 0.08732,-0.2432 0.10792,-0.2432 0.02059,0 0.03777,-0.032 0.03815,-0.071 2.9e-4,-0.039 0.119544,-0.3806 0.264812,-0.7582 0.299433,-0.7785 0.595272,-1.5682 0.761049,-2.0316 0.06194,-0.173 0.133818,-0.3662 0.159731,-0.4291 0.0259,-0.063 0.100648,-0.2561 0.166085,-0.4291 0.06544,-0.1732 0.168007,-0.4307 0.227931,-0.5723 0.05993,-0.1417 0.112456,-0.2833 0.116736,-0.3149 0.0043,-0.031 0.02826,-0.083 0.05329,-0.1144 0.952922,-1.4376 2.637354,-2.423 3.808719,-3.4959 0.02573,0.016 0.194288,-0.1045 0.374573,-0.2684 0.180286,-0.1641 0.352766,-0.3179 0.383288,-0.3419 0.160225,-0.1256 0.838135,-0.6858 1.193828,-0.9866 0.223373,-0.1888 0.533088,-0.4437 0.688254,-0.5664 0.15517,-0.1227 0.294612,-0.2399 0.309872,-0.2603 0.01526,-0.021 0.190049,-0.1645 0.388421,-0.3204 0.198373,-0.1559 0.40157,-0.3256 0.451552,-0.3772 0.422696,-0.4779 1.082718,-0.8486 1.906911,-1.5561 0.06104,-0.059 0.166956,-0.1463 0.235364,-0.1937 0.06841,-0.047 0.110254,-0.1097 0.09299,-0.1385 -0.01728,-0.029 -0.0076,-0.045 0.02154,-0.037 0.08301,0.025 0.406232,-0.2411 0.368927,-0.3034 0.182585,-0.095 0.351145,-0.2502 0.552761,-0.4237 0.109443,-0.1097 0.198987,-0.1851 0.198987,-0.1677 0,0.018 0.03218,0 0.07151,-0.044 0.09147,-0.097 0.297516,-0.5961 0.338109,-0.8196 0.01717,-0.094 0.0685,-0.3258 0.11408,-0.5144 0.148766,-0.6151 0.245195,-1.6912 0.27953,-3.1193 0.01854,-0.7711 0.04658,-1.5307 0.06229,-1.6881 l 0.02858,-0.2862 -0.368182,0.4006 c -0.346198,0.3767 -0.562398,0.692 -0.538009,0.7848 0.0059,0.022 -0.02449,0.027 -0.06757,0.01 -0.135795,0.034 -0.174159,0.1415 -0.247742,0.2642 -0.01831,0.015 -0.07077,0.079 -0.116549,0.1396 -0.06565,0.088 -0.06677,0.101 -0.0053,0.063 0.0529,-0.033 0.06522,-0.027 0.03835,0.018 -0.02177,0.037 -0.06533,0.066 -0.0968,0.066 -0.07601,0 -0.379739,0.2979 -0.351606,0.3447 0.01211,0.021 -0.01324,0.037 -0.05633,0.037 -0.04309,0 -0.06268,-0.028 -0.04352,-0.063 0.01919,-0.034 -0.01315,-0.02 -0.0718,0.031 -0.05865,0.051 -0.168861,0.113 -0.244899,0.1369 -0.07604,0.024 -0.28829,0.1147 -0.471685,0.2014 -0.183392,0.087 -0.695529,0.3166 -1.138081,0.5107 -0.442552,0.1941 -0.941986,0.4137 -1.109851,0.488 -0.167865,0.075 -0.441188,0.1901 -0.607387,0.2573 -0.166198,0.067 -0.653145,0.2834 -1.082104,0.4808 -0.428959,0.1974 -0.885376,0.4053 -1.014258,0.4622 -0.128882,0.057 -0.220668,0.1262 -0.203971,0.154 0.0167,0.028 0.0098,0.047 -0.01537,0.043 -0.129113,-0.023 -0.191799,0.024 -0.291441,0.2199 -0.155299,0.3051 -0.50666,0.6599 -0.893302,0.9021 -0.192376,0.1206 -0.317142,0.2345 -0.295807,0.2701 0.02077,0.034 0.0111,0.045 -0.02212,0.024 -0.03246,-0.021 -0.19239,0 -0.355402,0.041 -0.261508,0.07 -0.302193,0.069 -0.345766,-0.01 -0.03067,-0.055 -0.02524,-0.1279 0.01433,-0.1932 0.07645,-0.1263 0.05839,-0.1288 -0.181217,-0.026 -0.214799,0.092 -0.281877,0.063 -0.362777,-0.1557 -0.03721,-0.1009 -0.03849,-0.1464 -0.0035,-0.1242 0.03043,0.02 0.05532,0.01 0.05532,-0.021 0,-0.031 -0.05618,-0.064 -0.124856,-0.075 -0.163238,-0.024 -0.211126,-0.3094 -0.05872,-0.3501 0.09203,-0.025 0.0923,-0.028 0.0033,-0.034 -0.06984,-0.01 -0.09711,-0.056 -0.09711,-0.181 0,-0.137 0.03363,-0.1893 0.156539,-0.2432 0.0861,-0.038 0.238444,-0.1653 0.338546,-0.2832 0.100104,-0.1179 0.200882,-0.2023 0.22395,-0.1877 0.02307,0.014 0.214086,-0.026 0.424477,-0.089 0.243075,-0.074 0.514027,-0.112 0.743232,-0.1048 0.732525,0.022 0.801799,0.013 1.220836,-0.1873 0.228907,-0.1089 0.57851,-0.2691 0.776897,-0.356 1.052137,-0.4607 1.418839,-0.6341 1.454353,-0.6881 0.0216,-0.033 0.0718,-0.06 0.11153,-0.061 0.153531,0 0.870695,-0.3346 0.837723,-0.3897 -0.01901,-0.032 -0.0076,-0.04 0.02532,-0.02 0.535739,-0.1846 0.888631,-0.3613 1.390031,-0.5888 0.713838,-0.2901 0.989223,-0.4542 1.129587,-0.6729 0.07699,-0.1201 0.146499,-0.2439 0.154472,-0.2754 0.008,-0.031 0.05877,-0.1216 0.112885,-0.2003 0.445204,-0.8138 0.871915,-1.5229 1.280636,-2.2874 0.682152,-1.239 0.777595,-1.4758 0.884724,-2.1955 0.129987,-0.8732 0.18616,-1.1416 0.37128,-1.7743 l 0.148097,-0.5061 -0.224997,-0.2092 c -0.737422,-0.6856 -0.918005,-0.8086 -1.219339,-0.8301 -0.06576,-0.01 -0.107983,-0.028 -0.09384,-0.051 0.04528,-0.076 -0.387599,-0.045 -0.674483,0.048 -0.382177,0.1234 -0.572735,0.1528 -0.729439,0.1123 -0.147238,-0.038 -0.500736,-0.3967 -0.550525,-0.5585 -0.01736,-0.056 -0.05488,-0.1026 -0.08335,-0.1026 -0.02847,0 -0.05175,-0.046 -0.05175,-0.1022 0,-0.056 -0.07641,-0.1486 -0.169787,-0.2054 -0.211008,-0.1286 -0.290375,-0.3336 -0.245484,-0.6341 0.03406,-0.2279 0.213896,-1.2697 0.277023,-1.6049 0.140703,-0.7467 0.152724,-0.8858 0.08393,-0.9713 -0.03864,-0.048 -0.09323,-0.087 -0.121295,-0.087 -0.02807,0 -0.08121,-0.026 -0.118063,-0.057 -0.03687,-0.032 -0.124443,-0.1024 -0.194619,-0.1575 -0.07018,-0.056 -0.151701,-0.2031 -0.181156,-0.3289 -0.11315,-0.4837 -0.146601,-0.7117 -0.100035,-0.682 0.02645,0.017 0.04808,0 0.04808,-0.029 0,-0.1081 0.3585,-0.5644 0.471689,-0.6005 0.266651,-0.085 1.371627,-0.2052 1.884742,-0.2052 0.571845,0 0.716905,0.045 0.903893,0.2835 0.06022,0.077 0.06522,0.073 0.03743,-0.026 -0.03208,-0.1145 -0.03208,-0.1145 0.03721,0 0.03811,0.063 0.119633,0.1515 0.181171,0.1968 0.144625,0.1064 0.246801,0.2178 0.451586,0.492 0.09156,0.1227 0.214135,0.2731 0.272382,0.3342 0.100709,0.1055 0.102726,0.1519 0.04107,0.946 -0.07894,1.0166 -0.07858,1.6661 0.0011,2.0081 0.03298,0.1416 0.06311,0.3991 0.06695,0.5723 0.0064,0.29 0.02552,0.3338 0.243142,0.5579 0.129892,0.1338 0.249377,0.2432 0.265523,0.2432 0.753037,0.7563 1.983813,1.624 2.356991,2.5056 0.252945,0.4735 0.533646,1.0375 0.691644,1.5147 0.06648,0.2127 0.131411,0.3762 0.144281,0.3635 0.01286,-0.012 0.03013,0.1572 0.03835,0.3775 0.0082,0.2203 0.03698,0.4431 0.0639,0.495 0.115052,0.2216 0.604035,0.8019 0.644194,0.7645 0.02414,-0.022 0.02685,-0.01 0.006,0.028 -0.02097,0.038 0.04305,0.1653 0.143615,0.286 0.572218,0.5542 0.434023,0.5612 0.884614,0.9561 0.03999,-0.026 0.04808,-0.015 0.02191,0.029 -0.02619,0.044 0.139107,0.2582 0.449238,0.5829 0.269864,0.2827 0.50831,0.5581 0.529881,0.6121 0.05103,0.1278 0.247491,1.1066 0.599819,2.9882 0.156179,0.834 0.372878,1.9284 0.481551,2.432 0.108672,0.5036 0.209689,0.973 0.224479,1.0429 0.02772,0.1311 0.104751,0.2235 0.514236,0.6166 0.131143,0.1259 0.28573,0.3319 0.343527,0.4578 0.05779,0.1259 0.157771,0.319 0.222165,0.4292 0.09458,0.1618 0.118094,0.2993 0.122369,0.7153 0.0051,0.4995 0.0015,0.5149 -0.119569,0.5082 -0.111156,-0.01 -0.124859,0.02 -0.124859,0.2392 0,0.2847 -0.194903,0.6485 -0.349478,0.6522 -0.145997,0 -0.357459,-0.258 -0.575031,-0.7113 -0.228625,-0.4763 -0.21841,-0.464 -0.315698,-0.3807 -0.10348,0.089 -0.238836,0.029 -0.282704,-0.1256 -0.01956,-0.068 -0.05067,-0.3768 -0.06915,-0.6847 -0.0272,-0.4537 -0.01401,-0.6267 0.06935,-0.9107 l 0.102942,-0.3506 -0.147895,-0.7501 c -0.08134,-0.4126 -0.299534,-1.3935 -0.48487,-2.1796 -0.185335,-0.7861 -0.391118,-1.661 -0.457291,-1.9443 -0.06617,-0.2833 -0.140494,-0.5237 -0.16516,-0.5343 -0.02466,-0.01 -0.0338,-0.037 -0.0203,-0.06 0.04829,-0.081 -0.185471,-1.0059 -0.270273,-1.0697 -0.0476,-0.036 -0.0871,-0.088 -0.08779,-0.1162 -5.78e-4,-0.028 -0.139627,-0.2055 -0.308738,-0.3943 -0.169112,-0.1889 -0.376484,-0.4206 -0.460828,-0.5151 -0.345119,-0.3863 -0.794293,-0.7721 -0.856293,-0.7356 -0.03597,0.021 -0.04732,0.018 -0.0252,-0.01 0.03744,-0.043 -0.273855,-0.3703 -0.353818,-0.3722 -0.05126,0 -0.08957,0.4221 -0.214761,2.3739 -0.14855,2.316 -0.246239,3.2858 -0.466889,4.6351 -0.108021,0.6607 -0.426819,1.8494 -0.588553,2.1947 -0.05968,0.1274 -0.115955,0.2819 -0.125058,0.3434 -0.0091,0.062 -0.04364,0.1465 -0.07675,0.189 -0.193428,0.7649 -0.548695,0.9109 -0.818442,1.6004 0.02503,0.042 0.01719,0.053 -0.02033,0.029 -0.03671,-0.023 -0.178784,0.1502 -0.355402,0.4344 -0.161838,0.2604 -0.375212,0.5894 -0.474164,0.7311 -0.09895,0.1417 -0.270669,0.3993 -0.381591,0.5724 -0.110925,0.1732 -0.360839,0.5392 -0.555363,0.8135 -0.194528,0.2742 -0.353684,0.5268 -0.353684,0.5613 0,0.034 -0.02094,0.049 -0.04654,0.033 -0.02561,-0.016 -0.09943,0.066 -0.164082,0.1827 -0.06465,0.1167 -0.205234,0.3126 -0.312415,0.4352 -0.107182,0.1226 -0.179173,0.2514 -0.159978,0.2861 0.0192,0.035 0.01474,0.044 -0.0099,0.02 -0.02463,-0.022 -0.172215,0.1338 -0.327978,0.3482 -0.440047,0.6058 -1.218889,1.5922 -1.746245,2.2117 -0.08043,0.095 -0.344617,0.4098 -0.587076,0.7009 -0.242457,0.2911 -0.460959,0.5293 -0.485559,0.5293 -0.0246,0 -0.04472,0.029 -0.04472,0.064 0,0.036 -0.05627,0.1194 -0.125035,0.1859 -0.06876,0.066 -0.196166,0.2111 -0.283103,0.3213 -0.08694,0.1101 -0.139185,0.1641 -0.116108,0.12 0.02777,-0.053 0.0203,-0.067 -0.02212,-0.039 -0.03524,0.022 -0.06407,0.072 -0.06407,0.1111 0,0.039 -0.236464,0.3269 -0.525477,0.6404 -0.289013,0.3135 -0.526244,0.6004 -0.527179,0.6375 -8.29e-4,0.038 -0.08024,0.1308 -0.176219,0.2082 l -0.174514,0.1409 0.188388,0.041 c 0.319285,0.07 0.852109,0.271 0.89507,0.3375 0.02241,0.035 0.04115,0.04 0.04162,0.013 5.77e-4,-0.027 0.03575,-0.021 0.07843,0.016 0.04267,0.037 0.124824,0.075 0.182573,0.087 0.05775,0.012 0.236784,0.1011 0.397861,0.199 0.161076,0.098 0.278101,0.1534 0.260054,0.1233 -0.04043,-0.068 0.483671,0.2266 0.530946,0.2979 0.01866,0.028 0.05056,0.047 0.07085,0.043 2.093964,0.9231 3.377822,2.0524 5.222486,3.0043 0.122084,0.063 0.234453,0.1291 0.249714,0.1486 0.01526,0.02 0.157284,0.1051 0.315609,0.1901 0.158321,0.085 0.317451,0.1913 0.353622,0.2362 0.03616,0.045 0.09711,0.081 0.135412,0.081 0.03831,0 0.100507,0.038 0.138225,0.085 0.03772,0.046 0.0881,0.072 0.111963,0.057 0.02388,-0.015 0.05832,0.013 0.07656,0.062 0.01825,0.049 0.05662,0.074 0.08527,0.056 0.06129,-0.039 0.9008,0.8235 0.862957,0.8865 -0.01416,0.024 0.0054,0.056 0.04329,0.072 0.03798,0.015 0.117754,0.1277 0.177283,0.2491 0.05953,0.1215 0.144558,0.266 0.188953,0.3211 0.0444,0.055 0.06265,0.1001 0.04059,0.1001 -0.02207,0 0.0065,0.071 0.06347,0.1574 0.283405,0.4305 0.305848,0.6998 0.07259,0.8711 -0.17946,0.1318 -0.631355,0.305 -0.959394,0.3676 -0.114453,0.021 -0.208095,0.069 -0.208095,0.1039 0,0.035 0.01644,0.047 0.03651,0.026 0.02007,-0.021 0.07144,-0.01 0.114118,0.029 0.04268,0.037 0.07324,0.043 0.0679,0.014 -0.02423,-0.1314 0.01021,-0.1512 0.08563,-0.049 0.06628,0.09 0.09178,0.096 0.131792,0.033 0.02957,-0.046 0.06318,-0.055 0.08321,-0.021 0.01849,0.031 0.142207,0.058 0.274961,0.061 0.266568,0.01 0.537703,0.093 0.537703,0.1728 0,0.1921 -0.365848,0.2418 -1.927591,0.2619 -0.670667,0.01 -1.24626,0.033 -1.279095,0.054 -0.03284,0.021 -0.07614,0.011 -0.09622,-0.022 -0.02519,-0.042 -0.06216,-0.039 -0.11905,0.01 -0.04917,0.042 -0.09764,0.049 -0.119919,0.017 -0.839669,0.069 -1.411788,-0.041 -2.273703,-0.089 z"
+       style="fill:#ffffff" />
+    <g
+       id="g4190"
+       transform="matrix(0.90714216,0,0,0.90714216,10.309518,89.771896)"
+       style="stroke-width:1.10236299"
+       inkscape:export-filename="images/title.png"
+       inkscape:export-xdpi="108"
+       inkscape:export-ydpi="108">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.10236299"
+         x="15.537872"
+         y="977.06451"
+         id="text4180"><tspan
+           sodipodi:role="line"
+           x="15.537872"
+           y="977.06451"
+           id="tspan4178"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.15907669px;line-height:100%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';text-align:start;text-anchor:start;stroke-width:1.10236299"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:23.46589661px;line-height:100%;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';text-align:start;text-anchor:start;stroke-width:1.10236299"
+             id="tspan4184">Adventure </tspan><tspan
+             style="font-size:22.82543564px;stroke-width:1.10236299"
+             id="tspan4192">EDITOR</tspan></tspan></text>
+      <path
+         style="fill:#ffffff;stroke-width:1.10236299"
+         d="m 0.6506523,982.37042 c -0.207405,0 -0.382923,-0.10729 -0.528867,-0.16615 -0.274835,-0.24765 -0.112658,-0.12181 0.182563,-0.23409 -0.167882,0.0286 0.039,0.0161 0.216123,-0.0978 0.06167,0 0.18198,-0.03 0.267377,-0.0667 0.08539,-0.0367 0.183714,-0.0737 0.218492,-0.0818 0.03478,-0.008 0.191345,-0.0638 0.347932,-0.12291 0.156584,-0.0594 0.357909,-0.13508 0.447384,-0.16821 0.152807,-0.0564 0.430465,-0.19803 0.748974,-0.38178 0.137678,-0.0794 0.216701,-0.13771 0.379143,-0.27931 0.04628,-0.0403 0.102694,-0.0734 0.125367,-0.0734 0.02268,0 0.03125,-0.0103 0.01907,-0.0227 -0.0122,-0.0125 0.04881,-0.0989 0.135571,-0.1921 0.08676,-0.0931 0.15713,-0.19136 0.156384,-0.21833 -0.004,-0.14688 -0.289867,-0.34015 -1.300134,-0.87914 -0.257249,-0.1372 -0.503825,-0.27551 -0.547949,-0.30731 -0.04412,-0.0322 -0.111231,-0.0579 -0.149128,-0.0579 -0.0379,0 -0.07501,-0.0154 -0.08246,-0.033 -1.51717,-0.72676 -2.488319,-1.24222 -3.961845,-1.85487 -0.01569,0 -0.115701,-0.055 -0.222249,-0.12291 -0.276133,-0.15765 -0.424045,-0.19232 -0.669373,-0.39028 -0.02237,-0.0183 -0.11042,-0.0883 -0.195666,-0.15582 -0.34267,-0.27147 -0.468577,-0.5373 -0.422443,-0.89196 0.01313,-0.10092 0.250693,-0.64357 0.576703,-1.31727 0.304912,-0.63009 0.55179,-1.15831 0.548619,-1.1737 -0.0032,-0.0154 0.01114,-0.0396 0.03182,-0.0535 0.07178,-0.0491 0.741577,-1.4816 0.715069,-1.52938 -0.01466,-0.0264 -0.01184,-0.0337 0.0063,-0.0176 0.0329,0.0308 0.395301,-0.65501 0.398622,-0.75425 0.0011,-0.0286 0.02006,-0.052 0.04243,-0.052 0.02237,0 0.03017,-0.011 0.01733,-0.0242 -0.02941,-0.03 -0.274924,0.0982 -0.274924,0.14394 0,0.0191 -0.02559,0.0337 -0.05687,0.0337 -1.295271,0.52125 -2.751156,1.32401 -3.891756,1.85838 -0.30391,0.14285 -0.598769,0.30057 -0.655244,0.35056 -0.06058,0.0535 -0.148323,0.22405 -0.213994,0.41556 -0.06123,0.17847 -0.145533,0.3694 -0.187359,0.42429 -0.04183,0.0542 -0.06716,0.10884 -0.05631,0.11998 0.01087,0.011 -0.179879,0.42429 -0.423861,0.91791 -0.595569,1.20492 -0.629364,1.27015 -0.676341,1.30569 -0.02237,0.0169 -0.02411,0.0315 -0.0039,0.0315 0.02025,0 0.01014,0.0337 -0.02245,0.074 -0.03258,0.0403 -0.110784,0.1866 -0.17377,0.32498 -0.06299,0.13845 -0.161444,0.31625 -0.218797,0.39519 -0.05735,0.0789 -0.07808,0.12716 -0.04606,0.1073 0.0499,-0.0308 0.05019,-0.0264 0.0019,0.0352 -0.616902,1.2431 -1.3923413,2.39987 -1.9221513,3.66547 -0.159839,0.29383 -0.255209,0.57014 -0.396755,0.93462 h 0.191113 c 0.643529,0.0789 -0.103108,0.15787 -0.31728,0.18198 -0.776798,0.0864 -3.755047,0.0279 -3.855746,-0.0764 -0.102068,-0.10532 0.395681,-0.15244 1.710227,-0.16204 0.531219,-0.007 0.965895,-0.009 0.965948,-0.0117 4.3e-5,0 -0.111498,-0.0947 -0.247897,-0.20522 -0.136396,-0.11052 -0.287388,-0.2412 -0.335539,-0.29031 -0.04815,-0.0491 -0.145211,-0.12672 -0.215694,-0.17231 -0.07049,-0.0454 -0.244352,-0.18235 -0.386379,-0.30401 -0.142027,-0.12174 -0.281787,-0.24106 -0.310579,-0.26524 -0.02879,-0.0242 -0.166058,-0.1397 -0.305035,-0.2566 -0.293238,-0.2467 -0.575146,-0.5505 -0.660271,-0.71166 -0.05584,-0.10569 -0.0539,-0.11456 0.03169,-0.14432 0.146304,-0.0506 0.319182,-0.007 0.862632,0.22926 0.08875,0.0381 0.171113,0.0711 0.18302,0.0733 0.02709,0.007 0.147565,0.0528 0.306355,0.12137 0.06711,0.0286 0.213525,0.0871 0.325372,0.12863 0.111847,0.0418 0.221661,0.0884 0.24403,0.10437 0.04952,0.0352 0.27312,0.0988 0.314754,0.0895 0.01653,-0.007 0.09889,0.0205 0.183023,0.0535 0.278838,0.11001 0.738614,0.15018 1.140313,0.0997 0.355726,-0.28107 0.606613,-0.72471 0.76153,-1.08303 0.04049,-0.0462 0.05705,-0.0841 0.03681,-0.0845 -0.02025,0 -0.01645,-0.0147 0.0084,-0.0315 0.238769,-0.4764 0.4998953,-1.00535 0.7049953,-1.45683 0.253549,-0.54727 0.380839,-0.8386 0.39218,-0.89745 0.0062,-0.033 0.0354,-0.0745 0.06485,-0.0937 0.02945,-0.0198 0.03945,-0.0352 0.02221,-0.0352 -0.01723,0 0.0036,-0.0711 0.04631,-0.15794 0.0427,-0.0865 0.100876,-0.23754 0.129279,-0.33553 0.0284,-0.0981 0.064,-0.17825 0.0791,-0.17825 0.01509,0 0.02768,-0.0235 0.02796,-0.052 2.12e-4,-0.0286 0.08762,-0.27895 0.194085,-0.5557 0.21946,-0.57058 0.436286,-1.14937 0.557787,-1.489 0.0454,-0.12679 0.09808,-0.26839 0.11707,-0.3145 0.01898,-0.0462 0.07377,-0.1877 0.121727,-0.31449 0.04796,-0.12694 0.123136,-0.31567 0.167055,-0.41945 0.04392,-0.10385 0.08242,-0.20764 0.08556,-0.2308 0.0032,-0.0227 0.02071,-0.0608 0.03906,-0.0838 0.698415,-1.05365 1.932967,-1.77586 2.791482,-2.56221 0.01886,0.0117 0.142398,-0.0766 0.274532,-0.19672 0.132135,-0.12027 0.258549,-0.23299 0.280919,-0.25058 0.117432,-0.0921 0.614285,-0.50264 0.874979,-0.7231 0.163714,-0.13838 0.39071,-0.3252 0.504434,-0.41513 0.113727,-0.0899 0.215927,-0.17582 0.227112,-0.19078 0.01118,-0.0154 0.13929,-0.12056 0.284681,-0.23482 0.145391,-0.11427 0.294318,-0.23864 0.330951,-0.27646 0.309801,-0.35026 0.793544,-0.62195 1.397611,-1.1405 0.04474,-0.0432 0.122365,-0.10722 0.172502,-0.14196 0.05014,-0.0344 0.08081,-0.0804 0.06815,-0.10151 -0.01266,-0.0213 -0.0056,-0.033 0.01579,-0.0271 0.06084,0.0183 0.297735,-0.17671 0.270393,-0.22237 0.13382,-0.0696 0.257361,-0.18337 0.405129,-0.31053 0.08021,-0.0804 0.145841,-0.13567 0.145841,-0.12291 0,0.0132 0.02359,0 0.05241,-0.0322 0.06704,-0.0711 0.218056,-0.4369 0.247807,-0.6007 0.01258,-0.0689 0.0502,-0.23879 0.08361,-0.37702 0.109034,-0.45082 0.179708,-1.23951 0.204873,-2.28619 0.01359,-0.56515 0.03414,-1.12188 0.04565,-1.23724 l 0.02095,-0.20976 -0.269847,0.2936 c -0.253735,0.2761 -0.412192,0.50718 -0.394317,0.5752 0.0043,0.0161 -0.01795,0.0198 -0.04952,0.007 -0.09953,0.0249 -0.127645,0.10371 -0.181575,0.19364 -0.01342,0.011 -0.05187,0.0579 -0.08542,0.10231 -0.04812,0.0645 -0.04894,0.074 -0.0039,0.0462 0.03877,-0.0242 0.0478,-0.0198 0.02811,0.0132 -0.01596,0.0271 -0.04788,0.0484 -0.07095,0.0484 -0.05571,0 -0.278318,0.21834 -0.257698,0.25264 0.0089,0.0154 -0.0097,0.0271 -0.04129,0.0271 -0.03158,0 -0.04594,-0.0205 -0.0319,-0.0462 0.01406,-0.0249 -0.0096,-0.0147 -0.05262,0.0227 -0.04299,0.0374 -0.123761,0.0828 -0.179491,0.10034 -0.05573,0.0176 -0.211293,0.0841 -0.345707,0.14761 -0.134411,0.0638 -0.509766,0.23204 -0.834121,0.3743 -0.324355,0.14226 -0.690399,0.30321 -0.813431,0.35766 -0.123031,0.055 -0.323355,0.13933 -0.445165,0.18858 -0.12181,0.0491 -0.478702,0.20771 -0.793094,0.35239 -0.314393,0.14468 -0.648909,0.29705 -0.743369,0.33876 -0.09446,0.0418 -0.161732,0.0925 -0.149495,0.11287 0.01224,0.0205 0.0072,0.0344 -0.01126,0.0315 -0.09463,-0.0169 -0.140574,0.0176 -0.213603,0.16117 -0.113822,0.22361 -0.371341,0.48365 -0.654718,0.66117 -0.140996,0.0884 -0.232439,0.17187 -0.216803,0.19796 0.01522,0.0249 0.0081,0.033 -0.01621,0.0176 -0.02379,-0.0154 -0.141006,0 -0.260481,0.03 -0.191664,0.0513 -0.221482,0.0506 -0.253418,-0.007 -0.02248,-0.0403 -0.0185,-0.0937 0.0105,-0.1416 0.05603,-0.0926 0.04279,-0.0944 -0.132818,-0.0191 -0.15743,0.0674 -0.206593,0.0462 -0.265886,-0.11411 -0.02727,-0.0739 -0.02821,-0.1073 -0.0026,-0.091 0.0223,0.0147 0.04055,0.007 0.04055,-0.0154 0,-0.0227 -0.04118,-0.0469 -0.09151,-0.055 -0.11964,-0.0176 -0.154738,-0.22677 -0.04304,-0.2566 0.06745,-0.0183 0.06765,-0.0205 0.0024,-0.0249 -0.05119,-0.007 -0.07117,-0.0411 -0.07117,-0.13266 0,-0.10041 0.02465,-0.13874 0.11473,-0.17825 0.0631,-0.0279 0.17476,-0.12115 0.248127,-0.20756 0.07337,-0.0864 0.14723,-0.14827 0.164137,-0.13757 0.01691,0.0103 0.156908,-0.0191 0.311107,-0.0652 0.178155,-0.0542 0.37674,-0.0821 0.544729,-0.0768 0.536881,0.0161 0.587654,0.01 0.894774,-0.13728 0.16777,-0.0798 0.424001,-0.19722 0.569402,-0.26092 0.771131,-0.33765 1.039894,-0.46474 1.065923,-0.50432 0.01583,-0.0242 0.05262,-0.044 0.08174,-0.0447 0.112526,0 0.638149,-0.24524 0.613983,-0.28562 -0.01393,-0.0235 -0.0056,-0.0293 0.01856,-0.0147 0.392653,-0.1353 0.651294,-0.2648 1.01878,-0.43154 0.523185,-0.21262 0.72502,-0.3329 0.827896,-0.49319 0.05643,-0.088 0.107371,-0.17875 0.113215,-0.20184 0.0059,-0.0227 0.04307,-0.0891 0.08274,-0.1468 0.326298,-0.59645 0.639043,-1.11617 0.938602,-1.67648 0.499962,-0.90809 0.569914,-1.08164 0.648431,-1.60913 0.09527,-0.63998 0.13644,-0.8367 0.272118,-1.30041 l 0.108543,-0.37093 -0.164905,-0.15333 c -0.54047,-0.50249 -0.672823,-0.59264 -0.893676,-0.6084 -0.0482,-0.007 -0.07914,-0.0205 -0.06878,-0.0374 0.03319,-0.0557 -0.284079,-0.033 -0.494342,0.0352 -0.280104,0.0905 -0.419768,0.11199 -0.534619,0.0823 -0.107914,-0.0279 -0.366999,-0.29075 -0.40349,-0.40933 -0.01272,-0.0411 -0.04022,-0.0752 -0.06109,-0.0752 -0.02087,0 -0.03793,-0.0337 -0.03793,-0.0749 0,-0.041 -0.056,-0.10891 -0.12444,-0.15054 -0.154652,-0.0942 -0.212821,-0.2445 -0.17992,-0.46474 0.02496,-0.16703 0.156769,-0.93059 0.203036,-1.17626 0.103124,-0.54727 0.111934,-0.64922 0.06151,-0.71189 -0.02832,-0.0352 -0.06833,-0.0638 -0.0889,-0.0638 -0.02057,0 -0.05952,-0.0191 -0.08653,-0.0418 -0.02702,-0.0235 -0.09121,-0.0751 -0.14264,-0.11543 -0.05144,-0.041 -0.111185,-0.14886 -0.132773,-0.24106 -0.08293,-0.35451 -0.107447,-0.52162 -0.07332,-0.49985 0.01938,0.0125 0.03524,0 0.03524,-0.0213 0,-0.0792 0.262752,-0.41366 0.34571,-0.44012 0.195434,-0.0623 1.005291,-0.1504 1.381363,-0.1504 0.419116,0 0.525433,0.033 0.66248,0.20778 0.04414,0.0564 0.0478,0.0535 0.02743,-0.019 -0.02351,-0.0839 -0.02351,-0.0839 0.02727,0 0.02793,0.0462 0.08768,0.11104 0.132784,0.14424 0.105998,0.078 0.180885,0.15963 0.330976,0.36059 0.06711,0.0899 0.156943,0.20016 0.199634,0.24495 0.07381,0.0773 0.07529,0.11133 0.0301,0.69334 -0.05786,0.74508 -0.05759,1.22111 8.06e-4,1.47177 0.02417,0.10378 0.04625,0.29251 0.04907,0.41945 0.0047,0.21255 0.0187,0.24465 0.178203,0.4089 0.0952,0.0981 0.182773,0.17824 0.194607,0.17824 0.551915,0.55431 1.453974,1.19026 1.727483,1.8364 0.185388,0.34704 0.39112,0.76041 0.506919,1.11016 0.04873,0.15589 0.09631,0.27572 0.105746,0.26641 0.0094,-0.009 0.02208,0.11522 0.02811,0.27668 0.006,0.16146 0.0271,0.32475 0.04683,0.36279 0.08432,0.16242 0.442709,0.58773 0.472142,0.56032 0.01769,-0.0161 0.01968,-0.007 0.0044,0.0205 -0.01537,0.0278 0.03155,0.12115 0.105258,0.20962 0.419389,0.40618 0.318104,0.41131 0.64835,0.70074 0.02931,-0.0191 0.03524,-0.011 0.01606,0.0213 -0.0192,0.0322 0.101954,0.18924 0.329255,0.42722 0.197788,0.2072 0.37255,0.40904 0.388359,0.44862 0.0374,0.0937 0.181391,0.81105 0.439619,2.19011 0.114467,0.61125 0.273289,1.41336 0.352938,1.78246 0.07965,0.3691 0.153685,0.71313 0.164525,0.76436 0.02032,0.0961 0.07677,0.16381 0.376893,0.45192 0.09612,0.0923 0.209417,0.24325 0.251777,0.33553 0.04236,0.0923 0.115634,0.2338 0.162829,0.31457 0.06932,0.11858 0.08655,0.21936 0.08969,0.52425 0.0037,0.3661 0.0011,0.37738 -0.08763,0.37247 -0.08147,-0.007 -0.09151,0.0147 -0.09151,0.17532 0,0.20866 -0.142848,0.4753 -0.256139,0.47801 -0.107004,0 -0.261988,-0.1891 -0.421451,-0.52133 -0.167564,-0.34909 -0.160077,-0.34007 -0.231381,-0.27902 -0.07584,0.0652 -0.175047,0.0212 -0.207199,-0.0921 -0.01434,-0.0498 -0.03714,-0.27617 -0.05068,-0.50183 -0.01994,-0.33253 -0.01027,-0.45932 0.05083,-0.66747 l 0.07545,-0.25696 -0.108395,-0.54977 c -0.05962,-0.3024 -0.219535,-1.02132 -0.355371,-1.59747 -0.135835,-0.57614 -0.286658,-1.21738 -0.335157,-1.42501 -0.0485,-0.20764 -0.102971,-0.38383 -0.121049,-0.3916 -0.01807,-0.007 -0.02477,-0.0271 -0.01488,-0.044 0.03539,-0.0594 -0.135935,-0.73724 -0.198088,-0.784 -0.03489,-0.0264 -0.06384,-0.0645 -0.06434,-0.0852 -4.24e-4,-0.0205 -0.102336,-0.15062 -0.22628,-0.28899 -0.123946,-0.13845 -0.275932,-0.30827 -0.33775,-0.37753 -0.252944,-0.28313 -0.582152,-0.56589 -0.627593,-0.53914 -0.02636,0.0154 -0.03468,0.0132 -0.01847,-0.007 0.02744,-0.0315 -0.200713,-0.2714 -0.25932,-0.2728 -0.03757,0 -0.06565,0.30937 -0.157402,1.73988 -0.108875,1.69744 -0.180473,2.40822 -0.342192,3.39715 -0.07917,0.48424 -0.312823,1.35546 -0.431361,1.60854 -0.04374,0.0934 -0.08499,0.20661 -0.09166,0.25168 -0.0067,0.0454 -0.03198,0.10738 -0.05625,0.13852 -0.141767,0.56061 -0.402149,0.66762 -0.599852,1.17297 0.01835,0.0308 0.0126,0.0388 -0.0149,0.0213 -0.0269,-0.0168 -0.131034,0.11009 -0.260481,0.31838 -0.118614,0.19085 -0.275,0.43199 -0.347524,0.53584 -0.07252,0.10385 -0.198378,0.29265 -0.279675,0.41952 -0.0813,0.12694 -0.264466,0.39519 -0.407036,0.59623 -0.142573,0.20097 -0.259222,0.3861 -0.259222,0.41139 0,0.0249 -0.01535,0.0359 -0.03411,0.0242 -0.01877,-0.0117 -0.07287,0.0484 -0.120258,0.1339 -0.04738,0.0855 -0.15042,0.22911 -0.228975,0.31897 -0.07856,0.0898 -0.13132,0.18425 -0.117251,0.20968 0.01407,0.0257 0.0108,0.0323 -0.0073,0.0147 -0.01805,-0.0161 -0.12622,0.0981 -0.240381,0.25521 -0.322519,0.444 -0.893347,1.16695 -1.279856,1.62099 -0.05895,0.0696 -0.252577,0.30035 -0.430279,0.5137 -0.177702,0.21336 -0.337846,0.38794 -0.355876,0.38794 -0.01803,0 -0.03278,0.0213 -0.03278,0.0469 0,0.0264 -0.04124,0.0875 -0.09164,0.13625 -0.0504,0.0484 -0.143774,0.15471 -0.207492,0.23548 -0.06372,0.0807 -0.102011,0.12027 -0.0851,0.088 0.02035,-0.0388 0.01488,-0.0491 -0.01621,-0.0286 -0.02583,0.0161 -0.04696,0.0528 -0.04696,0.0814 0,0.0286 -0.173309,0.23959 -0.385132,0.46936 -0.211823,0.22977 -0.385694,0.44004 -0.386379,0.46723 -6.08e-4,0.0279 -0.05881,0.0959 -0.129155,0.1526 l -0.127904,0.10326 0.138073,0.0301 c 0.23401,0.0513 0.624527,0.19863 0.656014,0.24736 0.01642,0.0257 0.03016,0.0293 0.0305,0.01 4.23e-4,-0.0198 0.0262,-0.0154 0.05748,0.0117 0.03127,0.0271 0.09148,0.055 0.133811,0.0638 0.04233,0.009 0.173543,0.0741 0.2916,0.14585 0.118055,0.0718 0.203825,0.11243 0.190598,0.0904 -0.02963,-0.0498 0.354492,0.16608 0.38914,0.21834 0.01368,0.0205 0.03706,0.0344 0.05193,0.0315 1.534705,0.67656 2.475669,1.50425 3.827658,2.20191 0.08948,0.0462 0.171835,0.0946 0.18302,0.10891 0.01119,0.0147 0.115277,0.077 0.231316,0.13933 0.116037,0.0623 0.232666,0.14021 0.259176,0.17312 0.0265,0.033 0.07117,0.0594 0.09925,0.0594 0.02808,0 0.07366,0.0279 0.101308,0.0623 0.02765,0.0337 0.06457,0.0528 0.08206,0.0418 0.0175,-0.011 0.04274,0.01 0.05611,0.0454 0.01338,0.0359 0.0415,0.0542 0.0625,0.041 0.04492,-0.0286 0.660214,0.60356 0.632478,0.64974 -0.01038,0.0176 0.004,0.041 0.03173,0.0528 0.02784,0.011 0.0863,0.0936 0.129934,0.18257 0.04363,0.0891 0.105949,0.19495 0.138487,0.23534 0.03254,0.0403 0.04592,0.0734 0.02975,0.0734 -0.01618,0 0.0048,0.052 0.04652,0.11536 0.207712,0.31552 0.224161,0.5129 0.0532,0.63845 -0.131529,0.0966 -0.462732,0.22354 -0.703158,0.26942 -0.08388,0.0154 -0.152517,0.0506 -0.152517,0.0761 0,0.0257 0.01205,0.0344 0.02676,0.0191 0.01471,-0.0154 0.05236,-0.007 0.08364,0.0213 0.03128,0.0271 0.05368,0.0315 0.04977,0.0103 -0.01776,-0.0963 0.0075,-0.11082 0.06276,-0.0359 0.04858,0.066 0.06727,0.0704 0.09659,0.0242 0.02167,-0.0337 0.04631,-0.0403 0.06099,-0.0154 0.01355,0.0227 0.104226,0.0425 0.201524,0.0447 0.195372,0.007 0.394092,0.0682 0.394092,0.12665 0,0.14079 -0.268137,0.17722 -1.412767,0.19195 -0.491545,0.007 -0.913408,0.0242 -0.937473,0.0396 -0.02407,0.0154 -0.0558,0.008 -0.07052,-0.0161 -0.01846,-0.0308 -0.04556,-0.0286 -0.08725,0.007 -0.03604,0.0308 -0.07156,0.0359 -0.08789,0.0125 -0.615409,0.0506 -1.034726,-0.0301 -1.66644,-0.0652 z"
+         id="path4182"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccscscscccccsccccccscccccscsccccccsccccccccccccccccccccccccccccccccccccccsscsccsccccsccscscccccccsccssscsccccccscsccccsccsccccsccccccccscccscsccscccccccccccsscccccccssccscsccscscsscccscscscccccsscccccscsscsccscscscccccsssccccsccccsscccccccccscccccccsssccccscccccccccscccccscscccccccsscccsccccsccssccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/adventure-composer/assets-raw/engine/engine-default-icon.svg b/adventure-editor/assets-raw/engine/engine-default-icon.svg
similarity index 100%
rename from adventure-composer/assets-raw/engine/engine-default-icon.svg
rename to adventure-editor/assets-raw/engine/engine-default-icon.svg
diff --git a/adventure-editor/assets-raw/engine/gen-default-icons.sh b/adventure-editor/assets-raw/engine/gen-default-icons.sh
new file mode 100755
index 000000000..e4c7f2478
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/gen-default-icons.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+#ANDROID ICONS
+inkscape -w 192 -h 192 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/res/drawable-xxxhdpi/ic_launcher.png  engine-default-icon.svg;
+inkscape -w 144 -h 144 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/res/drawable-xxhdpi/ic_launcher.png  engine-default-icon.svg;
+inkscape -w 96 -h 96 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/res/drawable-xhdpi/ic_launcher.png  engine-default-icon.svg;
+inkscape -w 72 -h 72 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/res/drawable-hdpi/ic_launcher.png  engine-default-icon.svg;
+inkscape -w 48 -h 48 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/res/drawable-mdpi/ic_launcher.png  engine-default-icon.svg;
+
+inkscape -w 512 -h 512 --export-area-page --export-png=../../src/main/resources/projectTmpl/android/ic_launcher-web.png  engine-default-icon.svg;
+
+
+#DESKTOP
+inkscape -w 16 -h 16 --export-area-page --export-png=../../src/main/resources/projectTmpl/desktop/src/icons/icon16.png  engine-default-icon.svg;
+inkscape -w 32 -h 32 --export-area-page --export-png=../../src/main/resources/projectTmpl/desktop/src/icons/icon32.png  engine-default-icon.svg;
+inkscape -w 128 -h 128 --export-area-page --export-png=../../src/main/resources/projectTmpl/desktop/src/icons/icon128.png  engine-default-icon.svg;
+
+#IOS
+inkscape -w 1024 -h 1024 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/app-store-icon-1024@1x.png  engine-default-icon.svg;
+inkscape -w 76 -h 76 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@1x.png  engine-default-icon.svg;
+inkscape -w 152 -h 152 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@2x.png  engine-default-icon.svg;
+inkscape -w 20 -h 20 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@1x.png  engine-default-icon.svg;
+inkscape -w 40 -h 40 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@2x.png  engine-default-icon.svg;
+inkscape -w 167 -h 167 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-pro-app-icon-83.5@2x.png  engine-default-icon.svg;
+inkscape -w 29 -h 29 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@1x.png  engine-default-icon.svg;
+inkscape -w 58 -h 58 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@2x.png  engine-default-icon.svg;
+inkscape -w 40 -h 40 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@1x.png  engine-default-icon.svg;
+inkscape -w 80 -h 80 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@2x.png  engine-default-icon.svg;
+inkscape -w 120 -h 120 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@2x.png  engine-default-icon.svg;
+inkscape -w 180 -h 180 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@3x.png  engine-default-icon.svg;
+inkscape -w 40 -h 40 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@2x.png  engine-default-icon.svg;
+inkscape -w 60 -h 60 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@3x.png  engine-default-icon.svg;
+inkscape -w 80 -h 80 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@2x.png  engine-default-icon.svg;
+inkscape -w 120 -h 120 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@3x.png  engine-default-icon.svg;
+inkscape -w 58 -h 58 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@2x.png  engine-default-icon.svg;
+inkscape -w 87 -h 87 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@3x.png  engine-default-icon.svg;
+
+# IOS LAUNCH IMAGES
+inkscape -w 750 -h 1334 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Default-375w-667h@2x.png ios-default-images.svg;
+inkscape -w 1242 -h 2208 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Default-414w-736h@3x.png ios-default-images.svg;
+inkscape -w 640 -h 1136 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Default-568h@2x.png ios-default-images.svg;
+
+inkscape -w 320 -h 480 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Default.png ios-default-images.svg;
+inkscape -w 640 -h 960 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Default@2x.png ios-default-images.svg;
+inkscape -w 1536 -h 2008 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Default@2x~ipad.png  ios-default-images.svg;
+inkscape -w 768 -h 1004 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Default~ipad.png ios-default-images.svg;
+inkscape -w 2048 -h 2732 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Default-1024w-1366h@2x~ipad.png ios-default-images.svg;
+
+# IPhone X
+inkscape -w 1125 -h 2436 --export-area-page --export-png=../../src/main/resources/projectTmpl/ios/data/Default-375w-812h@3x.png ios-default-images.svg;
+
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/gen.sh b/adventure-editor/assets-raw/engine/gen-ui-atlas.sh
similarity index 96%
rename from adventure-composer/assets-raw/engine/ui-atlas/gen.sh
rename to adventure-editor/assets-raw/engine/gen-ui-atlas.sh
index a034ac61a..0c5f08623 100755
--- a/adventure-composer/assets-raw/engine/ui-atlas/gen.sh
+++ b/adventure-editor/assets-raw/engine/gen-ui-atlas.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=1.3.1
+VERSION=1.6.5
 LIBGDX_BASE_PATH=~/.gradle/caches/modules-2/files-2.1/com.badlogicgames.gdx/
 GDX_PATH=`find $LIBGDX_BASE_PATH -name gdx-$VERSION.jar`
 GDX_TOOLS_PATH=`find $LIBGDX_BASE_PATH -name gdx-tools-$VERSION.jar`
diff --git a/adventure-editor/assets-raw/engine/help/genhelp b/adventure-editor/assets-raw/engine/help/genhelp
new file mode 100755
index 000000000..d97f563db
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/help/genhelp
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+TARGET_DIR=../../../src/main/resources/projectTmpl/android/assets/ui/1
+
+#GENERATE 1920_1080
+inkscape -w 1920 -h 1080 --export-area-page --export-png=$TARGET_DIR/helpDesktop_es.png  helpDesktop_es.svg;
+inkscape -w 1920 -h 1080 --export-area-page --export-png=$TARGET_DIR/helpDesktop.png  helpDesktop_en.svg;
+inkscape -w 1920 -h 1080 --export-area-page --export-png=$TARGET_DIR/helpPie_es.png  helpPie_es.svg;
+inkscape -w 1920 -h 1080 --export-area-page --export-png=$TARGET_DIR/helpPie.png  helpPie_en.svg;
diff --git a/adventure-editor/assets-raw/engine/help/helpDesktop_en.svg b/adventure-editor/assets-raw/engine/help/helpDesktop_en.svg
new file mode 100644
index 000000000..05052412d
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/help/helpDesktop_en.svg
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1920"
+   height="1080"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   sodipodi:docname="helpDesktop_en.svg"
+   inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/help/helpDesktop_en.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5-0">
+      <g
+         id="g5600-9-9-5-1"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3-9"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 z"
+           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2-1"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.07579465;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5">
+      <g
+         id="g5600-9-9-5"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 z"
+           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.07579465;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <linearGradient
+       gradientTransform="translate(28.652262,53.356133)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4237"
+       id="linearGradient4243"
+       x1="759.34772"
+       y1="-37.33252"
+       x2="772.1897"
+       y2="1114.6675"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4237">
+      <stop
+         style="stop-color:#19303f;stop-opacity:1"
+         offset="0"
+         id="stop4239" />
+      <stop
+         id="stop4245"
+         offset="0.91383815"
+         style="stop-color:#070e13;stop-opacity:1" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop4241" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.2721978"
+     inkscape:cx="926.27965"
+     inkscape:cy="1107.8078"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4052"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:window-width="1215"
+     inkscape:window-height="1000"
+     inkscape:window-x="1431"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient4243);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.97000003;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4032"
+       width="2008.8419"
+       height="1232.0472"
+       x="-28.652262"
+       y="-53.356133"
+       rx="9.5087242"
+       ry="13.555182" />
+  </g>
+  <g
+     transform="translate(0,27.637817)"
+     id="g4052"
+     inkscape:groupmode="layer"
+     inkscape:label="en desktop"
+     style="display:inline">
+    <rect
+       ry="7.74085"
+       rx="5.2145171"
+       y="133.43025"
+       x="956.78314"
+       height="806"
+       width="920"
+       id="rect4026"
+       style="color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:93.44705963px;line-height:0%;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter';letter-spacing:0px;word-spacing:0px;display:inline;fill:#33b5e5;fill-opacity:1;stroke:none"
+       x="1190.3087"
+       y="93.148445"
+       id="text4034"
+       sodipodi:linespacing="0%"><tspan
+         sodipodi:role="line"
+         id="tspan4036"
+         x="1190.3087"
+         y="93.148445"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';fill:#33b5e5;fill-opacity:1">INVENTORY</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:93.44705963px;line-height:0%;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter';letter-spacing:0px;word-spacing:0px;display:inline;fill:#33b5e5;fill-opacity:1;stroke:none"
+       x="180.52083"
+       y="93.148598"
+       id="text4034-0"
+       sodipodi:linespacing="0%"><tspan
+         sodipodi:role="line"
+         id="tspan4036-9"
+         x="180.52083"
+         y="93.148598"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';fill:#33b5e5;fill-opacity:1">INTERACTION</tspan></text>
+    <g
+       style="display:inline"
+       inkscape:export-ydpi="180"
+       inkscape:export-xdpi="180"
+       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+       id="g3957"
+       transform="matrix(1.96,0,0,1.96,283.11703,-2014.3232)">
+      <g
+         id="g3961"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+         inkscape:export-xdpi="180"
+         inkscape:export-ydpi="180">
+        <g
+           style="stroke:#000000"
+           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+           inkscape:export-ydpi="180"
+           inkscape:export-xdpi="180"
+           transform="matrix(0.98719379,0,0,0.98719379,-62.944052,-1001.3914)"
+           id="g3963">
+          <rect
+             y="2036.7069"
+             x="434.91745"
+             height="101.29723"
+             width="101.29723"
+             id="rect3965"
+             style="color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <g
+             style="stroke:#000000"
+             id="g3967"
+             transform="matrix(-1,0,0,-1,973.18233,4018.141)"
+             inkscape:export-xdpi="59"
+             inkscape:export-ydpi="59" />
+        </g>
+        <rect
+           ry="4.7680097"
+           rx="4.7680097"
+           y="1044.7312"
+           x="388.6716"
+           height="33.646881"
+           width="56.62524"
+           id="rect3969"
+           style="fill:#ffffff;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3971"
+           d="m 408.6195,1038.0421 c -0.93834,0 -1.69131,0.7529 -1.69131,1.6913 l 0,8.5661 c 0,0.9383 0.75297,1.6912 1.69131,1.6912 l 16.725,0 c 0.93833,0 1.69129,-0.7529 1.69129,-1.6912 l 0,-8.5661 c 0,-0.9384 -0.75296,-1.6913 -1.69129,-1.6913 l -16.725,0 z m 2.50562,1.7851 11.71376,0 c 0.65731,0 1.19017,0.5329 1.19017,1.1903 l 0,5.9978 c 0,0.6573 -0.53286,1.1902 -1.19017,1.1902 l -11.71376,0 c -0.65732,0 -1.19018,-0.5329 -1.19018,-1.1902 l 0,-5.9978 c 0,-0.6574 0.53286,-1.1903 1.19018,-1.1903 z"
+           style="fill:#ffffff;stroke:none" />
+      </g>
+    </g>
+    <flowRoot
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="flowRoot4032"
+       transform="translate(497.41046,461.96526)"><flowRegion
+         id="flowRegion4034"><use
+           x="0"
+           y="0"
+           xlink:href="#rect4026"
+           id="use4036"
+           width="1920"
+           height="1080"
+           transform="translate(-497.41046,-431.96526)" /></flowRegion><flowPara
+         id="flowPara4038"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">1. Some objects in the scene can be taken. The player has an inventory of the items he owns.</flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4040" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4042">2. The inventory items can be examined and manipulated.  </flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4044" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4046">3. You can also use / combine an inventory item with another object in the scene or inventory <flowSpan
+   style="fill:#ff0000"
+   id="flowSpan3109">dragging over</flowSpan> the object you want to use.</flowPara></flowRoot>    <g
+       transform="translate(-15.280248,12.04916)"
+       id="g4204"
+       style="display:inline;stroke:#676767;stroke-opacity:1">
+      <rect
+         ry="284.25351"
+         rx="282.51431"
+         y="283.42279"
+         x="161.70404"
+         height="727.37512"
+         width="565.02863"
+         id="rect4194"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#676767;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4196"
+         d="m 163.65939,610.74159 558.52016,0"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4198"
+         d="m 446.81613,608.14382 0,-324.72102"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <rect
+         ry="181.84377"
+         rx="282.51401"
+         y="363.74692"
+         x="420.83844"
+         height="181.84377"
+         width="54.553131"
+         id="rect4200"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#636363;fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="cssc"
+         inkscape:connector-curvature="0"
+         id="path4202"
+         d="m 448.21836,280.82503 c 0,0 -8.37037,-31.25307 10.41854,-57.13095 14.70145,-20.24824 57.11133,-33.17629 59.7212,-51.97531 2.86274,-20.62043 -18.18438,-59.74867 -18.18438,-59.74867"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <path
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 317.23408,427.95814 221.11666,277.28758"
+       id="path4211"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="color:#000000;font-style:normal;font-weight:normal;font-size:180px;line-height:125%;font-family:Sans;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       x="62.652794"
+       y="233.12553"
+       id="text4230"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4232"
+         x="62.652794"
+         y="233.12553"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">action</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path4258"
+       d="M 522.45777,427.95814 618.57519,277.28758"
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text4260"
+       y="233.12553"
+       x="547.21753"
+       style="color:#000000;font-style:normal;font-weight:normal;font-size:180px;line-height:125%;font-family:Sans;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         y="233.12553"
+         x="547.21753"
+         id="tspan4262"
+         sodipodi:role="line">examine</tspan></text>
+    <path
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 361.39614,716.31041 426.34035,516.28225"
+       id="path4206"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="color:#000000;font-style:normal;font-weight:normal;font-size:180px;line-height:125%;font-family:Sans;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       x="266.6586"
+       y="781.25464"
+       id="text4208"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4210"
+         x="266.6586"
+         y="781.25464"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">inventory</tspan></text>
+  </g>
+</svg>
diff --git a/adventure-editor/assets-raw/engine/help/helpDesktop_es.svg b/adventure-editor/assets-raw/engine/help/helpDesktop_es.svg
new file mode 100644
index 000000000..fb995f21c
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/help/helpDesktop_es.svg
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1920"
+   height="1080"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   sodipodi:docname="helpDesktop_es.svg"
+   inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/help/helpDesktop_en.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5-0">
+      <g
+         id="g5600-9-9-5-1"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3-9"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 z"
+           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2-1"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.07579465;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5">
+      <g
+         id="g5600-9-9-5"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 z"
+           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.07579465;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <linearGradient
+       gradientTransform="translate(28.652262,53.356133)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4237"
+       id="linearGradient4243"
+       x1="759.34772"
+       y1="-37.33252"
+       x2="772.1897"
+       y2="1114.6675"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4237">
+      <stop
+         style="stop-color:#19303f;stop-opacity:1"
+         offset="0"
+         id="stop4239" />
+      <stop
+         id="stop4245"
+         offset="0.91383815"
+         style="stop-color:#070e13;stop-opacity:1" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop4241" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.1360989"
+     inkscape:cx="1570.4955"
+     inkscape:cy="208.26782"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4040"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:window-width="1215"
+     inkscape:window-height="1000"
+     inkscape:window-x="1431"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient4243);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.97000003;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4032"
+       width="2008.8419"
+       height="1232.0472"
+       x="-28.652262"
+       y="-53.356133"
+       rx="9.5087242"
+       ry="13.555182" />
+  </g>
+  <g
+     transform="translate(0,27.637817)"
+     id="g4040"
+     inkscape:groupmode="layer"
+     inkscape:label="es desktop"
+     style="display:inline">
+    <rect
+       ry="7.74085"
+       rx="5.2145171"
+       y="146.64812"
+       x="974.97485"
+       height="806"
+       width="920"
+       id="rect4026"
+       style="color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:93.44705963px;line-height:0%;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter';letter-spacing:0px;word-spacing:0px;display:inline;fill:#33b5e5;fill-opacity:1;stroke:none"
+       x="1208.5005"
+       y="86.366333"
+       id="text4034"
+       sodipodi:linespacing="0%"><tspan
+         sodipodi:role="line"
+         id="tspan4036"
+         x="1208.5005"
+         y="86.366333"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';fill:#33b5e5;fill-opacity:1">INVENTARIO</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:93.44705963px;line-height:0%;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter';letter-spacing:0px;word-spacing:0px;display:inline;fill:#33b5e5;fill-opacity:1;stroke:none"
+       x="195.76837"
+       y="96.366486"
+       id="text4034-0"
+       sodipodi:linespacing="0%"><tspan
+         sodipodi:role="line"
+         id="tspan4036-9"
+         x="195.76837"
+         y="96.366486"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';fill:#33b5e5;fill-opacity:1">INTERACCIÓN</tspan></text>
+    <g
+       style="display:inline"
+       inkscape:export-ydpi="180"
+       inkscape:export-xdpi="180"
+       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+       id="g3957"
+       transform="matrix(1.96,0,0,1.96,301.30876,-2021.1055)">
+      <g
+         id="g3961"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+         inkscape:export-xdpi="180"
+         inkscape:export-ydpi="180">
+        <g
+           style="stroke:#000000"
+           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+           inkscape:export-ydpi="180"
+           inkscape:export-xdpi="180"
+           transform="matrix(0.98719379,0,0,0.98719379,-62.944052,-1001.3914)"
+           id="g3963">
+          <rect
+             y="2036.7069"
+             x="434.91745"
+             height="101.29723"
+             width="101.29723"
+             id="rect3965"
+             style="color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <g
+             style="stroke:#000000"
+             id="g3967"
+             transform="matrix(-1,0,0,-1,973.18233,4018.141)"
+             inkscape:export-xdpi="59"
+             inkscape:export-ydpi="59" />
+        </g>
+        <rect
+           ry="4.7680097"
+           rx="4.7680097"
+           y="1044.7312"
+           x="388.6716"
+           height="33.646881"
+           width="56.62524"
+           id="rect3969"
+           style="fill:#ffffff;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3971"
+           d="m 408.6195,1038.0421 c -0.93834,0 -1.69131,0.7529 -1.69131,1.6913 l 0,8.5661 c 0,0.9383 0.75297,1.6912 1.69131,1.6912 l 16.725,0 c 0.93833,0 1.69129,-0.7529 1.69129,-1.6912 l 0,-8.5661 c 0,-0.9384 -0.75296,-1.6913 -1.69129,-1.6913 l -16.725,0 z m 2.50562,1.7851 11.71376,0 c 0.65731,0 1.19017,0.5329 1.19017,1.1903 l 0,5.9978 c 0,0.6573 -0.53286,1.1902 -1.19017,1.1902 l -11.71376,0 c -0.65732,0 -1.19018,-0.5329 -1.19018,-1.1902 l 0,-5.9978 c 0,-0.6574 0.53286,-1.1903 1.19018,-1.1903 z"
+           style="fill:#ffffff;stroke:none" />
+      </g>
+    </g>
+    <flowRoot
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="flowRoot4032"
+       transform="translate(-259.72724,44.626653)"><flowRegion
+         id="flowRegion4034"><use
+           x="0"
+           y="0"
+           xlink:href="#rect4026"
+           id="use4036"
+           width="1920"
+           height="1080"
+           transform="translate(259.72724,-44.626653)" /></flowRegion><flowPara
+         id="flowPara4038"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">1. Algunos objetos de la escena se podrán coger. El jugador dispone de un inventario con los objetos que posee.</flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4040" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4042">2. Los objetos del inventario, al igual que los objetos de la escena, se pueden examinar y manipular.</flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4044" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4046">3. También se puede usar/combinar un objeto del inventario con otro objeto de la escena o del mismo inventario <flowSpan
+   style="fill:#ff0000"
+   id="flowSpan3107">arrastrándolo</flowSpan> sobre el objeto con el que se quiera usar.</flowPara></flowRoot>    <g
+       id="g4204"
+       style="stroke:#676767;stroke-opacity:1"
+       transform="translate(0,14)">
+      <rect
+         ry="284.25351"
+         rx="282.51431"
+         y="283.42279"
+         x="161.70404"
+         height="727.37512"
+         width="565.02863"
+         id="rect4194"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4196"
+         d="m 163.65939,610.74159 558.52016,0"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4198"
+         d="m 446.81613,608.14382 0,-324.72102"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <rect
+         ry="181.84377"
+         rx="282.51401"
+         y="363.74692"
+         x="420.83844"
+         height="181.84377"
+         width="54.553131"
+         id="rect4200"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#838383;fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="cssc"
+         inkscape:connector-curvature="0"
+         id="path4202"
+         d="m 448.21836,280.82503 c 0,0 -8.37037,-31.25307 10.41854,-57.13095 14.70145,-20.24824 57.11133,-33.17629 59.7212,-51.97531 2.86274,-20.62043 -18.18438,-59.74867 -18.18438,-59.74867"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <path
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 332.51433,429.90898 236.39691,279.23842"
+       id="path4211"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="color:#000000;font-style:normal;font-weight:normal;font-size:180px;line-height:125%;font-family:Sans;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       x="77.933037"
+       y="235.07637"
+       id="text4230"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4232"
+         x="77.933037"
+         y="235.07637"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">acción</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path4258"
+       d="M 537.73802,429.90898 633.85544,279.23842"
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text4260"
+       y="235.07637"
+       x="562.4978"
+       style="color:#000000;font-style:normal;font-weight:normal;font-size:180px;line-height:125%;font-family:Sans;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         y="235.07637"
+         x="562.4978"
+         id="tspan4262"
+         sodipodi:role="line">examinar</tspan></text>
+    <path
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 370.21759,716.3739 435.1618,516.34573"
+       id="path4206"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <text
+       xml:space="preserve"
+       style="color:#000000;font-style:normal;font-weight:normal;font-size:180px;line-height:125%;font-family:Sans;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       x="263.48004"
+       y="781.31812"
+       id="text4208"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4210"
+         x="263.48004"
+         y="781.31812"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:70px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">inventario</tspan></text>
+  </g>
+</svg>
diff --git a/adventure-editor/assets-raw/engine/help/helpPie_en.svg b/adventure-editor/assets-raw/engine/help/helpPie_en.svg
new file mode 100644
index 000000000..8a7d3e002
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/help/helpPie_en.svg
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1920"
+   height="1080"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   sodipodi:docname="helpPie_en.svg"
+   inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/help/helpDesktop_en.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5-0">
+      <g
+         id="g5600-9-9-5-1"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3-9"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 z"
+           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2-1"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.07579465;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5">
+      <g
+         id="g5600-9-9-5"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 z"
+           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.07579465;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5-07">
+      <g
+         id="g5600-9-9-5-4"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3-6"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2-0"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <linearGradient
+       gradientTransform="translate(28.652262,53.356133)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4237"
+       id="linearGradient4243"
+       x1="759.34772"
+       y1="-37.33252"
+       x2="772.1897"
+       y2="1114.6675"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4237">
+      <stop
+         style="stop-color:#19303f;stop-opacity:1"
+         offset="0"
+         id="stop4239" />
+      <stop
+         id="stop4245"
+         offset="0.91383815"
+         style="stop-color:#070e13;stop-opacity:1" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop4241" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.19247291"
+     inkscape:cx="879.80046"
+     inkscape:cy="-67.807837"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4046"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:window-width="1215"
+     inkscape:window-height="1000"
+     inkscape:window-x="1431"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:url(#linearGradient4243);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.97000003;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;opacity:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4032"
+       width="2008.8419"
+       height="1232.0472"
+       x="-28.652262"
+       y="-53.356133"
+       rx="9.5087242"
+       ry="13.555182" />
+  </g>
+  <g
+     inkscape:label="en pie mode"
+     inkscape:groupmode="layer"
+     id="g4046"
+     transform="translate(0,27.637817)"
+     style="display:inline">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;enable-background:accumulate"
+       id="rect2990"
+       width="884"
+       height="356.51331"
+       x="35.181587"
+       y="165.63696"
+       rx="5.0104709"
+       ry="3.4239657" />
+    <rect
+       ry="7.74085"
+       rx="5.2145171"
+       y="135.63698"
+       x="967.18158"
+       height="806"
+       width="920"
+       id="rect4026"
+       style="color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:93.44705963px;line-height:0%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';letter-spacing:0px;word-spacing:0px;display:inline;fill:#33b5e5;fill-opacity:1;stroke:none;font-variant:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;"
+       x="1200.7073"
+       y="95.355171"
+       id="text4034"
+       sodipodi:linespacing="0%"><tspan
+         sodipodi:role="line"
+         id="tspan4036"
+         x="1200.7073"
+         y="95.355171"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';fill:#33b5e5;fill-opacity:1;font-size:93.44705963px;line-height:0%;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;">INVENTORY</tspan></text>
+    <flowRoot
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="flowRoot2992"
+       transform="translate(99.569228,-9.971115)"><flowRegion
+         id="flowRegion2994"><use
+           x="0"
+           y="0"
+           xlink:href="#rect2990"
+           id="use2996"
+           width="1920"
+           height="1080"
+           transform="translate(-99.569228,11.971115)" /></flowRegion><flowPara
+         id="flowPara2998"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">1. When you hover over an interactive object, its name shows. </flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara3807" /><flowPara
+         id="flowPara3002"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">2. When you tap on an object or character, a menu will show to select the action to perform.</flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara3809" /><flowPara
+         id="flowPara3014"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'" /><flowPara
+         id="flowPara3016"
+         style="font-size:44px" /></flowRoot>    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:93.44705963px;line-height:0%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';letter-spacing:0px;word-spacing:0px;display:inline;fill:#33b5e5;fill-opacity:1;stroke:none;font-variant:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;opacity:1;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;"
+       x="125.97506"
+       y="95.355324"
+       id="text4034-0"
+       sodipodi:linespacing="0%"><tspan
+         sodipodi:role="line"
+         id="tspan4036-9"
+         x="125.97506"
+         y="95.355324"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';fill:#33b5e5;fill-opacity:1;font-size:93.44705963px;line-height:0%;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;">INTERACTION</tspan></text>
+    <g
+       style="display:inline"
+       inkscape:export-ydpi="180"
+       inkscape:export-xdpi="180"
+       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+       id="g3957"
+       transform="matrix(1.96,0,0,1.96,293.51547,-2012.1165)">
+      <g
+         id="g3961"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+         inkscape:export-xdpi="180"
+         inkscape:export-ydpi="180">
+        <g
+           style="stroke:#000000"
+           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+           inkscape:export-ydpi="180"
+           inkscape:export-xdpi="180"
+           transform="matrix(0.98719379,0,0,0.98719379,-62.944052,-1001.3914)"
+           id="g3963">
+          <rect
+             y="2036.7069"
+             x="434.91745"
+             height="101.29723"
+             width="101.29723"
+             id="rect3965"
+             style="color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <g
+             style="stroke:#000000"
+             id="g3967"
+             transform="matrix(-1,0,0,-1,973.18233,4018.141)"
+             inkscape:export-xdpi="59"
+             inkscape:export-ydpi="59" />
+        </g>
+        <rect
+           ry="4.7680097"
+           rx="4.7680097"
+           y="1044.7312"
+           x="388.6716"
+           height="33.646881"
+           width="56.62524"
+           id="rect3969"
+           style="fill:#ffffff;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3971"
+           d="m 408.6195,1038.0421 c -0.93834,0 -1.69131,0.7529 -1.69131,1.6913 l 0,8.5661 c 0,0.9383 0.75297,1.6912 1.69131,1.6912 l 16.725,0 c 0.93833,0 1.69129,-0.7529 1.69129,-1.6912 l 0,-8.5661 c 0,-0.9384 -0.75296,-1.6913 -1.69129,-1.6913 l -16.725,0 z m 2.50562,1.7851 11.71376,0 c 0.65731,0 1.19017,0.5329 1.19017,1.1903 l 0,5.9978 c 0,0.6573 -0.53286,1.1902 -1.19017,1.1902 l -11.71376,0 c -0.65732,0 -1.19018,-0.5329 -1.19018,-1.1902 l 0,-5.9978 c 0,-0.6574 0.53286,-1.1903 1.19018,-1.1903 z"
+           style="fill:#ffffff;stroke:none" />
+      </g>
+    </g>
+    <flowRoot
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="flowRoot4032"
+       transform="translate(93.569228,68.028885)"><flowRegion
+         id="flowRegion4034"><use
+           x="0"
+           y="0"
+           xlink:href="#rect4026"
+           id="use4036"
+           width="1920"
+           height="1080"
+           transform="translate(-93.569228,-42.028885)" /></flowRegion><flowPara
+         id="flowPara4038"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">1. Some objects in the scene can be taken. The player has an inventory of the items he owns.</flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4040" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4042">2. The inventory items can be examined and manipulated.  </flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4044" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4046">3. You can also use / combine an inventory item with another object in the scene or inventory dragging over the object you want to use.</flowPara></flowRoot>    <g
+       id="g975"
+       transform="matrix(0.97870806,0,0,0.97870806,-170.04127,-868.04446)"
+       inkscape:export-xdpi="84"
+       inkscape:export-ydpi="84">
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
+         d="m 442.86429,1754.1491 c 10.78295,-2.0415 22.63506,-3.5484 31.72963,-6.4341 17.41543,4.5145 34.8732,6.2578 52.61828,9.7833 l -0.79324,5.6408 c -13.94799,-3.6905 -30.86751,-7.0314 -52.79456,-9.7833 -14.53933,2.2933 -27.21975,5.5161 -39.92644,8.7257 z"
+         id="path977"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
+         d="m 469.53272,1756.2959 c -12.32701,5.3522 -23.74909,10.1265 -35.83835,9.8143 l -0.76134,5.3571 c 8.03045,0.5053 15.01189,3.1755 19.07502,11.9461 0,0 -2.79705,8.0239 -3.50216,9.7867 -0.40755,1.0188 10.0109,4.9058 17.9261,9.2745 5.7789,3.1895 9.70362,7.3365 9.70362,7.3365 l -14.9361,-26.7161 c 30.24932,16.4667 62.28535,27.4255 70.27709,9.4129 4.42574,-9.9751 -6.88933,-18.2849 -10.71262,-10.1604 0,0 5.16501,-2.3834 6.00766,1.4396 4.44189,20.1524 -29.73454,11.8551 -43.36869,0.2354 -1.49294,-1.2724 46.44174,-11.7994 46.44174,-10.1189 l 1.61958,-5.8001 c -18.13025,4.301 -40.95965,-10.4622 -61.93155,-11.8076 z m 2.9623,9.4544 c 11.19809,-0.067 24.28852,1.3987 36.94576,6.0077 0.93698,0.3412 -27.67125,6.6029 -27.67125,6.6029 l -32.91758,-9.9667 c 5.34462,-1.3315 13.7624,-2.5851 23.64307,-2.6439 z"
+         id="path979"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccssccscsscccssccs" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate"
+         d="m 470.73702,1761.8052 c -0.83593,1.3734 -1.3012,2.9024 -1.3012,4.5265 0,5.8124 5.99006,10.5342 13.38574,10.5342 7.39568,0 13.38574,-4.7218 13.38574,-10.5342 0,-0.3491 -0.027,-0.684 -0.0692,-1.0244 -7.51389,-0.9914 -19.42592,-2.5902 -25.40108,-3.5021 z"
+         id="path981"
+         inkscape:connector-curvature="0" />
+    </g>
+    <ellipse
+       ry="178.28075"
+       rx="173.90331"
+       cy="549.35583"
+       cx="353.77585"
+       transform="matrix(0.32174912,0,0,0.31384895,410.07378,700.26683)"
+       id="path983"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d9d;stroke-width:2.49233365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       clip-path="url(#clipPath5598-8-0-5-07)"
+       inkscape:export-xdpi="84"
+       inkscape:export-ydpi="84" />
+    <path
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 286.60612,776.1666 203.34679,645.65195"
+       id="path4211"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="color:#000000;font-style:normal;font-weight:normal;font-size:155.92054749px;line-height:125%;font-family:Sans;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       x="534.43378"
+       y="630.10577"
+       id="text4230"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4232"
+         x="534.43378"
+         y="630.10577"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60.63577271px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">action</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path4258"
+       d="M 529.66155,779.0051 612.92089,648.49045"
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text4260"
+       y="627.26727"
+       x="62.887272"
+       style="color:#000000;font-style:normal;font-weight:normal;font-size:155.92054749px;line-height:125%;font-family:Sans;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60.63577271px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         y="627.26727"
+         x="62.887272"
+         id="tspan4262"
+         sodipodi:role="line">examine</tspan></text>
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#808080;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4196"
+       cx="302.76221"
+       cy="872.01984"
+       r="75.312881" />
+    <circle
+       r="75.312881"
+       cy="872.01984"
+       cx="515.84253"
+       id="circle4222"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#808080;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/adventure-editor/assets-raw/engine/help/helpPie_es.svg b/adventure-editor/assets-raw/engine/help/helpPie_es.svg
new file mode 100644
index 000000000..ea5a2a5ca
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/help/helpPie_es.svg
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1920"
+   height="1080"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   sodipodi:docname="helpPie_es.svg"
+   inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/help/helpDesktop_en.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4237">
+      <stop
+         style="stop-color:#19303f;stop-opacity:1"
+         offset="0"
+         id="stop4239" />
+      <stop
+         id="stop4245"
+         offset="0.91383815"
+         style="stop-color:#070e13;stop-opacity:1" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop4241" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5">
+      <g
+         id="g5600-9-9-5"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 z"
+           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.07579465;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5-0">
+      <g
+         id="g5600-9-9-5-1"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3-9"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 z"
+           style="color:#000000;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2-1"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.07579465;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5-07">
+      <g
+         id="g5600-9-9-5-4"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3-6"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2-0"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5-07-1">
+      <g
+         id="g5600-9-9-5-4-1"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3-6-9"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2-0-1"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4237"
+       id="linearGradient4243"
+       x1="759.34772"
+       y1="-37.33252"
+       x2="772.1897"
+       y2="1114.6675"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.125"
+     inkscape:cx="902.18726"
+     inkscape:cy="-11.02859"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:window-width="1215"
+     inkscape:window-height="1000"
+     inkscape:window-x="1431"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4243);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.97000003;marker:none;enable-background:accumulate"
+       id="rect4032"
+       width="2008.8419"
+       height="1160.0472"
+       x="-28.652262"
+       y="-53.356133"
+       rx="9.5087242"
+       ry="12.763027" />
+  </g>
+  <g
+     inkscape:label="es pie mode"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,27.637817)"
+     style="display:inline">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;enable-background:accumulate"
+       id="rect2990"
+       width="884"
+       height="438"
+       x="45.514717"
+       y="166.01904"
+       rx="5.0104709"
+       ry="4.2065663" />
+    <rect
+       ry="7.74085"
+       rx="5.2145171"
+       y="164.01904"
+       x="977.51471"
+       height="806"
+       width="920"
+       id="rect4026"
+       style="color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:93.44705963px;line-height:0%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;opacity:1;fill:#33b5e5;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       x="1211.0404"
+       y="103.73724"
+       id="text4034"
+       sodipodi:linespacing="0%"><tspan
+         sodipodi:role="line"
+         id="tspan4036"
+         x="1211.0404"
+         y="103.73724"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:93.44705963px;line-height:0%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;fill:#33b5e5;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">INVENTARIO</tspan></text>
+    <flowRoot
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="flowRoot2992"
+       transform="translate(10,-28)"><flowRegion
+         id="flowRegion2994"><use
+           x="0"
+           y="0"
+           xlink:href="#rect2990"
+           id="use2996"
+           width="1920"
+           height="1080" /></flowRegion><flowPara
+         id="flowPara2998"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">1. Cuando se pasa sobre un objeto con el que se puede interactuar aparece su nombre. </flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara3807" /><flowPara
+         id="flowPara3002"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">2. Al pulsar sobre un objeto o personaje, aparecerá un menú para seleccionar la acción a realiza.r.</flowPara><flowPara
+         id="flowPara3016"
+         style="font-size:44px" /></flowRoot>    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:93.44705963px;line-height:0%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;display:inline;opacity:1;fill:#33b5e5;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       x="136.3082"
+       y="103.7374"
+       id="text4034-0"
+       sodipodi:linespacing="0%"><tspan
+         sodipodi:role="line"
+         id="tspan4036-9"
+         x="136.3082"
+         y="103.7374"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:93.44705963px;line-height:0%;font-family:'Paytone One';-inkscape-font-specification:'Paytone One';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;fill:#33b5e5;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1">INTERACCIÓN</tspan></text>
+    <g
+       inkscape:export-ydpi="180"
+       inkscape:export-xdpi="180"
+       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+       id="g3957"
+       transform="matrix(1.96,0,0,1.96,303.8486,-2003.7345)">
+      <g
+         id="g3961"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+         inkscape:export-xdpi="180"
+         inkscape:export-ydpi="180">
+        <g
+           style="stroke:#000000"
+           inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+           inkscape:export-ydpi="180"
+           inkscape:export-xdpi="180"
+           transform="matrix(0.98719379,0,0,0.98719379,-62.944052,-1001.3914)"
+           id="g3963">
+          <rect
+             y="2036.7069"
+             x="434.91745"
+             height="101.29723"
+             width="101.29723"
+             id="rect3965"
+             style="color:#000000;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <g
+             style="stroke:#000000"
+             id="g3967"
+             transform="matrix(-1,0,0,-1,973.18233,4018.141)"
+             inkscape:export-xdpi="59"
+             inkscape:export-ydpi="59" />
+        </g>
+        <rect
+           ry="4.7680097"
+           rx="4.7680097"
+           y="1044.7312"
+           x="388.6716"
+           height="33.646881"
+           width="56.62524"
+           id="rect3969"
+           style="fill:#ffffff;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3971"
+           d="m 408.6195,1038.0421 c -0.93834,0 -1.69131,0.7529 -1.69131,1.6913 l 0,8.5661 c 0,0.9383 0.75297,1.6912 1.69131,1.6912 l 16.725,0 c 0.93833,0 1.69129,-0.7529 1.69129,-1.6912 l 0,-8.5661 c 0,-0.9384 -0.75296,-1.6913 -1.69129,-1.6913 l -16.725,0 z m 2.50562,1.7851 11.71376,0 c 0.65731,0 1.19017,0.5329 1.19017,1.1903 l 0,5.9978 c 0,0.6573 -0.53286,1.1902 -1.19017,1.1902 l -11.71376,0 c -0.65732,0 -1.19018,-0.5329 -1.19018,-1.1902 l 0,-5.9978 c 0,-0.6574 0.53286,-1.1903 1.19018,-1.1903 z"
+           style="fill:#ffffff;stroke:none" />
+      </g>
+    </g>
+    <flowRoot
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="flowRoot4032"
+       transform="translate(4,6)"><flowRegion
+         id="flowRegion4034"><use
+           x="0"
+           y="0"
+           xlink:href="#rect4026"
+           id="use4036"
+           width="1920"
+           height="1080" /></flowRegion><flowPara
+         id="flowPara4038"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">1. Algunos objetos de la escena se podrán coger. El jugador dispone de un inventario con los objetos que posee.</flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4040" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4042">2. Al igual que los objetos de la escena, los objetos del inventario se pueden examinar y manipular.  </flowPara><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4044" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:44px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         id="flowPara4046">3. También se puede usar/combinar un objeto del inventario con otro objeto de la escena o del mismo inventario <flowSpan
+   style="fill:#ff0000"
+   id="flowSpan3040">arrastrándolo</flowSpan> sobre el objeto con el que se quiere usar.</flowPara></flowRoot>    <flowRoot
+       xml:space="preserve"
+       id="flowRoot4193"
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:180px;line-height:125%;letter-spacing:0px;word-spacing:0px"><flowRegion
+         id="flowRegion4195"><rect
+           id="rect4197"
+           width="196"
+           height="388"
+           x="172"
+           y="608" /></flowRegion><flowPara
+         id="flowPara4199" /></flowRoot>    <path
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 295.6525,803.53819 212.39317,673.02354"
+       id="path4211"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="color:#000000;font-style:normal;font-weight:normal;font-size:155.92054749px;line-height:125%;font-family:Sans;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       x="543.48016"
+       y="657.47736"
+       id="text4230"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4232"
+         x="543.48016"
+         y="657.47736"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60.63577271px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'">acción</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path4258"
+       d="M 538.70793,806.37669 621.96727,675.86204"
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text4260"
+       y="654.63885"
+       x="71.933655"
+       style="color:#000000;font-style:normal;font-weight:normal;font-size:155.92054749px;line-height:125%;font-family:Sans;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:60.63577271px;font-family:'Architects Daughter';-inkscape-font-specification:'Architects Daughter'"
+         y="654.63885"
+         x="71.933655"
+         id="tspan4262"
+         sodipodi:role="line">examinar</tspan></text>
+    <g
+       style="display:inline"
+       id="g975"
+       transform="matrix(0.97870806,0,0,0.97870806,-151.34363,-847.70208)"
+       inkscape:export-xdpi="84"
+       inkscape:export-ydpi="84">
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
+         d="m 442.86429,1754.1491 c 10.78295,-2.0415 22.63506,-3.5484 31.72963,-6.4341 17.41543,4.5145 34.8732,6.2578 52.61828,9.7833 l -0.79324,5.6408 c -13.94799,-3.6905 -30.86751,-7.0314 -52.79456,-9.7833 -14.53933,2.2933 -27.21975,5.5161 -39.92644,8.7257 z"
+         id="path977"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
+         d="m 469.53272,1756.2959 c -12.32701,5.3522 -23.74909,10.1265 -35.83835,9.8143 l -0.76134,5.3571 c 8.03045,0.5053 15.01189,3.1755 19.07502,11.9461 0,0 -2.79705,8.0239 -3.50216,9.7867 -0.40755,1.0188 10.0109,4.9058 17.9261,9.2745 5.7789,3.1895 9.70362,7.3365 9.70362,7.3365 l -14.9361,-26.7161 c 30.24932,16.4667 62.28535,27.4255 70.27709,9.4129 4.42574,-9.9751 -6.88933,-18.2849 -10.71262,-10.1604 0,0 5.16501,-2.3834 6.00766,1.4396 4.44189,20.1524 -29.73454,11.8551 -43.36869,0.2354 -1.49294,-1.2724 46.44174,-11.7994 46.44174,-10.1189 l 1.61958,-5.8001 c -18.13025,4.301 -40.95965,-10.4622 -61.93155,-11.8076 z m 2.9623,9.4544 c 11.19809,-0.067 24.28852,1.3987 36.94576,6.0077 0.93698,0.3412 -27.67125,6.6029 -27.67125,6.6029 l -32.91758,-9.9667 c 5.34462,-1.3315 13.7624,-2.5851 23.64307,-2.6439 z"
+         id="path979"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccssccscsscccssccs" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.01290548;marker:none;enable-background:accumulate"
+         d="m 470.73702,1761.8052 c -0.83593,1.3734 -1.3012,2.9024 -1.3012,4.5265 0,5.8124 5.99006,10.5342 13.38574,10.5342 7.39568,0 13.38574,-4.7218 13.38574,-10.5342 0,-0.3491 -0.027,-0.684 -0.0692,-1.0244 -7.51389,-0.9914 -19.42592,-2.5902 -25.40108,-3.5021 z"
+         id="path981"
+         inkscape:connector-curvature="0" />
+    </g>
+    <ellipse
+       ry="178.28075"
+       rx="173.90331"
+       cy="549.35583"
+       cx="353.77585"
+       transform="matrix(0.32174912,0,0,0.31384895,428.77142,720.6092)"
+       id="path983"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#9d9d9d;stroke-width:2.49233365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       clip-path="url(#clipPath5598-8-0-5-07-1)"
+       inkscape:export-xdpi="84"
+       inkscape:export-ydpi="84" />
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#808080;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4196"
+       cx="321.45984"
+       cy="892.36218"
+       r="75.312881" />
+    <circle
+       r="75.312881"
+       cy="892.36218"
+       cx="534.54016"
+       id="circle4222"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#808080;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/adventure-editor/assets-raw/engine/ios-default-images.svg b/adventure-editor/assets-raw/engine/ios-default-images.svg
new file mode 100644
index 000000000..824f9d447
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/ios-default-images.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1536"
+   height="2008"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92+devel unknown"
+   sodipodi:docname="ios-default-images.svg"
+   inkscape:export-filename="/home/rgarcia/Dropbox/prj/2013.Proyecto Indiana/editor/project_tmpl/assets/icons/icon128.png"
+   inkscape:export-xdpi="15.481997"
+   inkscape:export-ydpi="15.481997"
+   viewBox="0 0 1536 2008">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.13972699"
+     inkscape:cx="1406.4589"
+     inkscape:cy="5.7142857"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:window-width="1215"
+     inkscape:window-height="1000"
+     inkscape:window-x="1431"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <defs
+     id="defs4">
+    <clipPath
+       id="clipPath1216"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         style="fill:none;stroke:#ff0000;stroke-width:0.77522433px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 179.28039,165.89389 c 0,0 15.82633,4.09044 31.978,2.90709 10.07686,-0.73828 41.1838,-9.20579 41.1838,-9.20579 0,0 -25.69177,26.43254 -41.1838,27.13285 -13.66924,0.61792 -31.978,-20.83415 -31.978,-20.83415 z"
+         id="path1218"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cscsc" />
+    </clipPath>
+    <clipPath
+       id="clipPath1216-0"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         style="fill:none;stroke:#ff0000;stroke-width:0.77522433px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 179.28039,165.89389 c 0,0 15.82633,4.09044 31.978,2.90709 10.07686,-0.73828 41.1838,-9.20579 41.1838,-9.20579 0,0 -25.69177,26.43254 -41.1838,27.13285 -13.66924,0.61792 -31.978,-20.83415 -31.978,-20.83415 z"
+         id="path1218-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cscsc" />
+    </clipPath>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg"
+     transform="translate(0,1263.91)">
+    <path
+       style="fill:#e6e6e6"
+       d="m 1064.0226,-335.95305 c 0,3.93525 -2.0348,7.26581 -3.153,10.03459 -4.6983,5.21519 -2.3112,2.13799 -4.442,-3.46373 0.5487,3.18524 0.3089,-0.73991 -1.8543,-4.10084 0,-1.16987 -0.5719,-3.45267 -1.2702,-5.07327 -0.6912,-1.62015 -1.3962,-3.48598 -1.5516,-4.14575 -0.1545,-0.6597 -1.2047,-3.63073 -2.3321,-6.60175 -1.1322,-2.97097 -2.5631,-6.7909 -3.1915,-8.48877 -1.0724,-2.89912 -3.7572,-8.16735 -7.2447,-14.21123 -1.5067,-2.61195 -2.6119,-4.11141 -5.2996,-7.19391 -0.7625,-0.87788 -1.3933,-1.94834 -1.3933,-2.37836 0,-0.42951 -0.1883,-0.59312 -0.4344,-0.36196 -0.2364,0.23167 -1.8778,-0.92616 -3.6452,-2.57235 -1.7664,-1.64625 -3.6312,-2.98165 -4.1423,-2.96714 -2.7876,0.0772 -6.4545,5.4999 -16.6808,24.66862 -2.6042,4.88118 -5.2282,9.55967 -5.831,10.39706 -0.6076,0.83733 -1.0965,2.11048 -1.0965,2.82961 0,0.71906 -0.2896,1.42321 -0.62017,1.56463 -13.7894,28.7873 -23.5697,47.21369 -35.194,75.17284 0,0.29922 -1.0487,2.19543 -2.3325,4.21714 -2.9903,5.2393 -3.6486,8.04575 -7.4048,12.70058 -0.3475,0.4247 -1.6757,2.09507 -2.957,3.71279 -5.1501,6.50185 -10.1949,8.89083 -16.92455,8.01538 -1.91458,-0.25099 -12.21075,-4.75672 -24.99444,-10.94246 -11.95543,-5.78561 -21.97751,-10.46992 -22.26903,-10.4096 -0.28955,0.058 -0.75047,-0.21235 -1.01301,-0.60374 -0.92952,-1.36194 -28.1116,-14.0708 -29.01845,-13.56793 -0.49903,0.2799 -0.64333,0.22681 -0.33299,-0.12064 0.58443,-0.62406 -12.42842,-7.50041 -14.31114,-7.56361 -0.54822,0 -0.98936,-0.38127 -0.98936,-0.80503 0,-0.4247 -0.20269,-0.57238 -0.45368,-0.32818 -0.57188,0.55794 1.86391,5.21615 2.73168,5.21615 0.36196,0 0.64332,0.48599 0.64332,1.07916 9.8903,24.57692 25.12318,52.20108 35.26253,73.84321 2.70994,5.76635 5.7022,11.36084 6.65049,12.43277 1.01403,1.14959 4.2514,2.81413 7.88509,4.0603 3.38656,1.16161 7.00953,2.76104 8.04962,3.55494 1.03762,0.79344 2.0656,1.27412 2.27749,1.06854 0.21714,-0.20755 8.05056,3.41307 17.41626,8.04237 22.86217,11.30001 24.10057,11.94142 24.77477,12.83286 0.3234,0.4247 0.5961,0.45847 0.5961,0.0724 0,-0.38613 0.6433,-0.1931 1.4054,0.42471 0.7624,0.61819 3.54,2.10178 6.1659,3.29672 2.6264,1.19545 5.9999,3.06371 7.4984,4.15151 1.4967,1.08831 2.4132,1.48167 2.0352,0.87403 -0.5834,-0.94689 -0.4994,-0.9522 0.6675,-0.0486 23.5866,11.70547 45.53467,26.41861 69.54837,36.47161 5.5752,3.03276 10.8184,4.8421 17.7344,7.52786 v -3.62638 c 1.4965,-12.21031 2.9955,1.95653 3.4521,6.02016 1.64,14.739227 0.5246,71.249137 -1.4488,73.159827 -1.9976,1.93675 -2.8923,-7.50763 -3.0748,-32.45037 -0.1255,-10.07951 -0.1641,-18.32698 -0.2172,-18.32794 0,0 -1.7972,2.11579 -3.8947,4.70356 -2.0965,2.58783 -4.5762,5.45315 -5.5081,6.36675 -0.9296,0.9136 -2.4049,2.75527 -3.2688,4.09261 -0.8702,1.33734 -3.4604,4.63653 -5.7688,7.33099 -2.3098,2.69495 -4.5747,5.34694 -5.0332,5.89327 -0.4633,0.54633 -2.6506,3.15054 -4.8682,5.78757 -4.6809,5.56412 -10.4454,10.913 -13.5032,12.52832 -2.0057,1.05935 -2.1742,1.02267 -2.7389,-0.60134 -0.9652,-2.77603 -0.1255,-6.0564 4.3508,-16.36756 0.7273,-1.68434 1.3518,-3.24706 1.3885,-3.47293 0.1255,-0.51399 1.0015,-2.79968 2.3036,-5.81267 0.5487,-1.27363 1.652,-4.05159 2.4397,-6.17367 0.7861,-2.12208 1.678,-4.20603 1.9806,-4.63025 0.6675,-0.93966 1.8745,-5.18236 1.6979,-5.97241 -0.1256,-0.31373 0.3956,-1.87645 1.0135,-3.47243 2.0863,-5.29098 2.8493,-14.014797 1.8919,-21.636807 -5.3335,-6.74944 -13.7509,-11.51 -20.55,-14.44917 -0.8817,-0.76831 -1.5969,-1.08249 -1.6028,-0.69884 0,0.38613 -0.2895,0.31373 -0.5961,-0.15927 -9.03937,-4.53029 -19.07497,-9.4849 -27.64097,-13.37673 -10.3845,-4.81076 -15.9114,-7.22627 -17.0297,-7.44151 -0.6202,-0.11583 -1.4136,-0.67134 -1.778,-1.23018 -0.3668,-0.55889 -0.6679,-0.74854 -0.6679,-0.4199 0,0.32818 -1.3547,-0.0676 -2.9966,-0.87884 -1.6414,-0.81033 -4.5072,-1.91406 -6.3667,-2.45319 -1.8605,-0.53856 -3.3818,-1.21425 -3.3818,-1.50042 0,-0.28476 -0.4391,-0.52558 -0.9893,-0.53088 -0.5478,-0.006 -5.29242,-1.66218 -10.54283,-3.68241 -10.82709,-4.16405 -21.80906,-8.27839 -28.25305,-10.58383 -2.40587,-0.86099 -5.0921,-1.86052 -5.96709,-2.22102 -0.88172,-0.36196 -3.56218,-1.39961 -5.9676,-2.30984 -2.40872,-0.90974 -5.98884,-2.33634 -7.95839,-3.16983 -1.97056,-0.83303 -3.9401,-1.56367 -4.37884,-1.62303 -0.43435,-0.058 -1.15585,-0.39579 -1.59066,-0.74132 -19.99253,-13.2518 -33.69649,-36.67622 -48.61718,-52.96603 0.22201,-0.35716 -1.45219,-2.70174 -3.73256,-5.20893 -2.28184,-2.50723 -4.41983,-4.90586 -4.75332,-5.33006 -1.74757,-2.22824 -9.53754,-11.65576 -13.72091,-16.60213 -2.62493,-3.10662 -6.17026,-7.4135 -7.87728,-9.5713 -1.70656,-2.15776 -3.33541,-4.09696 -3.61916,-4.30931 -0.28475,-0.21235 -2.2881,-2.64284 -4.45603,-5.40148 -2.16747,-2.75867 -4.52696,-5.58438 -5.24461,-6.27939 -6.64618,-5.87829 -11.80153,-15.05725 -21.64068,-26.51896 -0.82239,-0.84845 -2.03425,-2.32143 -2.69302,-3.27312 -0.65588,-0.95124 -1.52556,-1.53278 -1.92565,-1.29292 -0.41023,0.24126 -0.63224,0.10617 -0.51254,-0.29928 0.34748,-1.15438 -3.35276,-5.64904 -4.21907,-5.13019 -1.32382,-2.53909 -3.47968,-4.88317 -5.89278,-7.68719 -1.52556,-1.52171 -2.57285,-2.76737 -2.33105,-2.76737 0.25096,0 0,-0.44882 -0.6081,-0.99416 -1.34555,-1.2722 -8.28947,-4.1375 -11.39755,-4.70216 -1.31224,-0.23652 -4.53131,-0.95219 -7.15434,-1.58637 -8.55396,-2.06898 -23.51854,-3.40974 -43.37881,-3.88703 -10.72332,-0.25578 -21.2869,-0.64813 -23.47461,-0.8663 l -3.98065,-0.39573 5.57136,5.12008 c 5.23787,4.8146 9.62344,7.82087 10.913,7.48206 0.30887,-0.0821 0.38126,0.34265 0.14478,0.93967 0.47779,1.88847 1.96764,2.42179 3.67273,3.44492 0.21235,0.25578 1.09651,0.98405 1.94255,1.62111 1.21813,0.91267 1.40393,0.92809 0.87016,0.0724 -0.45366,-0.73601 -0.38127,-0.9073 0.25096,-0.53331 0.51254,0.30407 0.91746,0.90831 0.91746,1.34607 0,1.05691 4.14232,5.28081 4.79434,4.88938 0.28474,-0.16893 0.51254,0.18343 0.51254,0.78333 0,0.59939 -0.39574,0.87206 -0.87016,0.60521 -0.47779,-0.26545 -0.28475,0.18338 0.42953,0.99851 0.71524,0.81564 1.57238,2.34842 1.9049,3.40584 0.33301,1.05742 1.59457,4.00912 2.80016,6.55979 1.20752,2.55016 4.40246,9.67218 7.10174,15.82653 2.6993,6.15434 5.7538,13.0997 6.7866,15.43421 1.03715,2.33442 2.64331,6.13554 3.57766,8.4468 0.93001,2.31126 3.94252,9.0829 6.68718,15.04805 2.74465,5.96565 5.63554,12.31259 6.428,14.10505 0.78668,1.79247 1.75433,3.06851 2.14139,2.83639 0.39575,-0.23167 0.65587,-0.13515 0.59604,0.21235 -0.32336,1.7958 0.33783,2.6674 3.05836,4.05301 4.24318,2.15974 9.17748,7.04578 12.5452,12.42261 1.67662,2.6752 3.26058,4.41067 3.75623,4.11389 0.47779,-0.28962 0.63126,-0.15446 0.33301,0.30887 -0.28475,0.45362 0,2.67565 0.5719,4.94246 0.97731,3.63655 0.95318,4.20268 -0.1303,4.80839 -0.76254,0.42471 -1.77942,0.35231 -2.68772,-0.19789 -1.75528,-1.06323 -1.791,-0.81174 -0.35713,2.52022 1.28714,2.98695 0.88223,3.91984 -2.16407,5.04486 -1.40394,0.51784 -2.03665,0.53517 -1.72778,0.048 0.27509,-0.42471 0.14479,-0.76928 -0.29922,-0.76928 -0.42953,0 -0.89382,0.78136 -1.03715,1.73599 -0.33301,2.2702 -4.30303,2.93623 -4.86915,0.81654 -0.34748,-1.27943 -0.38127,-1.28326 -0.46332,-0.048 -0.12065,0.97151 -0.77459,1.35086 -2.51685,1.35086 -1.90586,0 -2.63269,-0.46819 -3.3822,-2.17712 -0.52461,-1.19737 -2.29919,-3.3161 -3.93866,-4.70797 -1.63993,-1.39233 -2.81367,-2.79386 -2.61097,-3.11431 0.2027,-0.31853 -0.35713,-2.9773 -1.24178,-5.90292 -1.02508,-3.38076 -1.5579,-7.14856 -1.45799,-10.33578 0.30888,-10.18713 0.17856,-11.15047 -2.60374,-16.97758 -1.51445,-3.18338 -3.74175,-8.04531 -4.9507,-10.80443 -6.40629,-14.63159 -8.81843,-19.73095 -9.56938,-20.22467 -0.45366,-0.29921 -0.83397,-0.99851 -0.84604,-1.55114 0,-2.13511 -4.65341,-12.10845 -5.41981,-11.64997 -0.43919,0.26544 -0.56033,0.10617 -0.27509,-0.3523 -2.56706,-7.45021 -5.02408,-12.35795 -8.18861,-19.33087 -4.03373,-9.927 -6.31604,-13.75653 -9.35751,-15.70826 -1.66938,-1.07097 -3.39137,-2.03763 -3.82862,-2.14816 -0.42953,-0.11098 -1.69255,-0.81756 -2.78665,-1.56994 -11.31646,-6.19157 -21.17831,-12.12537 -31.80945,-17.80915 -17.23,-9.48638 -20.52291,-10.81409 -30.53244,-12.30345 -12.14223,-1.80788 -15.8748,-2.58923 -24.67344,-5.16351 l -7.03853,-2.05937 -2.90922,3.12882 c -9.53463,10.25519 -11.24504,12.76627 -11.54426,16.95686 -0.12066,0.91458 -0.39576,1.50188 -0.71476,1.30501 -1.04873,-0.62983 -0.61968,5.38987 0.66746,9.37969 1.71716,5.31464 2.12594,7.96471 1.56224,10.1437 -0.52461,2.04774 -5.51682,6.96372 -7.7668,7.65629 -0.7746,0.24133 -1.42614,0.763 -1.42614,1.15874 0,0.39579 -0.64381,0.72008 -1.4218,0.72008 -0.7746,0 -2.06657,1.06227 -2.85662,2.36096 -1.78858,2.93438 -4.63942,4.0381 -8.81746,3.41358 -3.16983,-0.47294 -17.65813,-2.97436 -22.31873,-3.85223 -10.385,-1.95659 -12.3189,-2.12404 -13.5085,-1.16698 -0.667,0.53715 -1.2143,1.29631 -1.2143,1.68674 0,0.39092 -0.3571,1.1293 -0.7867,1.64189 -0.4392,0.51253 -1.4237,1.73068 -2.1891,2.70649 -0.7746,0.97586 -2.8253,2.10953 -4.5748,2.51932 -6.7263,1.57333 -9.8975,2.03853 -9.4839,1.39086 0.2364,-0.36676 0,-0.66841 -0.4054,-0.66841 -1.5029,0 -7.8474,-4.98595 -8.3508,-6.55973 -1.1795,-3.70851 -2.8528,-19.07458 -2.8528,-26.21015 0,-7.95257 0.6318,-9.96993 3.9421,-12.5703 1.0728,-0.83733 1.013,-0.90685 -0.3572,-0.52026 -1.5921,0.44402 -1.5921,0.44402 0,-0.51784 0.8823,-0.52992 2.1071,-1.66358 2.7374,-2.51927 1.4793,-2.01108 3.0285,-3.43193 6.8421,-6.27983 1.7051,-1.27367 3.7968,-2.9778 4.6462,-3.78808 1.4686,-1.40057 2.1134,-1.42858 13.1557,-0.57098 14.1374,1.09751 23.1696,1.09265 27.9259,0 1.97,-0.45848 5.551,-0.87788 7.95981,-0.93097 4.03277,-0.0869 4.64183,-0.3571 7.75762,-3.38122 1.8605,-1.80646 3.3822,-3.46813 3.3822,-3.69251 10.51724,-10.47235 22.58467,-27.58802 34.84417,-32.77763 6.58437,-3.51777 14.42839,-7.42123 21.06489,-9.61858 2.95653,-0.92419 5.23063,-1.82719 5.05399,-2.00622 -0.16891,-0.17859 2.18579,-0.41991 5.24993,-0.53332 3.06367,-0.11583 6.16209,-0.514 6.88312,-0.88849 3.08201,-1.60039 11.15237,-8.40049 10.63308,-8.95888 -0.30888,-0.33299 -0.14479,-0.37162 0.38126,-0.0821 0.52413,0.29441 2.29872,-0.59843 3.97776,-1.99708 7.70695,-7.95743 7.80491,-6.03563 13.29617,-12.30198 -0.35714,-0.55595 -0.2027,-0.6684 0.40539,-0.30401 0.6081,0.36196 3.59069,-1.93433 8.10753,-6.24753 3.93045,-3.75284 7.76052,-7.06894 8.51148,-7.3686 1.77797,-0.70998 15.38881,-3.44159 41.55547,-8.34164 11.59783,-2.17177 26.81772,-5.18526 33.82149,-6.6963 7.00232,-1.51161 13.52975,-2.91647 14.50224,-3.1221 1.82333,-0.38608 3.10806,-1.45654 8.57566,-7.15094 1.75094,-1.82387 4.61577,-3.97394 6.36623,-4.7775 1.75095,-0.80355 4.43576,-2.19396 5.96808,-3.08974 2.25045,-1.31512 4.16162,-1.64184 9.94773,-1.7017 6.94638,-0.0724 7.1597,0 7.06656,1.66313 -0.12069,1.54583 0.2847,1.73644 3.32762,1.73644 3.95892,0 9.01778,2.71038 9.0689,4.86 0,2.03035 -3.5868,4.97099 -9.89126,7.99652 -6.6235,3.17948 -6.45311,3.0371 -5.29482,4.3904 1.2321,1.43914 0.40539,3.32135 -1.7461,3.93141 -0.95321,0.27024 -5.24032,0.70461 -9.52162,0.96136 -6.30929,0.37647 -8.71563,0.19309 -12.6649,-0.96423 l -4.87542,-1.43147 -10.43231,2.05644 c -5.7369,1.13123 -19.37766,4.16545 -30.31043,6.74318 -10.93182,2.57715 -23.09817,5.43912 -27.03828,6.35896 -3.93962,0.92035 -7.28273,1.95415 -7.42993,2.2968 -0.14478,0.34265 -0.51254,0.46814 -0.83445,0.28476 -1.12064,-0.67134 -13.98872,2.57958 -14.87626,3.75865 -0.50096,0.66213 -1.22634,1.21137 -1.61629,1.22097 -0.39575,0 -2.8576,1.94162 -5.48304,4.29343 -2.62691,2.35176 -5.84935,5.23541 -7.16256,6.40867 -5.37204,4.79918 -10.73732,11.04575 -10.2296,11.90815 0.29922,0.49999 0.25096,0.65785 -0.12066,0.35231 -0.59603,-0.52072 -5.14858,3.80835 -5.17561,4.92032 0,0.71286 5.8701,1.24566 33.01311,2.98645 32.20664,2.06564 45.69393,3.42419 64.45865,6.49269 9.18715,1.50241 25.71879,5.93573 30.52038,8.18476 1.77073,0.83009 3.91936,1.61292 4.77552,1.73937 0.85762,0.12543 2.03762,0.60662 2.62738,1.06702 10.6374,2.69016 12.6678,7.63071 22.25696,11.38163 0.58397,-0.34745 0.73888,-0.24128 0.40539,0.28475 -0.32333,0.51061 2.08925,2.48645 6.04241,4.94252 3.62011,2.25044 8.19486,5.21807 10.16641,6.59402 1.97099,1.37595 5.55349,3.76396 7.95935,5.3064 2.40925,1.54295 7.49798,5.01826 11.31357,7.72339 3.81315,2.70507 7.32663,4.91835 7.80488,4.91835 0.47779,0 0.68004,0.28955 0.45368,0.64717 -0.22681,0.35716 0.91798,1.38323 2.53954,2.28183 1.62304,0.89912 4.34742,2.85423 6.05303,4.34506 1.70413,1.49031 3.49564,2.49125 3.97823,2.2244 0.48887,-0.26544 0.61967,-0.20755 0.28956,0.13995 -0.30887,0.34264 1.86001,2.39473 4.84211,4.56073 8.42459,6.11962 22.14111,16.95059 30.75639,24.28446 1.31417,1.11824 5.69973,4.7924 9.74844,8.16402 4.04725,3.37156 7.35995,6.41058 7.35995,6.75232 0,0.34264 0.40056,0.6221 0.89382,0.6221 0.49903,0 1.66021,0.78231 2.58491,1.73886 0.91792,0.95604 2.93578,2.72778 4.46906,3.93672 1.53132,1.20946 2.2818,1.93581 1.66795,1.61485 -0.73849,-0.38607 -0.92907,-0.28475 -0.54778,0.30887 0.30889,0.49034 1.00135,0.89138 1.54584,0.89138 0.53618,0 4.54577,3.28809 8.90528,7.30738 4.35995,4.01926 8.34976,7.31847 8.86567,7.33102 0.5242,0 1.8186,1.11626 2.8948,2.45075 l 1.959,2.42704 0.5723,-2.62013 c 0.9773,-4.4401 3.7693,-11.84979 4.693,-12.44726 0.4889,-0.30887 0.5599,-0.57239 0.1786,-0.57866 -0.3813,0 -0.2896,-0.49711 0.2268,-1.09069 0.5145,-0.59317 1.0492,-1.73599 1.2124,-2.53908 0.164,-0.80311 1.4049,-3.29289 2.7673,-5.53277 1.3619,-2.23982 2.1332,-3.8672 1.7147,-3.61627 -0.941,0.56229 3.1506,-6.72623 4.1428,-7.38356 0.3958,-0.26065 0.6555,-0.7032 0.5956,-0.98553 12.8372,-29.11984 28.5416,-46.97383 41.78037,-72.62649 0.8691,-1.69787 1.7938,-3.26058 2.0656,-3.47294 0.2751,-0.21235 1.4614,-2.18724 2.6433,-4.38893 1.18,-2.20176 2.6612,-4.41452 3.2857,-4.9179 0.6317,-0.50293 1.1322,-1.35037 1.1322,-1.88272 0,-0.5328 0.5241,-1.39814 1.18,-1.92225 0.6433,-0.52461 1.0004,-1.22537 0.7983,-1.55746 -0.2173,-0.33298 0.1785,-0.81078 0.858,-1.06464 0.6796,-0.25578 1.0252,-0.78712 0.7746,-1.18579 -0.5362,-0.8523 11.4516,-12.52686 12.329,-12.00033 0.3283,0.1979 0.7742,-0.0772 1.0005,-0.60233 0.2172,-0.52794 1.776,-1.63749 3.4643,-2.46521 1.6901,-0.82818 3.6997,-2.01058 4.4652,-2.62788 0.7629,-0.61724 1.3923,-0.8711 1.3923,-0.56414 0,0.30887 0.9894,-0.0917 2.1892,-0.88274 5.9859,-3.94107 9.7315,-4.25333 12.1128,-1.00964 1.8324,2.49566 4.2412,8.7803 5.1124,13.34205 0.2992,1.59164 0.9536,2.89377 1.4444,2.89377 0.489,0 0.6555,-0.22681 0.3669,-0.50773 -0.2897,-0.2799 -0.1256,-0.9932 0.4005,-1.58683 0.5145,-0.59363 0.5965,-1.01885 0.1882,-0.94452 -1.8272,0.33784 -2.1023,-0.13995 -0.6795,-1.19059 1.2466,-0.92182 1.3363,-1.27655 0.4633,-1.83301 -0.6433,-0.4102 -0.763,-0.87833 -0.2992,-1.15682 0.4343,-0.25579 0.8103,-1.97777 0.846,-3.82383 0.1254,-3.70698 1.2886,-7.47765 2.4039,-7.47765 2.6709,0 3.362,5.08772 3.6418,26.80609 0.1256,9.32665 0.4537,17.33135 0.7505,17.78791 0.2993,0.45848 0.1593,1.05888 -0.3088,1.33834 -0.584,0.34744 -0.5363,0.86437 0.1448,1.65533 0.5839,0.68388 0.679,1.35765 0.2364,1.66748 0.9527,11.677 -0.5728,19.63347 -1.235,31.61928 z"
+       id="path3004"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccscscscccccsccccccscccccscsccccccsccccccccccccccccccccccccccccccccccccccsscsccsccccsccscscccccccsccssscsccccccscsccccsccsccccsccccccccscccscsccscccccccccccsscccccccssccscsccscscsscccscscscccccsscccccscsscsccscscscccccsssccccsccccsscccccccccscccccccsssccccscccccccccscccccscscccccccsscccsccccsccssccccc" />
+  </g>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Capa 1"
+     transform="translate(0,955.63779)">
+    <g
+       id="g3076"
+       inkscape:label="Gear24"
+       transform="matrix(2.7502377,0,0,2.7502377,350,532.3622)" />
+    <g
+       id="g3961"
+       transform="matrix(1.9837767,0,0,1.9837767,731.79082,-1118.2906)">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;font-size:39.68480682px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+         x="-1019.2473"
+         y="1008.3361"
+         id="text3951"><tspan
+           sodipodi:role="line"
+           id="tspan3953"
+           x="-1019.2473"
+           y="1008.3361"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Sans;-inkscape-font-specification:Sans">BLADE ENGINE</tspan></text>
+      <path
+         inkscape:connector-curvature="0"
+         id="path3955"
+         d="m -1055.8025,955.38754 h 372.1223"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:6.04416943;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:export-xdpi="70"
+         inkscape:export-ydpi="70" />
+      <text
+         id="text3957"
+         y="933.60516"
+         x="-1041.9575"
+         style="font-style:normal;font-weight:normal;font-size:39.68480682px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Sans;-inkscape-font-specification:Sans"
+           y="933.60516"
+           x="-1041.9575"
+           id="tspan3959"
+           sodipodi:role="line">A D V E N T U R E</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/adventure-editor/assets-raw/engine/logo/blade_logo3.svg b/adventure-editor/assets-raw/engine/logo/blade_logo3.svg
new file mode 100644
index 000000000..809f2efa9
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/logo/blade_logo3.svg
@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="544.28125"
+   height="745"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="blade_logo3.svg"
+   inkscape:export-filename="/home/rgarcia/Dropbox/prj/2013.Proyecto Indiana/diosa/assets/ui/blade_logo.png"
+   inkscape:export-xdpi="50"
+   inkscape:export-ydpi="50">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.27945399"
+     inkscape:cx="-795.95696"
+     inkscape:cy="226.53885"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     borderlayer="true"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs4">
+    <clipPath
+       id="clipPath1216"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         style="fill:none;stroke:#ff0000;stroke-width:0.77522433px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 179.28039,165.89389 c 0,0 15.82633,4.09044 31.978,2.90709 10.07686,-0.73828 41.1838,-9.20579 41.1838,-9.20579 0,0 -25.69177,26.43254 -41.1838,27.13285 -13.66924,0.61792 -31.978,-20.83415 -31.978,-20.83415 z"
+         id="path1218"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cscsc" />
+    </clipPath>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg"
+     sodipodi:insensitive="true"
+     transform="translate(-109.96875,209.49124)">
+    <rect
+       transform="translate(0,-308.27218)"
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.12300014;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3019"
+       width="3099.1479"
+       height="2121.3203"
+       x="-1951.6147"
+       y="-571.96313"
+       rx="5.2145171"
+       ry="7.74085" />
+  </g>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Capa 1"
+     transform="translate(-109.96875,-98.78125)">
+    <rect
+       style="color:#000000;fill:#ffffff;stroke:#ffffff;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3818"
+       width="850.12671"
+       height="255.4902"
+       x="-232.88046"
+       y="1260.3752" />
+    <g
+       id="g3076"
+       inkscape:label="Gear24"
+       transform="matrix(2.7502377,0,0,2.7502377,350,532.3622)" />
+    <g
+       id="g3864"
+       transform="matrix(1.7459586,0,0,1.7459586,-1258.0424,354.47009)">
+      <path
+         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3091"
+         d="m 467.8206,609.65869 -12.18702,40.84228 -9.52616,-27.10525 -19.48427,37.9075 -4.38338,-28.39415 -26.11799,33.68182 0.90867,-28.71613 -31.8623,28.30916 6.16977,-28.06022 -36.52158,21.97246 11.22077,-26.44875 -39.93716,14.88752 15.88966,-23.9366 -41.99273,7.29559 20.01745,-20.60932 -42.61828,-0.54477 23.46356,-16.5802 -41.79252,-8.36659 26.11065,-11.98647 -39.54357,-15.90349 27.86859,-6.98456 -35.94801,-22.89882 28.67748,-1.74479 -31.12829,-29.11435 28.5098,3.55439 -25.24852,-34.33843 27.37125,8.73253 -18.50895,-38.39315 25.3006,13.61328 -11.13907,-41.14044 22.36838,18.03047 -3.38987,-42.48675 18.67442,21.83365 4.47477,-42.38621 14.34453,24.8933 12.18702,-40.84228 9.52616,27.10525 19.48426,-37.9075 4.38338,28.39416 26.118,-33.68183 -0.90867,28.71613 31.8623,-28.30916 -6.16977,28.06022 36.52158,-21.97246 -11.22077,26.44875 39.93715,-14.88751 -15.88965,23.9366 41.99272,-7.2956 -20.01744,20.60932 42.61828,0.54477 -23.46356,16.58021 41.79252,8.36658 -26.11066,11.98648 39.54358,15.90348 -27.86859,6.98456 35.94801,22.89882 -28.67747,1.74479 31.12828,29.11435 -28.5098,-3.55438 25.24851,34.33842 -27.37124,-8.73252 18.50894,38.39314 -25.3006,-13.61328 11.13907,41.14044 -22.36837,-18.03047 3.38987,42.48675 -18.67442,-21.83365 -4.47477,42.38622 z"
+         inkscape:transform-center-y="-14.62392"
+         inkscape:transform-center-x="1.4600241"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.54147482;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         transform="matrix(0.66666667,0,0,0.66666667,145.69808,182.55306)"
+         d="m 398.57144,475.21933 c 0,23.66935 -19.1878,42.85714 -42.85715,42.85714 -23.66934,0 -42.85714,-19.18779 -42.85714,-42.85714 0,-23.66935 19.1878,-42.85714 42.85714,-42.85714 23.66935,0 42.85715,19.18779 42.85715,42.85714 z"
+         sodipodi:ry="42.857143"
+         sodipodi:rx="42.857143"
+         sodipodi:cy="475.21933"
+         sodipodi:cx="355.71429"
+         id="path3094"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:39.68480682px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+       x="-1049.1959"
+       y="642.66077"
+       id="text3868"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3870"
+         x="-1049.1959"
+         y="642.66077"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Sans;-inkscape-font-specification:Sans">BLADE ENGINE</tspan></text>
+    <path
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path3091-2"
+       d="m -847.3444,87.394578 -11.56235,38.748832 -9.03788,-25.71592 -18.48556,35.96448 -4.15871,-26.93875 -24.77926,31.95539 0.86209,-27.24423 -30.22913,26.85812 5.85352,-26.62194 -34.64959,20.84622 10.64562,-25.09307 -37.89005,14.12443 15.07515,-22.70968 -39.84035,6.92164 18.9915,-19.552952 -40.4338,-0.51685 22.2609,-15.73035 -39.6504,-7.93774 24.7723,-11.37208 -37.5167,-15.08833 26.4401,-6.62655 -34.1054,-21.7251 27.2076,-1.65536 -29.5328,-27.62204 27.0485,3.37221 -23.9544,-32.57835 25.9683,8.28492 -17.5602,-36.42523 24.0038,12.9155 -10.5682,-39.031708 21.2219,17.106288 -3.2161,-40.309008 17.7172,20.71452 4.2454,-40.21362 13.6093,23.61734 11.56232,-38.74883 9.03788,25.71592 18.48555,-35.96448 4.15871,26.93876 24.77927,-31.9554 -0.8621,27.24423 30.22914,-26.85812 -5.85352,26.62194 34.64959,-20.84622 -10.64562,25.09307 37.89009,-14.12442 -15.07519,22.70968 39.8403,-6.92165 -18.99141,19.55295 40.4338,0.51685 -22.26089,15.73036 39.65037,7.937728 -24.77231,11.3721 37.5167,15.08831 -26.44014,6.62656 34.10543,21.72509 -27.20755,1.65536 29.53274,27.62204 -27.04848,-3.37219 23.95435,32.57834 -25.96827,-8.28492 17.56023,36.42523 -24.00377,-12.91551 10.56811,39.03171 -21.22183,-17.10629 3.21611,40.30902 -17.71723,-20.71453 -4.2454,40.213642 z"
+       inkscape:transform-center-y="-14.62392"
+       inkscape:transform-center-x="1.4600241"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.54147482;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g3914"
+       transform="matrix(0.58836687,0,0,0.58836687,-728.76406,-564.13486)"
+       style="stroke:#000000">
+      <path
+         transform="matrix(0.57462856,0.46212248,-0.46212248,0.57462856,-54.42038,1278.8025)"
+         d="m -511.4286,-21.923536 -88.89131,-75.305595 -102.53725,55.305596 75.30559,-88.891315 -55.3056,-102.53725 88.89131,75.3056 102.53726,-55.3056 -75.3056,88.89131 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.6748963"
+         sodipodi:arg1="0.8894981"
+         sodipodi:r2="30.5742"
+         sodipodi:r1="136.0972"
+         sodipodi:cy="-127.63782"
+         sodipodi:cx="-597.14288"
+         sodipodi:sides="4"
+         id="path3890"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="star" />
+      <path
+         transform="matrix(0.89859155,0,0,0.89859155,56.808851,191.82103)"
+         d="m -315.71429,820.93359 c 0,68.64111 -55.64461,124.28572 -124.28571,124.28572 -68.6411,0 -124.28571,-55.64461 -124.28571,-124.28572 0,-68.6411 55.64461,-124.28571 124.28571,-124.28571 68.6411,0 124.28571,55.64461 124.28571,124.28571 z"
+         sodipodi:ry="124.28571"
+         sodipodi:rx="124.28571"
+         sodipodi:cy="820.93359"
+         sodipodi:cx="-440"
+         id="path3894"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#000000;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path3896"
+         sodipodi:cx="-440"
+         sodipodi:cy="820.93359"
+         sodipodi:rx="124.28571"
+         sodipodi:ry="124.28571"
+         d="m -315.71429,820.93359 c 0,68.64111 -55.64461,124.28572 -124.28571,124.28572 -68.6411,0 -124.28571,-55.64461 -124.28571,-124.28572 0,-68.6411 55.64461,-124.28571 124.28571,-124.28571 68.6411,0 124.28571,55.64461 124.28571,124.28571 z"
+         transform="matrix(1.2591549,0,0,1.2591549,215.45674,-104.17756)" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3898"
+         y="810.93359"
+         x="-351.42859"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="810.93359"
+           x="-351.42859"
+           id="tspan3900"
+           sodipodi:role="line">N</tspan></text>
+      <text
+         transform="matrix(0,1,-1,0,0,0)"
+         xml:space="preserve"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="918.7475"
+         y="221.25978"
+         id="text3902"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3904"
+           x="918.7475"
+           y="221.25978">E</tspan></text>
+      <text
+         transform="matrix(0,-1,1,0,0,0)"
+         sodipodi:linespacing="125%"
+         id="text3906"
+         y="-458.49191"
+         x="-950.42438"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="-458.49191"
+           x="-950.42438"
+           id="tspan3908"
+           sodipodi:role="line">W</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="-352.85715"
+         y="1078.0764"
+         id="text3910"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3912"
+           x="-352.85715"
+           y="1078.0764">S</tspan></text>
+    </g>
+    <g
+       style="stroke:#ffffff"
+       transform="matrix(1.9551237,0,0,1.9551237,-824.79248,-1528.6596)"
+       id="g3927">
+      <path
+         sodipodi:type="star"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path3929"
+         sodipodi:sides="4"
+         sodipodi:cx="-597.14288"
+         sodipodi:cy="-127.63782"
+         sodipodi:r1="136.0972"
+         sodipodi:r2="30.5742"
+         sodipodi:arg1="0.8894981"
+         sodipodi:arg2="1.6748963"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m -511.4286,-21.923536 -88.89131,-75.305595 -102.53725,55.305596 75.30559,-88.891315 -55.3056,-102.53725 88.89131,75.3056 102.53726,-55.3056 -75.3056,88.89131 z"
+         transform="matrix(0.57462856,0.46212248,-0.46212248,0.57462856,-54.42038,1278.8025)" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path3931"
+         sodipodi:cx="-440"
+         sodipodi:cy="820.93359"
+         sodipodi:rx="124.28571"
+         sodipodi:ry="124.28571"
+         d="m -315.71429,820.93359 c 0,68.64111 -55.64461,124.28572 -124.28571,124.28572 -68.6411,0 -124.28571,-55.64461 -124.28571,-124.28572 0,-68.6411 55.64461,-124.28571 124.28571,-124.28571 68.6411,0 124.28571,55.64461 124.28571,124.28571 z"
+         transform="matrix(0.89859155,0,0,0.89859155,56.808851,191.82103)" />
+      <path
+         transform="matrix(1.2591549,0,0,1.2591549,215.45674,-104.17756)"
+         d="m -315.71429,820.93359 c 0,68.64111 -55.64461,124.28572 -124.28571,124.28572 -68.6411,0 -124.28571,-55.64461 -124.28571,-124.28572 0,-68.6411 55.64461,-124.28571 124.28571,-124.28571 68.6411,0 124.28571,55.64461 124.28571,124.28571 z"
+         sodipodi:ry="124.28571"
+         sodipodi:rx="124.28571"
+         sodipodi:cy="820.93359"
+         sodipodi:cx="-440"
+         id="path3933"
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <text
+         xml:space="preserve"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         x="-351.42859"
+         y="810.93359"
+         id="text3935"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3937"
+           x="-351.42859"
+           y="810.93359">N</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3939"
+         y="221.25978"
+         x="918.7475"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"
+         transform="matrix(0,1,-1,0,0,0)"><tspan
+           y="221.25978"
+           x="918.7475"
+           id="tspan3941"
+           sodipodi:role="line">E</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         x="-950.42438"
+         y="-458.49191"
+         id="text3943"
+         sodipodi:linespacing="125%"
+         transform="matrix(0,-1,1,0,0,0)"><tspan
+           sodipodi:role="line"
+           id="tspan3945"
+           x="-950.42438"
+           y="-458.49191">W</tspan></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3947"
+         y="1078.0764"
+         x="-352.85715"
+         style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="1078.0764"
+           x="-352.85715"
+           id="tspan3949"
+           sodipodi:role="line">S</tspan></text>
+    </g>
+    <g
+       id="g3961"
+       transform="matrix(1.1067092,0,0,1.1067092,1344.6583,-360.32826)"
+       style="fill:#ffffff">
+      <text
+         xml:space="preserve"
+         style="font-size:39.68480682px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         x="-1019.2473"
+         y="1008.3361"
+         id="text3951"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3953"
+           x="-1019.2473"
+           y="1008.3361"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:Sans;-inkscape-font-specification:Sans">BLADE ENGINE</tspan></text>
+      <path
+         inkscape:connector-curvature="0"
+         id="path3955"
+         d="m -1055.8025,955.38754 372.1223,0"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:6.04416943;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:export-xdpi="70"
+         inkscape:export-ydpi="70" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3957"
+         y="933.60516"
+         x="-1041.9575"
+         style="font-size:39.68480682px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;font-family:Sans;-inkscape-font-specification:Sans"
+           y="933.60516"
+           x="-1041.9575"
+           id="tspan3959"
+           sodipodi:role="line">A D V E N T U R E</tspan></text>
+    </g>
+    <g
+       id="g3079"
+       transform="matrix(0.74063431,0,0,0.74063431,106.55662,36.414767)">
+      <path
+         sodipodi:nodetypes="ccsc"
+         inkscape:connector-curvature="0"
+         id="path5377-2"
+         d="m 305.83269,390.19253 c -51.19988,-14.49335 -92.22995,-51.02114 -154.72178,-41.04858 0,0 18.73134,44.87307 63.15179,52.10014 51.60886,8.39642 91.56999,-11.05156 91.56999,-11.05156 z"
+         style="fill:#ffffff;stroke:none;display:inline" />
+      <path
+         style="fill:#ffffff;stroke:none;display:inline"
+         d="m 438.26176,393.69439 c 51.19987,-14.49336 92.22994,-51.0211 154.72181,-41.04853 0,0 -18.73138,44.87312 -63.15183,52.10013 -51.60887,8.39642 -91.56998,-11.0516 -91.56998,-11.0516 z"
+         id="path5379-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccsc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6632"
+         sodipodi:cx="241.875"
+         sodipodi:cy="123.125"
+         sodipodi:rx="3.75"
+         sodipodi:ry="3.125"
+         d="m 245.625,123.125 c 0,1.72589 -1.67893,3.125 -3.75,3.125 -2.07107,0 -3.75,-1.39911 -3.75,-3.125 0,-1.72589 1.67893,-3.125 3.75,-3.125 2.07107,0 3.75,1.39911 3.75,3.125 z"
+         transform="matrix(7.3470639,0,0,7.3470639,-1257.2646,-536.16221)" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6632-4"
+         sodipodi:cx="241.875"
+         sodipodi:cy="123.125"
+         sodipodi:rx="3.75"
+         sodipodi:ry="3.125"
+         d="m 245.625,123.125 c 0,1.72589 -1.67893,3.125 -3.75,3.125 -2.07107,0 -3.75,-1.39911 -3.75,-3.125 0,-1.72589 1.67893,-3.125 3.75,-3.125 2.07107,0 3.75,1.39911 3.75,3.125 z"
+         transform="matrix(7.3470639,0,0,7.3470639,-1556.0452,-543.81539)" />
+    </g>
+    <g
+       style="display:inline"
+       clip-path="url(#clipPath1216)"
+       id="g1195"
+       transform="matrix(-3.6276585,0,0,2.4234465,1161.3328,60.164376)">
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.72375;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6614"
+         width="93.753693"
+         height="42.395081"
+         x="169.10558"
+         y="150.14714" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 231.60803,163.47131 c 0,0 -1.45354,7.26773 -0.48451,7.26773 0.96903,0 6.2987,-2.90709 6.2987,-2.90709 l 0,-7.75224 z"
+         id="path6586"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 239.60253,161.04874 -0.48451,5.08741 c 0.99816,0.66851 1.52735,2.27496 4.36064,-0.72678 l 0,-5.81418 z"
+         id="path6588"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 245.90123,159.35293 -0.96903,5.08741 4.11838,-0.24225 0.24226,-5.57193 z"
+         id="path6590"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 243.47866,167.58969 -5.08741,1.21129 -0.96903,2.66483 7.26772,0.72678 z"
+         id="path6592"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 236.45318,177.52225 c -0.24225,-1.45354 -1.45354,-6.54095 -1.45354,-6.54095 -1.50856,0.42306 -1.71891,1.81979 -5.57193,0.48451 l 1.45355,9.44805 z"
+         id="path6594"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 192.3623,166.62066 c 0,0 -1.45354,4.6029 0.24226,4.6029 1.6958,0 4.60289,0 4.60289,0 l -0.24225,-4.6029 z"
+         id="path6598"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 184.85232,165.40937 c -0.96903,1.93806 -0.72678,8.23676 -0.72678,8.23676 0,0 -3.63386,1.45355 -3.63386,0.24226 0,-1.21129 0.48451,-10.41708 0.48451,-10.41708 z"
+         id="path6600"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path1083"
+         d="m 210.53162,178.00677 -0.24226,6.05644 c -2.88798,2.446 -4.4181,0.81843 -6.05644,-0.48452 l -1.21128,-5.32966 1.6958,-3.63387 z"
+         style="fill:#ffffff;stroke:none" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 202.41378,177.60826 c 0.5863,2.18032 -1.89071,6.77463 -1.89071,6.77463 -4.0956,0.93114 -4.08175,-0.85457 -4.39719,-2.42258 l -0.87943,-4.11837 3.01645,-2.73508 z"
+         id="path1085"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         sodipodi:nodetypes="ccsccc"
+         inkscape:connector-curvature="0"
+         id="path1087"
+         d="m 194.54262,176.06871 0.48451,4.36064 c 0,0 -6.78321,-0.96904 -5.32966,-1.93807 1.45354,-0.96903 0.96903,-5.08741 0.96903,-5.08741 l 1.93806,-0.48451 z"
+         style="fill:#ffffff;stroke:none" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 190.6665,173.40387 -2.42258,3.63387 -3.26116,-3.31707 1.08084,-4.67743 3.57221,1.53237 z"
+         id="path1089"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 227.37073,182.64838 -6.01793,-0.27431 -0.28656,-6.0348 6.01793,-4.38894 c 1.53949,4.40227 1.17949,7.97184 0.28656,10.69805 z"
+         id="path1093"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path1095"
+         d="m 219.18265,177.03774 -0.69653,10.41708 c -3.86961,-0.64602 -5.88182,-2.26108 -6.0366,-4.84516 l -0.46435,-4.36063 z"
+         style="fill:#ffffff;stroke:none" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 187.50001,165.93749 0.3125,3.4375 2.8125,0.3125 1.25,-5 z"
+         id="path1081"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 204.00643,173.87262 -6.2987,-2.35473 1.69581,-5.29813 4.60289,-0.29434 z"
+         id="path1129"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:#ffffff;stroke:none"
+         d="m 205.4617,174.34137 -0.79874,-2.18031 1.54814,-8.04898 6.11512,2.29645 -0.48451,7.26773 -2.38,2.62226 z"
+         id="path1131"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path1133"
+         d="m 219.95522,175.52828 2.98993,-11.61037 -10.34497,2.67178 0.54244,10.82086 z"
+         style="fill:#ffffff;stroke:none" />
+      <path
+         style="fill:#ffffff;stroke:none;display:inline"
+         d="m 222.26481,166.63913 c 0,0 -1.07368,7.39693 1.42675,6.51125 2.50044,-0.88568 6.7869,-2.404 6.7869,-2.404 l -1.42674,-6.51125 z"
+         id="path6598-9"
+         inkscape:connector-curvature="0" />
+    </g>
+    <rect
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:12.02757931;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3048"
+       width="532.25098"
+       height="732.97327"
+       x="115.97935"
+       y="104.80016" />
+  </g>
+</svg>
diff --git a/adventure-editor/assets-raw/engine/logo/genlogo b/adventure-editor/assets-raw/engine/logo/genlogo
new file mode 100644
index 000000000..ba824aab8
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/logo/genlogo
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TARGET_DIR=../../../src/main/resources/projectTmpl/android/assets/ui/1
+
+inkscape -d 60 --export-area-page --export-png=$TARGET_DIR/blade_logo.png  blade_logo3.svg;
+
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/back.png b/adventure-editor/assets-raw/engine/ui-atlas/back.png
new file mode 100644
index 000000000..840b894df
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/back.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/border_rect.9.png b/adventure-editor/assets-raw/engine/ui-atlas/border_rect.9.png
new file mode 100644
index 000000000..4e8dce1fe
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/border_rect.9.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/bubblepointer.png b/adventure-editor/assets-raw/engine/ui-atlas/bubblepointer.png
new file mode 100644
index 000000000..20b37d3ec
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/bubblepointer.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/credits.png b/adventure-editor/assets-raw/engine/ui-atlas/credits.png
new file mode 100644
index 000000000..83aaa4bca
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/credits.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/debug.png b/adventure-editor/assets-raw/engine/ui-atlas/debug.png
new file mode 100644
index 000000000..c77b3649c
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/debug.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/delete.png b/adventure-editor/assets-raw/engine/ui-atlas/delete.png
new file mode 100644
index 000000000..f3f26b75a
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/delete.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/dialog_down.png b/adventure-editor/assets-raw/engine/ui-atlas/dialog_down.png
new file mode 100644
index 000000000..05fb0fcf5
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/dialog_down.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/dialog_up.png b/adventure-editor/assets-raw/engine/ui-atlas/dialog_up.png
new file mode 100644
index 000000000..5fdf8ac81
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/dialog_up.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/help.png b/adventure-editor/assets-raw/engine/ui-atlas/help.png
new file mode 100644
index 000000000..00cf2fbee
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/help.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/hotspot.png b/adventure-editor/assets-raw/engine/ui-atlas/hotspot.png
new file mode 100644
index 000000000..10fed4441
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/hotspot.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/hotspotpointer.png b/adventure-editor/assets-raw/engine/ui-atlas/hotspotpointer.png
new file mode 100644
index 000000000..2d68e479c
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/hotspotpointer.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/inv_down.png b/adventure-editor/assets-raw/engine/ui-atlas/inv_down.png
new file mode 100644
index 000000000..9d28436b8
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/inv_down.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/inv_up.png b/adventure-editor/assets-raw/engine/ui-atlas/inv_up.png
new file mode 100644
index 000000000..466c02783
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/inv_up.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/inventory.png b/adventure-editor/assets-raw/engine/ui-atlas/inventory.png
new file mode 100644
index 000000000..abb245869
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/inventory.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/leave.png b/adventure-editor/assets-raw/engine/ui-atlas/leave.png
new file mode 100644
index 000000000..3bc38d948
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/leave.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/lookat.png b/adventure-editor/assets-raw/engine/ui-atlas/lookat.png
new file mode 100644
index 000000000..ce795bc42
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/lookat.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/menu.png b/adventure-editor/assets-raw/engine/ui-atlas/menu.png
new file mode 100644
index 000000000..c3ad50826
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/menu.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/pack.json b/adventure-editor/assets-raw/engine/ui-atlas/pack.json
new file mode 100644
index 000000000..5887d455c
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/ui-atlas/pack.json
@@ -0,0 +1,26 @@
+{
+        pot: false,
+        paddingX: 2,
+        paddingY: 2,
+        duplicatePadding: true,
+        edgePadding: true,
+        rotation: false,
+        minWidth: 16,
+        minHeight: 16,
+        maxWidth: 4096,
+        maxHeight: 4096,
+        stripWhitespaceX: true,
+        stripWhitespaceY: true,
+        alphaThreshold: 0,
+        filterMin: Linear,
+        filterMag: Linear,
+        wrapX: ClampToEdge,
+        wrapY: ClampToEdge,
+        format: RGBA8888,
+        alias: true,
+        outputFormat: png,
+        jpegQuality: 0.9,
+        ignoreBlankImages: true,
+        fast: false,
+        debug: false,
+}
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/pickup.png b/adventure-editor/assets-raw/engine/ui-atlas/pickup.png
new file mode 100644
index 000000000..394b103b0
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/pickup.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/plus.png b/adventure-editor/assets-raw/engine/ui-atlas/plus.png
new file mode 100644
index 000000000..334b5a5c0
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/plus.png differ
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/pointer.png b/adventure-editor/assets-raw/engine/ui-atlas/pointer.png
new file mode 100644
index 000000000..9178819f8
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/pointer.png differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/border_black_rect4.9.png b/adventure-editor/assets-raw/engine/ui-atlas/rect.9.png
similarity index 100%
rename from adventure-composer/assets-raw/engine/ui-atlas/images/border_black_rect4.9.png
rename to adventure-editor/assets-raw/engine/ui-atlas/rect.9.png
diff --git a/adventure-editor/assets-raw/engine/ui-atlas/talkto.png b/adventure-editor/assets-raw/engine/ui-atlas/talkto.png
new file mode 100644
index 000000000..7cc7beb6a
Binary files /dev/null and b/adventure-editor/assets-raw/engine/ui-atlas/talkto.png differ
diff --git a/adventure-composer/assets-raw/engine/ui-atlas/images/white_pixel.png b/adventure-editor/assets-raw/engine/ui-atlas/white_pixel.png
similarity index 100%
rename from adventure-composer/assets-raw/engine/ui-atlas/images/white_pixel.png
rename to adventure-editor/assets-raw/engine/ui-atlas/white_pixel.png
diff --git a/adventure-editor/assets-raw/engine/ui.svg b/adventure-editor/assets-raw/engine/ui.svg
new file mode 100644
index 000000000..e0c41219b
--- /dev/null
+++ b/adventure-editor/assets-raw/engine/ui.svg
@@ -0,0 +1,1347 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1920"
+   height="1080"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   sodipodi:docname="ui.svg"
+   inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/bubblepointer.png"
+   inkscape:export-xdpi="84"
+   inkscape:export-ydpi="84"
+   viewBox="0 0 1920 1080">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6b6b6b"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.65650333"
+     inkscape:cx="374.24078"
+     inkscape:cy="382.14946"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1248"
+     inkscape:window-height="1028"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     borderlayer="true"
+     inkscape:showpageshadow="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs4">
+    <inkscape:path-effect
+       cusp_linecap_type="round"
+       end_linecap_type="zerowidth"
+       miter_limit="4"
+       linejoin_type="round"
+       start_linecap_type="zerowidth"
+       interpolator_beta="0.2"
+       interpolator_type="CubicBezierJohan"
+       sort_points="true"
+       offset_points="0,5"
+       is_visible="true"
+       id="path-effect4179"
+       effect="powerstroke" />
+    <inkscape:path-effect
+       cusp_linecap_type="round"
+       end_linecap_type="zerowidth"
+       miter_limit="4"
+       linejoin_type="round"
+       start_linecap_type="zerowidth"
+       interpolator_beta="0.2"
+       interpolator_type="CubicBezierJohan"
+       sort_points="true"
+       offset_points="0.013444712,6.2466648"
+       is_visible="true"
+       id="path-effect4176"
+       effect="powerstroke" />
+    <inkscape:path-effect
+       effect="powerstroke"
+       id="path-effect4172"
+       is_visible="true"
+       offset_points="0.0074719083,5.4253621"
+       sort_points="true"
+       interpolator_type="CubicBezierJohan"
+       interpolator_beta="0.2"
+       start_linecap_type="zerowidth"
+       linejoin_type="round"
+       miter_limit="4"
+       end_linecap_type="zerowidth"
+       cusp_linecap_type="round" />
+    <inkscape:path-effect
+       cusp_linecap_type="round"
+       end_linecap_type="zerowidth"
+       miter_limit="4"
+       linejoin_type="round"
+       start_linecap_type="zerowidth"
+       interpolator_beta="0.2"
+       interpolator_type="CubicBezierJohan"
+       sort_points="true"
+       offset_points="0,6.1695344"
+       is_visible="true"
+       id="path-effect4168"
+       effect="powerstroke" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect5640"
+       is_visible="true"
+       pattern="M 0,0 H 2.38769 V 167.93407 H 0 Z"
+       copytype="repeated"
+       prop_scale="2"
+       scale_y_rel="true"
+       spacing="400"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="true"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="300"
+       scale_y_rel="false"
+       prop_scale="15"
+       copytype="repeated"
+       pattern="M 0,0 H 2.38769 V 167.93407 H 0 Z"
+       is_visible="true"
+       id="path-effect5528"
+       effect="skeletal" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect4016"
+       is_visible="true"
+       pattern="M 0,0 H 2.38769 V 27.06046 H 0 Z"
+       copytype="repeated"
+       prop_scale="0.5"
+       scale_y_rel="false"
+       spacing="9.5"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598">
+      <g
+         id="g5600"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="true"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="300"
+       scale_y_rel="false"
+       prop_scale="15"
+       copytype="repeated"
+       pattern="M 0,0 H 2.38769 V 167.93407 H 0 Z"
+       is_visible="true"
+       id="path-effect5528-7"
+       effect="skeletal" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8">
+      <g
+         id="g5600-9"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect5640-7"
+       is_visible="true"
+       pattern="M 0,0 H 2.38769 V 167.93407 H 0 Z"
+       copytype="repeated"
+       prop_scale="2"
+       scale_y_rel="true"
+       spacing="400"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect4016-8"
+       is_visible="true"
+       pattern="M 0,0 H 2.38769 V 27.06046 H 0 Z"
+       copytype="repeated"
+       prop_scale="0.5"
+       scale_y_rel="false"
+       spacing="9.5"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="true"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="200"
+       scale_y_rel="false"
+       prop_scale="15"
+       copytype="repeated"
+       pattern="M 0,0 H 2.38769 V 136.09823 H 0 Z"
+       is_visible="true"
+       id="path-effect5528-8"
+       effect="skeletal" />
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="true"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="350"
+       scale_y_rel="false"
+       prop_scale="15"
+       copytype="repeated"
+       pattern="M 0,0 H 2.38769 V 167.93407 H 0 Z"
+       is_visible="true"
+       id="path-effect5528-8-5"
+       effect="skeletal" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0">
+      <g
+         id="g5600-9-9"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect5640-7-0"
+       is_visible="true"
+       pattern="M 0,0 H 2.38769 V 167.93407 H 0 Z"
+       copytype="repeated"
+       prop_scale="2"
+       scale_y_rel="true"
+       spacing="400"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect4016-8-7"
+       is_visible="true"
+       pattern="M 0,0 H 2.38769 V 27.06046 H 0 Z"
+       copytype="repeated"
+       prop_scale="0.5"
+       scale_y_rel="false"
+       spacing="10"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="true"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="200"
+       scale_y_rel="false"
+       prop_scale="15"
+       copytype="repeated"
+       pattern="M 0,0 H 2.38769 V 136.09823 H 0 Z"
+       is_visible="true"
+       id="path-effect5528-8-6"
+       effect="skeletal" />
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="true"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="200"
+       scale_y_rel="false"
+       prop_scale="15"
+       copytype="repeated"
+       pattern="M 0,0 H 2.38769 V 136.09823 H 0 Z"
+       is_visible="true"
+       id="path-effect5528-8-59"
+       effect="skeletal" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect5640-7-0-3"
+       is_visible="true"
+       pattern="M 0,0 H 2.38769 V 167.93407 H 0 Z"
+       copytype="repeated"
+       prop_scale="2"
+       scale_y_rel="true"
+       spacing="400"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect4016-8-7-2"
+       is_visible="true"
+       pattern="M 0,0 H 2.38769 V 27.06046 H 0 Z"
+       copytype="repeated"
+       prop_scale="0.5"
+       scale_y_rel="false"
+       spacing="10"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       fuse_tolerance="0"
+       vertical_pattern="true"
+       prop_units="false"
+       tang_offset="0"
+       normal_offset="0"
+       spacing="200"
+       scale_y_rel="false"
+       prop_scale="15"
+       copytype="repeated"
+       pattern="M 0,0 H 2.38769 V 136.09823 H 0 Z"
+       is_visible="true"
+       id="path-effect5528-8-6-9"
+       effect="skeletal" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5598-8-0-5">
+      <g
+         id="g5600-9-9-5"
+         style="fill:#ffffff"
+         transform="matrix(0.4670301,0,0,0.47878616,191.82917,328.17442)">
+        <path
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc"
+           inkscape:connector-curvature="0"
+           id="path5602-1-7-3"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5604-6-6-2"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate" />
+      </g>
+    </clipPath>
+    <linearGradient
+       id="linearGradient7679">
+      <stop
+         id="stop7681"
+         offset="0"
+         style="stop-color: rgb(36, 0, 0); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(60, 0, 0); stop-opacity: 0.498039;"
+         offset="0"
+         id="stop7687" />
+      <stop
+         id="stop7689"
+         offset="0.62932223"
+         style="stop-color: rgb(72, 0, 0); stop-opacity: 0.247059;" />
+      <stop
+         id="stop7683"
+         offset="1"
+         style="stop-color: rgb(85, 0, 0); stop-opacity: 0;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective6083" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect3796"
+       effect="spiro" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3792"
+       is_visible="true" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect3788"
+       effect="spiro" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect3784"
+       effect="spiro" />
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect3772"
+       effect="spiro" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4578">
+      <g
+         style="stroke:#ff0000"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+         inkscape:export-ydpi="180"
+         inkscape:export-xdpi="180"
+         transform="matrix(0.98719379,0,0,0.98719379,47.995218,-1001.3914)"
+         id="g4580">
+        <rect
+           y="2036.7069"
+           x="434.91745"
+           height="101.29723"
+           width="101.29723"
+           id="rect4582"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#ff0000;stroke-width:2;marker:none;enable-background:accumulate" />
+        <g
+           style="stroke:#ff0000"
+           id="g4584"
+           transform="rotate(180,486.59116,2009.0705)"
+           inkscape:export-xdpi="59"
+           inkscape:export-ydpi="59" />
+      </g>
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4635">
+      <g
+         transform="matrix(0.46703009,0,0,0.47878615,191.82918,328.17443)"
+         style="fill:#ffffff"
+         id="g4641">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
+           id="path4637"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc" />
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           id="path4639"
+           inkscape:connector-curvature="0" />
+      </g>
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4635-7">
+      <g
+         transform="matrix(0.46703009,0,0,0.47878615,191.82918,328.17443)"
+         style="fill:#ffffff"
+         id="g4641-5">
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:0.97517824;marker:none;enable-background:accumulate"
+           d="m 37.760445,131.29095 126.194165,346.4342 c 4.20897,18.88975 13.3602,28.76974 19.21779,41.77155 20.46446,45.42394 41.34118,68.1137 71.51438,85.57184 0,0 13.88051,24.47704 22.59187,37.46332 18.8938,28.16554 42.12462,56.55488 61.77311,83.5129 15.72017,14.5973 40.33485,-16.8439 40.5907,-38.20302 0.18787,-15.6838 -21.21153,-54.60549 -38.81512,-80.5486 -11.70224,-17.24604 -12.12223,-31.67276 -12.12223,-31.67276 54.16899,-27.24435 98.75602,-0.19087 147.24079,4.77538 10.31673,16.12736 22.62267,18.33023 35.01943,19.8974 3.09857,19.62697 -0.15336,36.04537 7.16307,49.34556 l -7.16306,40.59071 c 13.98827,21.75954 29.02557,24.53812 32.63174,15.12202 l 14.32612,-37.40712 c 12.26737,6.36328 12.30503,32.69929 39.79481,14.32614 L 592.14674,614.6193 C 580.71581,591.53831 560.19535,559.70246 556.33142,536.62147 508.27515,529.79812 465.15357,513.10536 423.41676,493.64308 L 289.7062,430.76728 c 0,0 -46.95787,-46.16198 -47.75377,-53.32504 C 241.15654,370.27917 190.57251,83.537176 190.57251,83.537176 L 25.026106,112.98534 Z"
+           id="path4637-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccscscsscccccsccccccsccc" />
+        <path
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.66642463;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.07579465;marker:none;enable-background:accumulate"
+           d="m 331.8887,580.39576 15.12203,-1.59179 -5.57128,23.08099 -58.10042,54.91683 3.97948,23.08099 20.6933,3.18358 72.42655,-58.10042 5.57128,-31.83584 c 0,0 25.46867,-4.77538 31.03995,0 5.57127,4.77538 22.28509,29.44816 22.28509,29.44816 l -3.97948,50.93735 -23.87689,32.63174 2.38769,20.6933 19.10151,3.18359 21.4892,-19.10151 21.48919,-23.08099 11.14255,-77.20193 -16.71382,-45.36608 -163.95461,-15.91792 z"
+           id="path4639-3"
+           inkscape:connector-curvature="0" />
+      </g>
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4578-9">
+      <g
+         style="stroke:#ff0000"
+         inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/uncollapse.png"
+         inkscape:export-ydpi="180"
+         inkscape:export-xdpi="180"
+         transform="matrix(0.98719379,0,0,0.98719379,47.995218,-1001.3914)"
+         id="g4580-1">
+        <rect
+           y="2036.7069"
+           x="434.91745"
+           height="101.29723"
+           width="101.29723"
+           id="rect4582-8"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#ff0000;stroke-width:2;marker:none;enable-background:accumulate" />
+        <g
+           style="stroke:#ff0000"
+           id="g4584-1"
+           transform="rotate(180,486.59116,2009.0705)"
+           inkscape:export-xdpi="59"
+           inkscape:export-ydpi="59" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter4025"
+       x="-0.11973446"
+       width="1.2394689"
+       y="-0.20150433"
+       height="1.4030087">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.2776072"
+         id="feGaussianBlur4027" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter4029"
+       x="-0.33718547"
+       width="1.674371"
+       y="-0.56743228"
+       height="2.1348646">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.2776072"
+         id="feGaussianBlur4031" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter5028"
+       x="-0.0348"
+       width="1.0696"
+       y="-0.0348"
+       height="1.0696">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="4.35"
+         id="feGaussianBlur5030" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg"
+     transform="translate(0,27.637791)"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.85983616;marker:none;enable-background:accumulate"
+       id="rect3271"
+       width="1920"
+       height="1080"
+       x="0"
+       y="-27.637791" />
+    <rect
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d35f5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.53276753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect5199"
+       width="568.79999"
+       height="335.59897"
+       x="33.22084"
+       y="10.64591" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:45.27681732px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.76049852px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="56.929108"
+       y="65.308853"
+       id="text5201"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0062662,0.99377283)"><tspan
+         sodipodi:role="line"
+         id="tspan5203"
+         x="56.929108"
+         y="65.308853"
+         style="stroke-width:0.76049852">POINTERS</tspan></text>
+    <rect
+       y="376.85318"
+       x="33.22084"
+       height="335.59897"
+       width="568.79999"
+       id="rect4689"
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d35f5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.53276753;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <text
+       transform="scale(1.0062662,0.99377283)"
+       sodipodi:linespacing="125%"
+       id="text4693"
+       y="433.81085"
+       x="56.929108"
+       style="font-style:normal;font-weight:normal;font-size:45.27681732px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.76049852px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.76049852"
+         y="433.81085"
+         x="56.929108"
+         id="tspan4691"
+         sodipodi:role="line">MAIN MENU SCREEN</tspan></text>
+    <rect
+       y="10.64591"
+       x="621.30664"
+       height="335.59897"
+       width="666.75824"
+       id="rect4695"
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d35f5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.74220395;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <text
+       transform="scale(1.0062662,0.99377283)"
+       sodipodi:linespacing="125%"
+       id="text4699"
+       y="65.308853"
+       x="641.35284"
+       style="font-style:normal;font-weight:normal;font-size:45.27681732px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.76049852px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="stroke-width:0.76049852"
+         y="65.308853"
+         x="641.35284"
+         id="tspan4697"
+         sodipodi:role="line">PIE MENU</tspan></text>
+    <rect
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d35f5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.74220395;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4701"
+       width="666.75824"
+       height="335.59897"
+       x="621.30664"
+       y="379.00735" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:45.27681732px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.76049852px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="641.35284"
+       y="435.97852"
+       id="text4705"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0062662,0.99377283)"><tspan
+         sodipodi:role="line"
+         id="tspan4703"
+         x="641.35284"
+         y="435.97852"
+         style="stroke-width:0.76049852">LOAD/SAVE SCREEN</tspan></text>
+    <rect
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#d35f5f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.25059271;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4707"
+       width="569.82098"
+       height="264.51166"
+       x="33.22084"
+       y="740.90631" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:45.27681732px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.76049852px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="56.929108"
+       y="800.1452"
+       id="text4711"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0062662,0.99377283)"><tspan
+         sodipodi:role="line"
+         id="tspan4709"
+         x="56.929108"
+         y="800.1452"
+         style="stroke-width:0.76049852">SCENE</tspan></text>
+  </g>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,27.637791)"
+     style="display:inline">
+    <g
+       inkscape:export-filename="/home/rgarcia/Dropbox/art/2013.Proyecto Indiana/diosa/assets/sprites/ui/reload.png"
+       inkscape:export-ydpi="59"
+       inkscape:export-xdpi="59"
+       id="g4533"
+       transform="matrix(0.84350454,0,0,0.84350454,663.78028,-871.51587)">
+      <g
+         transform="matrix(4.421117,0,0,4.421117,-442.15111,453.7938)"
+         id="g4537"
+         inkscape:label="Layer 1"
+         style="fill:#ffffff;fill-opacity:1" />
+    </g>
+    <path
+       inkscape:export-ydpi="96"
+       inkscape:export-xdpi="96"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/leave.png"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0"
+       id="path4618"
+       d="m 125.59341,219.43537 -0.90366,-46.0423 33.8019,-0.7807 v -15.41491 l 50.41474,38.68717 -51.22342,37.20653 -0.1002,-13.37826 z"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:7.24814224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <g
+       transform="matrix(1.4833055,0,0,1.4833055,58.687786,-1397.6982)"
+       id="g5127-8"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/hotspotpointer.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.46594405;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+      <g
+         transform="matrix(1.8459723,0,0,1.8459723,-85.215047,-910.35311)"
+         id="g5129-3"
+         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.7941311;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+        <g
+           id="g5131-9"
+           style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.7941311;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.7941311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 138.05469,1048.2891 v 12.7949 h 2.64648 v -12.7949 z"
+             id="path5133-7"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.7941311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 138.05469,1088.5762 v 12.7949 h 2.64648 v -12.7949 z"
+             id="path5135-4"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.7941311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 153.12305,1073.5059 v 2.6464 h 12.79687 v -2.6464 z"
+             id="path5137-0"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.7941311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 112.83594,1073.5059 v 2.6464 h 12.79492 v -2.6464 z"
+             id="path5139-5"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           id="g5141-1"
+           transform="matrix(0.51204404,-0.51204404,0.51204404,0.51204404,-482.34989,595.83715)"
+           style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.09665465;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.09665465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 137.55078,1044.7461 v 12.0664 h 3.6543 v -12.0664 z"
+             id="path5143-7"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.09665465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 137.55078,1092.8457 v 12.0664 h 3.6543 v -12.0664 z"
+             id="path5145-7"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.09665465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 157.39453,1073.002 v 3.6562 h 12.06641 v -3.6562 z"
+             id="path5147-0"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.09665465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 109.29492,1073.002 v 3.6562 h 12.06641 v -3.6562 z"
+             id="path5149-5"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+    <g
+       transform="matrix(0.72481425,0,0,0.72481425,182.3822,-655.74922)"
+       id="g4708"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/pointer.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96"
+       style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none">
+      <rect
+         transform="scale(-1)"
+         y="-1178.1398"
+         x="-450.18005"
+         height="8.7664633"
+         width="53.172832"
+         id="rect4652"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <rect
+         transform="scale(-1)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4654"
+         width="53.172832"
+         height="8.7664633"
+         x="-375.30402"
+         y="-1178.1398" />
+      <rect
+         transform="rotate(-90)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         id="rect4658"
+         width="53.172832"
+         height="8.7664633"
+         x="-1237.781"
+         y="381.7724" />
+      <rect
+         transform="rotate(-90)"
+         y="381.7724"
+         x="-1162.905"
+         height="8.7664633"
+         width="53.172832"
+         id="rect4660"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <g
+       id="g4477"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/lookat.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <ellipse
+         ry="71.390732"
+         rx="71.379379"
+         cy="187.17239"
+         cx="1114.998"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#232323;fill-opacity:1;stroke:#ffffff;stroke-width:5.29951572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="ellipse4643-9"
+         inkscape:export-xdpi="75"
+         inkscape:export-ydpi="75"
+         inkscape:export-filename="images/circle2.png" />
+      <g
+         inkscape:export-filename="images/lookat.png"
+         inkscape:export-ydpi="75"
+         inkscape:export-xdpi="75"
+         transform="matrix(1.0094976,0,0,1.0094976,627.70333,-1608.4846)"
+         id="g5032"
+         style="display:inline;stroke-width:1.13745749">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0"
+           id="path5034"
+           d="m 442.86429,1754.1491 c 10.78295,-2.0415 22.63506,-3.5484 31.72963,-6.4341 17.41543,4.5145 34.8732,6.2578 52.61828,9.7833 l -0.79324,5.6408 c -13.94799,-3.6905 -30.86751,-7.0314 -52.79456,-9.7833 -14.53933,2.2933 -27.21975,5.5161 -39.92644,8.7257 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.10922384;marker:none;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ccccssccscsscccssccs"
+           inkscape:connector-curvature="0"
+           id="path5036"
+           d="m 469.53272,1756.2959 c -12.32701,5.3522 -23.74909,10.1265 -35.83835,9.8143 l -0.76134,5.3571 c 8.03045,0.5053 15.01189,3.1755 19.07502,11.9461 0,0 -2.79705,8.0239 -3.50216,9.7867 -0.40755,1.0188 10.0109,4.9058 17.9261,9.2745 5.7789,3.1895 9.70362,7.3365 9.70362,7.3365 l -14.9361,-26.7161 c 30.24932,16.4667 62.28535,27.4255 70.27709,9.4129 4.42574,-9.9751 -6.88933,-18.2849 -10.71262,-10.1604 0,0 5.16501,-2.3834 6.00766,1.4396 4.44189,20.1524 -29.73454,11.8551 -43.36869,0.2354 -1.49294,-1.2724 46.44174,-11.7994 46.44174,-10.1189 l 1.61958,-5.8001 c -18.13025,4.301 -40.95965,-10.4622 -61.93155,-11.8076 z m 2.9623,9.4544 c 11.19809,-0.067 24.28852,1.3987 36.94576,6.0077 0.93698,0.3412 -27.67125,6.6029 -27.67125,6.6029 l -32.91758,-9.9667 c 5.34462,-1.3315 13.7624,-2.5851 23.64307,-2.6439 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.10922384;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5038"
+           d="m 470.73702,1761.8052 c -0.83593,1.3734 -1.3012,2.9024 -1.3012,4.5265 0,5.8124 5.99006,10.5342 13.38574,10.5342 7.39568,0 13.38574,-4.7218 13.38574,-10.5342 0,-0.3491 -0.027,-0.684 -0.0692,-1.0244 -7.51389,-0.9914 -19.42592,-2.5902 -25.40108,-3.5021 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:1.15213692;marker:none;enable-background:accumulate" />
+      </g>
+    </g>
+    <g
+       id="g4455"
+       transform="translate(3.4303355)"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/pickup.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <ellipse
+         inkscape:export-filename="images/circle2.png"
+         inkscape:export-ydpi="75"
+         inkscape:export-xdpi="75"
+         id="ellipse4445"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#232323;fill-opacity:1;stroke:#ffffff;stroke-width:5.29951572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="936.78125"
+         cy="187.17239"
+         rx="71.379379"
+         ry="71.390732" />
+      <ellipse
+         inkscape:export-filename="images/pickup.png"
+         inkscape:export-ydpi="75"
+         inkscape:export-xdpi="75"
+         clip-path="url(#clipPath4635-7)"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.13543987;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="ellipse5040"
+         transform="matrix(0.29326091,0,0,0.28606023,837.87921,37.165983)"
+         cx="353.77585"
+         cy="549.35583"
+         rx="173.90331"
+         ry="178.28075" />
+    </g>
+    <g
+       id="g4451"
+       transform="translate(-53.312753)"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/talkto.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <ellipse
+         ry="71.390732"
+         rx="71.379379"
+         cy="187.17239"
+         cx="816.44678"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#232323;fill-opacity:1;stroke:#ffffff;stroke-width:5.29951572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="ellipse4643-0"
+         inkscape:export-xdpi="75"
+         inkscape:export-ydpi="75"
+         inkscape:export-filename="images/circle2.png" />
+      <g
+         id="g5042"
+         transform="matrix(0.79855277,0,0,0.79855277,-34.971164,-532.00431)"
+         inkscape:export-filename="images/talkto.png"
+         inkscape:export-xdpi="75"
+         inkscape:export-ydpi="75"
+         style="display:inline">
+        <rect
+           ry="25"
+           rx="25"
+           y="853.23486"
+           x="1009.1696"
+           height="69.5979"
+           width="114.06322"
+           id="rect5044"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5046"
+           d="m 1051.7016,917.03294 9.6664,30.93239 13.5329,-36.73222 z"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+      </g>
+    </g>
+    <g
+       style="display:inline"
+       transform="matrix(0.75357418,0,0,0.75357418,-939.41618,743.04846)"
+       id="g4513"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/inventory.png"
+       inkscape:export-xdpi="96.328186"
+       inkscape:export-ydpi="96.328186">
+      <g
+         transform="matrix(1.6889701,0,0,1.6889701,648.56242,-1578.0385)"
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="images/inventory.png"
+         clip-path="url(#clipPath4578-9)"
+         id="g4548">
+        <rect
+           style="fill:#000000;fill-opacity:0.23529412;stroke:none;filter:url(#filter4025)"
+           id="rect3973"
+           width="65.697525"
+           height="39.037659"
+           x="495.07474"
+           y="1042.5717"
+           rx="5.5319223"
+           ry="5.5319223"
+           transform="matrix(1.3934058,0,0,1.3934058,-207.68815,-416.30595)" />
+        <path
+           style="fill:#000000;fill-opacity:0.23529412;stroke:none;filter:url(#filter4029)"
+           d="m 518.21861,1034.8109 c -1.08868,0 -1.96229,0.8735 -1.96229,1.9622 v 9.9386 c 0,1.0886 0.87361,1.9621 1.96229,1.9621 h 19.40461 c 1.08867,0 1.96227,-0.8735 1.96227,-1.9621 v -9.9386 c 0,-1.0887 -0.8736,-1.9622 -1.96227,-1.9622 z m 2.90706,2.0711 h 13.59049 c 0.76262,0 1.38086,0.6182 1.38086,1.381 v 6.9587 c 0,0.7626 -0.61824,1.3809 -1.38086,1.3809 h -13.59049 c -0.76264,0 -1.38087,-0.6183 -1.38087,-1.3809 v -6.9587 c 0,-0.7628 0.61823,-1.381 1.38087,-1.381 z"
+           id="path3975"
+           inkscape:connector-curvature="0"
+           transform="matrix(1.3934058,0,0,1.3934058,-207.68815,-416.30595)" />
+        <rect
+           ry="6.6437721"
+           rx="6.6437721"
+           y="1039.4285"
+           x="488.4725"
+           height="46.883755"
+           width="78.901939"
+           id="rect3969"
+           style="fill:#ffffff;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3971"
+           d="m 516.26803,1030.1079 c -1.30749,0 -2.35667,1.0491 -2.35667,2.3566 v 11.9361 c 0,1.3074 1.04918,2.3565 2.35667,2.3565 h 23.30472 c 1.30747,0 2.35665,-1.0491 2.35665,-2.3565 v -11.9361 c 0,-1.3075 -1.04918,-2.3566 -2.35665,-2.3566 z m 3.49135,2.4873 h 16.32202 c 0.91591,0 1.65839,0.7426 1.65839,1.6587 v 8.3573 c 0,0.9159 -0.74248,1.6584 -1.65839,1.6584 h -16.32202 c -0.91591,0 -1.65841,-0.7425 -1.65841,-1.6584 v -8.3573 c 0,-0.9161 0.7425,-1.6587 1.65841,-1.6587 z"
+           style="fill:#ffffff;stroke:none" />
+      </g>
+      <rect
+         ry="8.9077101"
+         rx="7.5856199"
+         y="125.67384"
+         x="1454.6765"
+         height="170.601"
+         width="170.601"
+         id="rect4510"
+         style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.17700004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;stroke:none;stroke-width:3.38031864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="m 710.00937,496.214 a 45.529642,45.536883 0 0 0 -45.52933,45.53682 45.529642,45.536883 0 0 0 45.52933,45.53683 45.529642,45.536883 0 0 0 45.53061,-45.53683 45.529642,45.536883 0 0 0 -45.53061,-45.53682 z m -9.71477,12.01708 h 19.43089 v 23.80368 h 23.80491 v 19.43214 h -23.80491 v 23.80491 H 700.2946 V 551.4669 h -23.80492 v -19.43214 h 23.80492 z"
+       id="ellipse4592"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/plus.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96"
+       inkscape:connector-curvature="0" />
+    <g
+       style="display:inline"
+       transform="matrix(0.75357418,0,0,0.75357418,-1075.4528,454.06391)"
+       id="g4565"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/menu.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <g
+         id="g4531"
+         transform="matrix(0,2.1918547,-2.1918547,0,3748.7361,-1128.4912)"
+         inkscape:export-filename="images/menu.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90"
+         style="stroke:#000000">
+        <g
+           id="g4534"
+           transform="translate(11.036416,169.8964)"
+           style="stroke:#000000" />
+        <rect
+           y="962.71338"
+           x="747.39252"
+           height="74.437172"
+           width="74.437172"
+           id="rect4542"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:none;stroke-width:1.51912594;marker:none;enable-background:accumulate" />
+      </g>
+      <g
+         transform="matrix(1.0688542,0,0,1.0688542,-126.42656,-38.616527)"
+         id="g4561">
+        <rect
+           transform="scale(-1,1)"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.49357128;marker:none;enable-background:accumulate"
+           id="rect5052-6"
+           width="31.655012"
+           height="101.73635"
+           x="-1568.2069"
+           y="539.6828" />
+        <rect
+           y="539.6828"
+           x="-1613.4697"
+           height="101.73635"
+           width="31.655012"
+           id="rect4559"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12.49357128;marker:none;enable-background:accumulate"
+           transform="scale(-1,1)" />
+      </g>
+    </g>
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:6.78216743;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+       d="m 354.35622,938.92141 -38.15029,0.76948 -0.64687,-74.45179 h -12.7727 l 32.05591,-42.92712 30.82902,43.61569 -11.08515,0.0853 z"
+       id="path5276-5-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:export-filename="images/inv_up.png"
+       inkscape:export-xdpi="100"
+       inkscape:export-ydpi="100" />
+    <path
+       inkscape:export-ydpi="100"
+       inkscape:export-xdpi="100"
+       inkscape:export-filename="images/inv_down.png"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0"
+       id="path4587"
+       d="m 398.51405,827.7863 38.1503,-0.76948 0.64687,74.4518 h 12.7727 l -32.05591,42.92709 -30.82903,-43.61566 11.08508,-0.0853 z"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:6.78216743;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50714839;marker:none;enable-background:accumulate"
+       d="m 479.63348,903.76907 29.91365,38.71224 29.91411,-38.71224 z"
+       id="path1014"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/bubblepointer.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="images/border_black_rect4.png"
+       y="818.91724"
+       x="491.37531"
+       height="20.110874"
+       width="20.110874"
+       id="rect5367"
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.01429677;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <rect
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3.01429677;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4829"
+       width="20.110874"
+       height="20.110874"
+       x="491.37531"
+       y="844.89032"
+       inkscape:export-filename="images/border_black_rect4.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="images/border_black_rect4.png"
+       y="845.00122"
+       x="519.53357"
+       height="20"
+       width="20"
+       id="rect4870"
+       style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99767852;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <g
+       id="g4501"
+       transform="translate(8)"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/delete.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <ellipse
+         ry="56.158516"
+         rx="56.149586"
+         cy="540.55975"
+         cx="821.01642"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#232323;fill-opacity:1;stroke:none;stroke-width:5.29951572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="ellipse4643-1"
+         inkscape:export-xdpi="75"
+         inkscape:export-ydpi="75"
+         inkscape:export-filename="images/circle2.png" />
+      <g
+         style="stroke-width:3.16666651"
+         transform="matrix(0.31578948,0,0,0.31578948,450.61419,632.06756)"
+         id="g4396">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.27804089px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           d="m 1107.2383,-318.58789 v 165.86914 h 131.4043 v -165.86914 z m 18.6953,11.30859 h 16.6953 v 134.63477 h -16.6953 z m 37.9277,0 h 16.6953 v 134.63477 h -16.6953 z m 36.7754,0 h 16.6934 v 134.63477 h -16.6934 z"
+           transform="translate(0,-27.637791)"
+           id="rect4354" />
+        <g
+           style="stroke-width:3.16666651"
+           id="g4389">
+          <rect
+             transform="scale(1,-1)"
+             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.27804041px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             id="rect4368"
+             width="163.7162"
+             height="25.302179"
+             x="1091.0823"
+             y="349.73163" />
+          <rect
+             y="-384.23264"
+             x="1104.0072"
+             height="11.84787"
+             width="137.86627"
+             id="rect4370"
+             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.27804089px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+          <path
+             inkscape:connector-curvature="0"
+             id="rect4372"
+             d="m 1140.6289,-399.19286 v 15.60937 h 9.6934 v -8.06836 h 45.2363 v 8.06836 h 9.6934 v -15.60937 z"
+             style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.27804089px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+        </g>
+      </g>
+    </g>
+    <ellipse
+       ry="71.390732"
+       rx="71.379379"
+       cy="296.84436"
+       cx="1773.0299"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:5.29951572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       id="ellipse5086"
+       inkscape:export-xdpi="75"
+       inkscape:export-ydpi="75"
+       inkscape:export-filename="images/circle.png" />
+    <ellipse
+       inkscape:export-filename="images/circle2.png"
+       inkscape:export-ydpi="75"
+       inkscape:export-xdpi="75"
+       id="ellipse4643"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#232323;fill-opacity:1;stroke:#ffffff;stroke-width:5.29951572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       cx="1763.8905"
+       cy="111.01131"
+       rx="71.379379"
+       ry="71.390732" />
+    <circle
+       r="77.740509"
+       cy="-693.8382"
+       cx="-1775.7058"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.24091196;marker:none;enable-background:accumulate"
+       id="path934-1"
+       transform="scale(-1)"
+       inkscape:export-filename="images/path934-1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <g
+       id="g5090"
+       transform="matrix(0.51827006,0,0,0.51827006,1305.3238,226.25813)"
+       inkscape:export-filename="images/circle_button.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       style="stroke-width:1.44222462">
+      <circle
+         transform="matrix(-1.0393108,0,0,-0.9986916,-35.620277,6.7090372)"
+         id="circle4953"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.17700004;fill:#000000;fill-opacity:1;stroke:none;stroke-width:6.25332642;marker:none;filter:url(#filter5028);enable-background:accumulate"
+         cx="-906.11835"
+         cy="-541.91296"
+         r="150" />
+      <g
+         id="g5097"
+         style="stroke-width:1.44222462">
+        <rect
+           y="362.54102"
+           x="739.05347"
+           height="341.20163"
+           width="341.20163"
+           id="rect5094"
+           style="color:#000000;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.17700004;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:5.76889849;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           transform="translate(-3.5359567,3.886188)" />
+        <circle
+           transform="scale(-1)"
+           id="circle4951"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6.25332642;marker:none;enable-background:accumulate"
+           cx="-906.11829"
+           cy="-537.02802"
+           r="150" />
+      </g>
+    </g>
+    <g
+       id="g4541"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/help.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <text
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="images/help.png"
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;font-size:16.46473694px;line-height:0%;font-family:'Josefin Sans';-inkscape-font-specification:'Josefin Sans';letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.68247014"
+         x="103.75172"
+         y="602.14124"
+         id="text4265-0"
+         sodipodi:linespacing="0%"><tspan
+           sodipodi:role="line"
+           id="tspan4267-6"
+           x="103.75172"
+           y="602.14124"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:144.06643677px;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, Black,';stroke-width:0.68247014">?</tspan></text>
+      <ellipse
+         inkscape:export-filename="images/circle.png"
+         inkscape:export-ydpi="75"
+         inkscape:export-xdpi="75"
+         id="ellipse5086-2"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:5.29951572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="147.75249"
+         cy="549.6991"
+         rx="71.379379"
+         ry="71.390732" />
+    </g>
+    <g
+       id="g4536"
+       transform="translate(30.46443)"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/credits.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="images/credits.png"
+         inkscape:connector-curvature="0"
+         id="path4539"
+         d="m 294.04571,490.63254 -12.9968,41.72934 -43.88417,0.63573 35.6703,25.25545 -12.95594,41.93248 35.0418,-26.11971 35.8771,25.279 -14.0135,-41.3974 35.12896,-26.30926 -43.7019,0.53417 z m 0.12694,41.5924 a 4.4174338,4.4174338 0 0 1 4.41755,4.41752 4.4174338,4.4174338 0 0 1 -4.41755,4.41753 4.4174338,4.4174338 0 0 1 -4.41746,-4.41753 4.4174338,4.4174338 0 0 1 4.41746,-4.41752 z m -11.54659,8.82961 a 4.4174338,4.4174338 0 0 1 4.41747,4.41752 4.4174338,4.4174338 0 0 1 -4.41747,4.41752 4.4174338,4.4174338 0 0 1 -4.41754,-4.41752 4.4174338,4.4174338 0 0 1 4.41754,-4.41752 z m 11.79879,0.74184 c 1.83145,-0.007 3.7015,0.78029 4.41026,2.38425 2.04214,4.62134 1.22698,14.14316 1.22698,14.14316 h -10.79842 c 0,0 -0.73571,-9.26508 0.98215,-14.14316 0.55479,-1.57528 2.34749,-2.37708 4.17903,-2.38425 z m 11.97379,0.6167 a 4.4174338,4.4174338 0 0 1 4.41665,4.41752 4.4174338,4.4174338 0 0 1 -4.41665,4.41753 4.4174338,4.4174338 0 0 1 -4.41747,-4.41753 4.4174338,4.4174338 0 0 1 4.41747,-4.41752 z M 282.8781,550.626 c 1.83153,-0.007 3.70158,0.7803 4.41034,2.38425 2.04206,4.62133 1.22698,14.14406 1.22698,14.14406 h -10.79761 c 0,0 -0.73652,-9.26597 0.98126,-14.14406 0.5548,-1.57528 2.34757,-2.37707 4.17903,-2.38425 z m 23.77273,1.35855 c 1.83145,-0.007 3.7015,0.78029 4.41018,2.38423 2.04214,4.62134 1.22707,14.14317 1.22707,14.14317 h -10.79843 c 0,0 -0.7357,-9.26508 0.98215,-14.14317 0.5548,-1.57527 2.3475,-2.37707 4.17903,-2.38423 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.39029574;marker:none;enable-background:accumulate" />
+      <ellipse
+         ry="71.390732"
+         rx="71.379379"
+         cy="549.6991"
+         cx="292.45853"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:5.29951572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="ellipse4518"
+         inkscape:export-xdpi="75"
+         inkscape:export-ydpi="75"
+         inkscape:export-filename="images/circle.png" />
+    </g>
+    <g
+       id="g4532"
+       inkscape:export-filename="../ljr_adv/IMAGES-RAW/ui/debug.png"
+       inkscape:export-xdpi="96"
+       inkscape:export-ydpi="96">
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="images/debug.png"
+         transform="matrix(0.59844774,0,0,0.59597927,-515.54127,71.57624)"
+         id="g4583"
+         style="display:inline;stroke-width:1.35477614">
+        <ellipse
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:16.25731277;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="path4569"
+           cx="1698.392"
+           cy="800.26898"
+           rx="38.080536"
+           ry="51.02792" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10.83820915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 1708.5094,801.03066 30.703,-35.03409 23.7253,30.46442"
+           id="path4571"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+        <path
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0"
+           id="path4573"
+           d="m 1715.4873,805.60033 23.7251,-12.18577 23.7253,30.46442"
+           style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10.83820915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10.83820915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 1708.5094,829.97188 30.703,-10.66255 23.7253,30.46442"
+           id="path4575"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+        <path
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0"
+           id="path4577"
+           d="m 1684.1275,801.03066 -30.7031,-35.03409 -23.7253,30.46442"
+           style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10.83820915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10.83820915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 1677.1495,805.60033 -23.7251,-12.18577 -23.7253,30.46442"
+           id="path4579"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccc" />
+        <path
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0"
+           id="path4581"
+           d="m 1684.1275,829.97188 -30.7031,-10.66255 -23.7253,30.46442"
+           style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:10.83820915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+      <ellipse
+         inkscape:export-filename="images/circle.png"
+         inkscape:export-ydpi="75"
+         inkscape:export-xdpi="75"
+         id="ellipse4520"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:none;stroke:#ffffff;stroke-width:5.29951572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         cx="499.61664"
+         cy="549.6991"
+         rx="71.379379"
+         ry="71.390732" />
+    </g>
+  </g>
+</svg>
diff --git a/adventure-editor/build.gradle b/adventure-editor/build.gradle
new file mode 100644
index 000000000..980c998d7
--- /dev/null
+++ b/adventure-editor/build.gradle
@@ -0,0 +1,128 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "com.badlogicgames.gdx:gdx-tools:1.10.0"
+    }
+}
+
+apply plugin: "java"
+apply plugin: 'application'
+
+group = 'com.bladecoder.engineeditor'
+mainClassName = 'com.bladecoder.engineeditor.Main'
+
+// java
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+
+applicationDefaultJvmArgs = ['-Djava.awt.headless=true']
+
+jar {
+    manifest.attributes += [
+            'github'   : 'https://github.com/bladecoder/bladecoder-adventure-engine/',
+            'license'  : 'Apache-2.0',
+            'group'    : project.group,
+            'version'  : project.version,
+            'libgdx'   : libgdxVersion,
+            'java'     : targetCompatibility,
+            'timestamp': System.currentTimeMillis()
+    ]
+}
+
+javadoc {
+    title = "Adventure Editor"
+    options {
+        memberLevel = JavadocMemberLevel.PUBLIC
+        author true
+        setUse true
+        encoding "UTF-8"
+    }
+}
+
+dependencies {
+    implementation "com.badlogicgames.gdx:gdx:$libgdxVersion"
+    implementation "com.badlogicgames.gdx:gdx-freetype:$libgdxVersion"
+    implementation("com.badlogicgames.gdx:gdx-tools:1.10.0") {
+        exclude group: 'com.badlogicgames.gdx', module: 'gdx-backend-lwjgl'
+    }
+    implementation fileTree(dir: 'libs', include: '*.jar')
+    implementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$libgdxVersion"
+    implementation "com.badlogicgames.gdx:gdx-lwjgl3-angle:$libgdxVersion"
+
+    implementation "com.badlogicgames.gdx:gdx-platform:$libgdxVersion:natives-desktop"
+    implementation "com.badlogicgames.gdx:gdx-freetype-platform:$libgdxVersion:natives-desktop"
+    implementation("org.apache.commons:commons-compress:1.21")
+    implementation "commons-io:commons-io:2.1"
+    implementation "com.bladecoder.packr:packr:4.1.0"
+    implementation "eu.infomas:annotation-detector:3.0.5"
+    implementation "com.strongjoshua:libgdx-inGameConsole:0.9.0"
+    implementation "com.kotcrab.vis:vis-ui:1.5.2"
+    implementation "com.bladecoder.ink:blade-ink:$bladeInkVersion"
+    implementation "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
+    implementation "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion"
+
+    implementation project(":blade-engine")
+    implementation project(":blade-engine-spine-plugin")
+}
+
+task setVersion(type: WriteProperties) {
+
+    def props = new Properties()
+    def propFile = project.file("./src/main/resources/versions.properties");
+    props.load(new FileReader(propFile))
+
+    props."version" = version
+    props."libgdxVersion" = libgdxVersion
+    props."roboVMVersion" = roboVMVersion
+    props."androidAPILevel" = androidAPILevel
+    props."androidGradlePluginVersion" = androidGradlePluginVersion
+    props."bladeInkVersion" = bladeInkVersion
+
+    setProperties(props);
+    setOutputFile(propFile);
+
+    doLast {
+        println "Set version info in versions.properties"
+    }
+}
+
+processResources.dependsOn 'setVersion'
+
+// Run `gradle pack` task to generate editor atlases
+import com.badlogic.gdx.tools.texturepacker.TexturePacker
+
+task pack {
+
+    doLast {
+        TexturePacker.process(
+                'adventure-editor/assets-raw/editor/BladeSkin',           // Raw assets path.
+                'adventure-editor/src/main/resources/skin/BladeSkin',     // Output directory.
+                'blade-skin'                                          // Name of the generated atlas (without extension).
+        )
+
+        TexturePacker.process(
+                'adventure-editor/assets-raw/editor/icons',
+                'adventure-editor/src/main/resources/images',
+                'icons'
+        )
+
+        TexturePacker.process(
+                'adventure-editor/assets-raw/engine/ui-atlas',
+                'adventure-editor/src/main/resources/projectTmpl/assets/ui/1',
+                'ui'
+        )
+    }
+}
+
+// include flatpack files in .zip
+distZip {
+    into(project.name + '-' + project.version) {
+        from '.'
+        // include desktop and thirdparty folders
+        include('desktop/*', 'thirdparty/*')
+    }
+}
diff --git a/adventure-editor/desktop/com.bladecoder.adventure-editor.appdata.xml b/adventure-editor/desktop/com.bladecoder.adventure-editor.appdata.xml
new file mode 100644
index 000000000..007bb829e
--- /dev/null
+++ b/adventure-editor/desktop/com.bladecoder.adventure-editor.appdata.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>com.bladecoder.adventure-editor.desktop</id>
+  <name>adventure-editor</name>
+  <project_license>Apache-2.0</project_license>
+  <metadata_license>CC0-1.0</metadata_license>
+  <developer_name>Rafael García Moreno</developer_name>
+  <summary>Classic point and click adventure game engine and editor</summary>
+  <url type="homepage">https://github.com/bladecoder/bladecoder-adventure-engine</url>
+  <description>
+    <p>
+    The Bladecoder Adventure Engine is a set of tools to create interactive graphic adventures (classical point and click games).
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image type="source">https://cloud.githubusercontent.com/assets/6229260/4420346/1d3a1b8a-4578-11e4-8eec-415f5e27c005.png</image>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <release version="2.1.5" date="2018-11-19"/>
+  </releases>
+  <update_contact>danigm@wadobo.com</update_contact>
+
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-cartoon">none</content_attribute>
+    <content_attribute id="violence-fantasy">none</content_attribute>
+    <content_attribute id="violence-realistic">none</content_attribute>
+    <content_attribute id="violence-bloodshed">none</content_attribute>
+    <content_attribute id="violence-sexual">none</content_attribute>
+    <content_attribute id="violence-desecration">none</content_attribute>
+    <content_attribute id="violence-slavery">none</content_attribute>
+    <content_attribute id="violence-worship">none</content_attribute>
+    <content_attribute id="drugs-alcohol">none</content_attribute>
+    <content_attribute id="drugs-narcotics">none</content_attribute>
+    <content_attribute id="drugs-tobacco">none</content_attribute>
+    <content_attribute id="sex-nudity">none</content_attribute>
+    <content_attribute id="sex-themes">none</content_attribute>
+    <content_attribute id="sex-homosexuality">none</content_attribute>
+    <content_attribute id="sex-prostitution">none</content_attribute>
+    <content_attribute id="sex-adultery">none</content_attribute>
+    <content_attribute id="sex-appearance">none</content_attribute>
+    <content_attribute id="language-profanity">none</content_attribute>
+    <content_attribute id="language-humor">none</content_attribute>
+    <content_attribute id="language-discrimination">none</content_attribute>
+    <content_attribute id="social-chat">none</content_attribute>
+    <content_attribute id="social-info">none</content_attribute>
+    <content_attribute id="social-audio">none</content_attribute>
+    <content_attribute id="social-location">none</content_attribute>
+    <content_attribute id="social-contacts">none</content_attribute>
+    <content_attribute id="money-purchasing">none</content_attribute>
+    <content_attribute id="money-gambling">none</content_attribute>
+  </content_rating>
+</component>
diff --git a/adventure-editor/desktop/com.bladecoder.adventure-editor.desktop b/adventure-editor/desktop/com.bladecoder.adventure-editor.desktop
new file mode 100644
index 000000000..010c92b6f
--- /dev/null
+++ b/adventure-editor/desktop/com.bladecoder.adventure-editor.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=adventure-editor
+Comment=Classic point and click adventure game engine and editor
+GenericName=Bladecoder Adventure Editor
+Exec=adventure-editor
+Icon=com.bladecoder.adventure-editor
+Type=Application
+StartupNotify=true
+Categories=Development;
+Keywords=;bladecoder;
diff --git a/adventure-editor/desktop/com.bladecoder.adventure-editor.png b/adventure-editor/desktop/com.bladecoder.adventure-editor.png
new file mode 100644
index 000000000..02548298c
Binary files /dev/null and b/adventure-editor/desktop/com.bladecoder.adventure-editor.png differ
diff --git a/adventure-editor/desktop/com.bladecoder.adventure-editor.svg b/adventure-editor/desktop/com.bladecoder.adventure-editor.svg
new file mode 100644
index 000000000..d423aaf8c
--- /dev/null
+++ b/adventure-editor/desktop/com.bladecoder.adventure-editor.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="com.bladecoder.adventure-editor.svg"
+   inkscape:export-filename="ic_app16.png"
+   inkscape:export-xdpi="11.25"
+   inkscape:export-ydpi="11.25">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="-86.104913"
+     inkscape:cy="47.983922"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     borderlayer="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-924.3622)">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect816"
+       width="156.07143"
+       height="156.07143"
+       x="-16.785715"
+       y="912.00507" />
+    <path
+       style="fill:#ffffff"
+       d="m 80.257895,1049.9113 c -0.815413,0 -1.505463,-0.4216 -2.079243,-0.6533 -1.080515,-0.9735 -0.442915,-0.4789 0.717749,-0.9204 -0.660031,0.1137 0.153318,0.064 0.849686,-0.3842 0.242436,0 0.715456,-0.1185 1.051192,-0.2632 0.335727,-0.1432 0.722271,-0.2893 0.859001,-0.3215 0.136726,-0.032 0.752276,-0.2496 1.367895,-0.4832 0.615609,-0.2346 1.407119,-0.5311 1.758891,-0.6613 0.600759,-0.2222 1.692373,-0.7785 2.944588,-1.5011 0.541284,-0.3122 0.851962,-0.5412 1.490602,-1.0981 0.181938,-0.158 0.403744,-0.2887 0.492883,-0.2887 0.08915,0 0.122872,-0.039 0.07497,-0.09 -0.04795,-0.049 0.191914,-0.3891 0.532999,-0.7553 0.341077,-0.366 0.617755,-0.7524 0.614822,-0.8583 -0.0158,-0.5776 -1.139613,-1.3374 -5.111478,-3.4563 -1.011374,-0.5396 -1.980788,-1.0833 -2.154262,-1.2082 -0.173469,-0.1259 -0.437306,-0.2272 -0.586296,-0.2272 -0.148997,0 -0.294887,-0.06 -0.324198,-0.1285 -5.964756,-2.8572 -9.782831,-4.8837 -15.575996,-7.2923 -0.06168,0 -0.454877,-0.2173 -0.87377,-0.4833 -1.085618,-0.6196 -1.667137,-0.756 -2.631641,-1.5343 -0.08794,-0.072 -0.434118,-0.3472 -0.769262,-0.6127 -1.347207,-1.0671 -1.84221,-2.1124 -1.660835,-3.5068 0.05161,-0.3967 0.985602,-2.5301 2.26731,-5.1789 1.19876,-2.4772 2.169361,-4.5538 2.156894,-4.6142 -0.01235,-0.06 0.04381,-0.1555 0.125094,-0.2099 0.282203,-0.1926 2.915515,-5.8248 2.811297,-6.0127 -0.05766,-0.1034 -0.04655,-0.1333 0.02469,-0.069 0.129342,0.1211 1.554124,-2.5752 1.567179,-2.9653 0.0042,-0.1136 0.07888,-0.205 0.166801,-0.205 0.08794,0 0.118601,-0.042 0.06816,-0.094 -0.115613,-0.1185 -1.080861,0.3862 -1.080861,0.566 0,0.075 -0.100628,0.1333 -0.223596,0.1333 -5.092355,2.0493 -10.81617,5.2056 -15.30044,7.3065 -1.194819,0.5615 -2.35406,1.1815 -2.576091,1.378 -0.23819,0.2101 -0.583131,0.8809 -0.841316,1.6338 -0.240708,0.7017 -0.572162,1.4524 -0.736601,1.6679 -0.164454,0.215 -0.264052,0.428 -0.221373,0.4719 0.04272,0.045 -0.707194,1.6681 -1.666408,3.6087 -2.341479,4.7371 -2.474345,4.9937 -2.659036,5.1334 -0.08794,0.067 -0.09478,0.1235 -0.01531,0.1235 0.0796,0 0.03987,0.1333 -0.08825,0.2912 -0.128107,0.158 -0.435548,0.7335 -0.683178,1.2776 -0.247621,0.5442 -0.634716,1.2432 -0.860197,1.5537 -0.225472,0.3101 -0.306962,0.5 -0.181075,0.4217 0.196187,-0.1209 0.197322,-0.1035 0.0075,0.1383 -2.425353,4.8872 -5.47399,9.4349 -7.556941,14.4106 -0.628405,1.1552 -1.003355,2.2416 -1.559842,3.6746 l 0.751363,0 c 2.530034,0.3101 -0.405368,0.6207 -1.247385,0.7153 -3.053984,0.3398 -14.762974,0.1087 -15.158869,-0.3002 -0.401283,-0.4139 1.55562,-0.5993 6.72376,-0.6371 2.088485,-0.026 3.797415,-0.034 3.797621,-0.045 1.69e-4,0 -0.438355,-0.3724 -0.974604,-0.807 -0.53624,-0.4344 -1.129869,-0.9482 -1.319175,-1.1413 -0.189297,-0.1926 -0.570898,-0.4983 -0.847998,-0.6773 -0.277102,-0.1803 -0.96067,-0.717 -1.51905,-1.1953 -0.558381,-0.4786 -1.107847,-0.9479 -1.221038,-1.0429 -0.113193,-0.096 -0.652862,-0.5492 -1.199251,-1.0087 -1.152866,-0.9699 -2.261185,-2.1643 -2.595856,-2.7979 -0.219546,-0.4156 -0.211891,-0.4505 0.124576,-0.5675 0.575193,-0.2 1.254864,-0.026 3.391438,0.9015 0.348932,0.1507 0.67273,0.2801 0.719545,0.2877 0.106503,0.026 0.580147,0.2075 1.204434,0.4773 0.263838,0.1137 0.839472,0.3423 1.2792,0.5055 0.439728,0.1629 0.871461,0.3477 0.959405,0.4104 0.19468,0.1383 1.073771,0.3884 1.237454,0.3518 0.06499,-0.026 0.388789,0.082 0.719555,0.21 1.096251,0.4323 2.903865,0.5904 4.483143,0.392 1.398539,-1.1051 2.3849,-2.8492 2.993953,-4.258 0.159171,-0.1827 0.224286,-0.3309 0.144725,-0.3321 -0.07961,0 -0.06464,-0.06 0.03316,-0.1235 0.938721,-1.873 1.965338,-3.9524 2.771688,-5.7273 0.996828,-2.1517 1.497267,-3.2969 1.541856,-3.5286 0.02445,-0.1285 0.13917,-0.2929 0.254952,-0.3684 0.115787,-0.076 0.155073,-0.1384 0.08734,-0.1384 -0.06773,0 0.01407,-0.2807 0.182061,-0.6209 0.167887,-0.3401 0.396592,-0.9339 0.50826,-1.3192 0.111661,-0.3855 0.251602,-0.7007 0.310965,-0.7007 0.05933,0 0.108847,-0.091 0.109934,-0.205 8.35e-4,-0.1135 0.344462,-1.0966 0.763047,-2.1845 0.862808,-2.2434 1.715261,-4.5189 2.192943,-5.8541 0.17848,-0.4985 0.385591,-1.0551 0.460257,-1.2364 0.07462,-0.1827 0.290014,-0.7381 0.478571,-1.2365 0.188556,-0.4991 0.484107,-1.2409 0.656774,-1.649 0.172679,-0.4083 0.324039,-0.8164 0.336374,-0.9073 0.01235,-0.09 0.08144,-0.2395 0.15354,-0.3296 2.745818,-4.1425 7.599459,-6.982 10.974714,-10.0736 0.07412,0.046 0.559835,-0.3009 1.079321,-0.7734 0.519489,-0.4728 1.016486,-0.9158 1.104433,-0.9849 0.461685,-0.3621 2.415061,-1.97626 3.439978,-2.84298 0.643644,-0.54395 1.53608,-1.27854 1.983187,-1.63223 0.447116,-0.3536 0.848914,-0.69113 0.892887,-0.7499 0.04398,-0.0594 0.547618,-0.47412 1.119223,-0.92327 0.571606,-0.44915 1.157113,-0.93804 1.301132,-1.0867 1.217989,-1.37715 3.119823,-2.44536 5.494709,-4.48402 0.175888,-0.1704 0.481079,-0.42157 0.678196,-0.55807 0.197124,-0.13584 0.317693,-0.31607 0.267943,-0.399 -0.04978,-0.0846 -0.02197,-0.13092 0.06207,-0.1062 0.239202,0.0716 1.170546,-0.69465 1.063052,-0.87414 0.526115,-0.27429 1.011816,-0.72103 1.592767,-1.22106 0.315357,-0.31609 0.573374,-0.53309 0.573374,-0.48295 0,0.052 0.09273,0 0.206064,-0.126 0.263571,-0.27876 0.857281,-1.71765 0.97425,-2.36161 0.04946,-0.27189 0.197372,-0.93887 0.328719,-1.48236 0.428665,-1.77243 0.706522,-4.87318 0.805456,-8.98823 0.05344,-2.22187 0.134207,-4.41067 0.179494,-4.86403 l 0.08235,-0.82475 -1.060906,1.1544 c -0.997559,1.08526 -1.620531,1.99397 -1.550255,2.26114 0.01704,0.0642 -0.07057,0.079 -0.194704,0.0296 -0.391291,0.0987 -0.501834,0.4077 -0.713861,0.76105 -0.05277,0.0445 -0.203915,0.22718 -0.335833,0.4025 -0.189173,0.25236 -0.192382,0.29088 -0.01531,0.18025 0.15243,-0.0938 0.187939,-0.079 0.110501,0.0518 -0.06275,0.10619 -0.188259,0.19012 -0.278919,0.19012 -0.219028,0 -1.09421,0.85834 -1.013146,0.99341 0.0349,0.0593 -0.03816,0.1062 -0.162307,0.1062 -0.124157,0 -0.180605,-0.0817 -0.12539,-0.18025 0.05528,-0.0987 -0.0379,-0.0593 -0.206903,0.0888 -0.169,0.1482 -0.486567,0.32574 -0.705668,0.39463 -0.219102,0.0687 -0.830701,0.33039 -1.359148,0.58026 -0.528438,0.25017 -2.004147,0.91213 -3.279346,1.4715 -1.275203,0.55927 -2.714304,1.19217 -3.198004,1.40621 -0.483698,0.21488 -1.27127,0.54767 -1.750167,0.74127 -0.478897,0.19267 -1.882018,0.81686 -3.118052,1.3856 -1.236034,0.56865 -2.551185,1.16767 -2.922554,1.33193 -0.371371,0.16296 -0.635848,0.36344 -0.587737,0.44366 0.04813,0.0817 0.02817,0.13586 -0.0443,0.1235 -0.372035,-0.0669 -0.552664,0.0696 -0.83978,0.63366 -0.447489,0.87925 -1.459925,1.9016 -2.574023,2.59941 -0.554326,0.34747 -0.913836,0.67562 -0.85236,0.77833 0.05986,0.0988 0.03197,0.13083 -0.06374,0.0687 -0.09354,-0.0594 -0.554369,0 -1.024082,0.11849 -0.753528,0.20251 -0.87076,0.1975 -0.996314,-0.027 -0.08838,-0.15803 -0.07272,-0.36872 0.04128,-0.55686 0.220286,-0.36371 0.168258,-0.37114 -0.522171,-0.0743 -0.618935,0.26668 -0.81222,0.18274 -1.045333,-0.4484 -0.107216,-0.29093 -0.110896,-0.42204 -0.01013,-0.35805 0.08768,0.0566 0.159395,0.0297 0.159395,-0.0623 0,-0.0891 -0.161889,-0.18516 -0.359767,-0.21487 -0.470368,-0.0688 -0.608356,-0.8916 -0.169198,-1.00888 0.265184,-0.0716 0.265957,-0.0789 0.0094,-0.0963 -0.201247,-0.0251 -0.279816,-0.16055 -0.279816,-0.52158 0,-0.39482 0.0969,-0.54543 0.451063,-0.70078 0.248089,-0.10865 0.687068,-0.47636 0.97551,-0.81611 0.288446,-0.33977 0.578837,-0.58296 0.645305,-0.54098 0.06648,0.0418 0.616884,-0.0743 1.223119,-0.25731 0.700413,-0.21237 1.481152,-0.32277 2.141602,-0.30206 2.110749,0.0641 2.31036,0.0371 3.517802,-0.53949 0.65959,-0.31386 1.666959,-0.77536 2.238605,-1.02579 3.031703,-1.32747 4.088345,-1.82722 4.190677,-1.98284 0.06222,-0.0938 0.206879,-0.17281 0.32137,-0.17532 0.442396,0 2.508882,-0.96422 2.413874,-1.123 -0.05477,-0.091 -0.02199,-0.11608 0.07296,-0.0566 1.543716,-0.53188 2.560566,-1.04101 4.005334,-1.69664 2.056903,-0.83585 2.850417,-1.30872 3.254873,-1.93889 0.221843,-0.34596 0.422133,-0.70276 0.445104,-0.79339 0.02297,-0.0888 0.169345,-0.35063 0.325277,-0.57733 1.282843,-2.34484 2.512396,-4.38819 3.690116,-6.59106 1.9656,-3.57011 2.240617,-4.25238 2.549304,-6.32635 0.374555,-2.51596 0.536416,-3.28935 1.069834,-5.11244 l 0.426736,-1.45837 -0.648322,-0.60276 c -2.12486,-1.97568 -2.645204,-2.33003 -3.513489,-2.392 -0.189469,-0.0247 -0.311149,-0.0816 -0.270386,-0.14817 0.130478,-0.2173 -1.116856,-0.12839 -1.943501,0.13829 -1.101232,0.35582 -1.650321,0.44052 -2.101859,0.32372 -0.424262,-0.10865 -1.442857,-1.14304 -1.58632,-1.60924 -0.05004,-0.16051 -0.158136,-0.29559 -0.240165,-0.29559 -0.08203,0 -0.149121,-0.13334 -0.149121,-0.29458 0,-0.1605 -0.220163,-0.42817 -0.489235,-0.59189 -0.608014,-0.37059 -0.836707,-0.96124 -0.707354,-1.82698 0.09813,-0.65684 0.616332,-3.65877 0.798231,-4.62452 0.405432,-2.15175 0.440072,-2.55251 0.241844,-2.79895 -0.111342,-0.13828 -0.268626,-0.25163 -0.349508,-0.25163 -0.08087,0 -0.23399,-0.0741 -0.340196,-0.16297 -0.106226,-0.0914 -0.358579,-0.29507 -0.56079,-0.4536 -0.202212,-0.16051 -0.437121,-0.58547 -0.521996,-0.94797 -0.326037,-1.39368 -0.422426,-2.05076 -0.288247,-1.96508 0.07622,0.0494 0.138553,0 0.138553,-0.0839 0,-0.31138 1.033008,-1.62603 1.359158,-1.73024 0.768349,-0.24446 3.952304,-0.59115 5.43083,-0.59115 1.647753,0 2.06574,0.13087 2.604541,0.81685 0.173518,0.22223 0.187938,0.2099 0.107859,-0.0741 -0.09243,-0.3299 -0.09243,-0.3299 0.107217,0 0.10981,0.18273 0.344719,0.43657 0.522037,0.5672 0.416733,0.30644 0.711153,0.62745 1.301235,1.41762 0.263835,0.35336 0.61702,0.78672 0.78486,0.96278 0.290189,0.30422 0.296,0.43782 0.118328,2.72587 -0.227448,2.92932 -0.226435,4.80082 0.0032,5.78632 0.09504,0.40817 0.181839,1.1502 0.192901,1.64924 0.01851,0.83562 0.07354,0.96179 0.700605,1.60747 0.374279,0.38546 0.718572,0.70078 0.765097,0.70078 2.169854,2.17916 5.7163,4.67958 6.791597,7.21975 0.72886,1.36429 1.5377,2.98959 1.99296,4.36473 0.19157,0.61264 0.37866,1.08379 0.41574,1.04724 0.0371,-0.0346 0.0868,0.45287 0.1105,1.08772 0.0237,0.63486 0.10651,1.27688 0.18413,1.42627 0.33153,0.63856 1.74051,2.31077 1.85624,2.20312 0.0695,-0.0642 0.0774,-0.0296 0.0173,0.079 -0.0605,0.10865 0.12406,0.47633 0.41382,0.82425 1.64884,1.59691 1.25063,1.61715 2.549,2.75501 0.11521,-0.0741 0.13852,-0.042 0.0631,0.0839 -0.0755,0.12594 0.40084,0.744 1.29446,1.67987 0.77761,0.81438 1.46469,1.608 1.52685,1.76357 0.14704,0.36842 0.71313,3.18861 1.72835,8.61045 0.45003,2.40311 1.07445,5.55669 1.38757,7.00785 0.31314,1.45097 0.60422,2.80342 0.64684,3.00492 0.0799,0.37783 0.30183,0.64405 1.48175,1.7769 0.37789,0.36278 0.82333,0.95641 0.98987,1.3191 0.16652,0.3628 0.45461,0.9191 0.64016,1.23667 0.27253,0.46623 0.34029,0.86226 0.3526,2.06113 0.0148,1.43936 0.004,1.48355 -0.34453,1.46424 -0.3203,-0.025 -0.35979,0.0594 -0.35979,0.68945 0,0.8203 -0.5616,1.86855 -1.00701,1.87914 -0.42068,0 -1.03,-0.74323 -1.65693,-2.04953 -0.65877,-1.37241 -0.62934,-1.33712 -0.90967,-1.09709 -0.29818,0.25536 -0.6882,0.0836 -0.81461,-0.36177 -0.0564,-0.1975 -0.14601,-1.08577 -0.19924,-1.97291 -0.0784,-1.30732 -0.0404,-1.80587 0.19983,-2.62421 l 0.29663,-1.01019 -0.42616,-2.16159 c -0.23438,-1.18874 -0.8631,-4.01509 -1.39713,-6.28041 -0.53405,-2.26514 -1.127,-4.786 -1.31767,-5.60239 -0.19068,-0.8163 -0.40483,-1.509 -0.47591,-1.53956 -0.071,-0.0297 -0.0973,-0.10619 -0.0585,-0.17289 0.13916,-0.23214 -0.53442,-2.89846 -0.77877,-3.08241 -0.13715,-0.10374 -0.25098,-0.2541 -0.25298,-0.33484 -0.002,-0.0816 -0.40233,-0.59214 -0.88962,-1.13613 -0.4873,-0.54424 -1.08483,-1.21194 -1.32787,-1.48405 -0.99446,-1.11316 -2.28873,-2.22485 -2.46738,-2.11965 -0.10364,0.0617 -0.13635,0.0518 -0.0726,-0.0247 0.10788,-0.12347 -0.7891,-1.06674 -1.01951,-1.07242 -0.14771,0 -0.25809,1.21638 -0.61884,6.84045 -0.42804,6.67333 -0.70952,9.46784 -1.34533,13.356 -0.31125,1.90355 -1.22986,5.32901 -1.695894,6.32388 -0.171962,0.36687 -0.334121,0.81211 -0.360352,0.98946 -0.02627,0.17773 -0.125738,0.42222 -0.221151,0.54443 -0.557358,2.20411 -1.581049,2.62485 -2.358316,4.6117 0.07213,0.12099 0.04953,0.15311 -0.05858,0.0836 -0.105788,-0.0669 -0.515161,0.43289 -1.02408,1.25197 -0.46633,0.7501 -1.081163,1.69803 -1.36629,2.10653 -0.285128,0.4084 -0.779925,1.1507 -1.099543,1.64924 -0.319628,0.4992 -1.039747,1.5536 -1.600264,2.3442 -0.560527,0.7901 -1.019127,1.5181 -1.019127,1.6172 0,0.099 -0.06035,0.1409 -0.134109,0.094 -0.07381,-0.047 -0.286518,0.1902 -0.472797,0.5262 -0.186284,0.3363 -0.591375,0.9008 -0.900217,1.2542 -0.30884,0.3531 -0.516278,0.7243 -0.460971,0.8243 0.05534,0.1013 0.04248,0.1284 -0.02843,0.06 -0.07097,-0.064 -0.496234,0.3854 -0.945059,1.0033 -1.267981,1.7456 -3.512195,4.5877 -5.031753,6.3728 -0.23177,0.2723 -0.993006,1.181 -1.691644,2.0199 -0.698633,0.8386 -1.328239,1.525 -1.399123,1.525 -0.07089,0 -0.128872,0.083 -0.128872,0.1852 0,0.1034 -0.162134,0.344 -0.360284,0.5356 -0.198136,0.1902 -0.565246,0.6083 -0.815754,0.926 -0.250505,0.3173 -0.401056,0.4728 -0.334562,0.3456 0.08003,-0.153 0.0585,-0.1925 -0.06374,-0.1135 -0.101535,0.064 -0.184605,0.2075 -0.184605,0.3203 0,0.1111 -0.681363,0.9419 -1.514146,1.8452 -0.832782,0.9034 -1.516356,1.7301 -1.51905,1.837 -0.0025,0.1086 -0.231201,0.3768 -0.507769,0.5998 l -0.502857,0.4059 0.542834,0.1186 c 0.92001,0.2025 2.455326,0.781 2.579117,0.9724 0.06457,0.1013 0.118576,0.116 0.119934,0.037 0.0017,-0.079 0.103016,-0.06 0.22599,0.047 0.122946,0.1066 0.359677,0.2174 0.526078,0.2512 0.166406,0.034 0.682288,0.2911 1.146425,0.5734 0.464135,0.2822 0.801341,0.442 0.74934,0.3553 -0.116503,-0.195 1.393684,0.6528 1.529903,0.8584 0.05378,0.082 0.145688,0.1358 0.204161,0.1234 6.033698,2.6599 9.733095,5.9139 15.048441,8.657 0.351782,0.1801 0.675571,0.3717 0.719544,0.428 0.04398,0.057 0.453208,0.3028 0.909417,0.5477 0.456199,0.2445 0.914725,0.5514 1.018952,0.6808 0.104211,0.1309 0.27981,0.2346 0.390187,0.2346 0.110379,0 0.289607,0.1086 0.39829,0.2445 0.108698,0.1333 0.253856,0.2073 0.322619,0.1654 0.0688,-0.045 0.168057,0.037 0.220607,0.1778 0.0526,0.1408 0.16315,0.2124 0.2457,0.1605 0.1766,-0.1111 2.59562,2.3728 2.48658,2.5546 -0.0407,0.068 0.0156,0.1604 0.12476,0.2073 0.10943,0.045 0.33929,0.368 0.51082,0.7178 0.17155,0.3502 0.41655,0.7666 0.54447,0.9252 0.12793,0.1581 0.18053,0.2885 0.11694,0.2885 -0.0636,0 0.0188,0.205 0.18288,0.4536 0.81662,1.2403 0.88129,2.0164 0.20915,2.5098 -0.5171,0.3797 -1.81923,0.8788 -2.76447,1.0593 -0.32979,0.062 -0.59962,0.1976 -0.59962,0.2993 0,0.1013 0.0474,0.1358 0.10522,0.076 0.0578,-0.06 0.20584,-0.026 0.32882,0.083 0.12298,0.1066 0.21104,0.1236 0.19565,0.039 -0.0698,-0.3786 0.0294,-0.4356 0.24673,-0.1408 0.19097,0.2583 0.26447,0.2769 0.37976,0.096 0.0852,-0.1333 0.18206,-0.1581 0.23976,-0.062 0.0533,0.09 0.40977,0.1679 0.79229,0.1753 0.76812,0.026 1.54939,0.267 1.54939,0.4981 0,0.5534 -1.05419,0.6966 -5.554305,0.7546 -1.932509,0.026 -3.591065,0.094 -3.685676,0.1555 -0.09463,0.062 -0.219398,0.033 -0.277266,-0.064 -0.07258,-0.121 -0.179123,-0.1111 -0.343038,0.03 -0.141689,0.121 -0.281349,0.1407 -0.345544,0.049 -2.419479,0.1974 -4.068025,-0.1187 -6.551607,-0.2559 z"
+       id="path3004"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccscscscccccsccccccscccccscsccccccsccccccccccccccccccccccccccccccccccccccsscsccsccccsccscscccccccsccssscsccccccscsccccsccsccccsccccccccscccscsccscccccccccccsscccccccssccscsccscscsscccscscscccccsscccccscsscsccscscscccccsssccccsccccsscccccccccscccccccsssccccscccccccccscccccscscccccccsscccsccccsccssccccc" />
+  </g>
+</svg>
diff --git a/adventure-composer/src/dist/LICENSE b/adventure-editor/src/dist/LICENSE
similarity index 100%
rename from adventure-composer/src/dist/LICENSE
rename to adventure-editor/src/dist/LICENSE
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/Ctx.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/Ctx.java
similarity index 92%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/Ctx.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/Ctx.java
index 87e246728..732f3d06a 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/Ctx.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/Ctx.java
@@ -16,10 +16,8 @@
 package com.bladecoder.engineeditor;
 
 import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.utils.Message;
 
 public class Ctx {
 	public static Project project;
-	public static Message msg;
 	public static EditorAssetManager assetManager;
 }
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/Editor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/Editor.java
new file mode 100644
index 000000000..84f828456
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/Editor.java
@@ -0,0 +1,207 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor;
+
+import com.badlogic.gdx.ApplicationListener;
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.*;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.Scaling;
+import com.badlogic.gdx.utils.viewport.ScreenViewport;
+import com.bladecoder.engine.ui.BladeSkin;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.EditorUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.scneditor.ScnEditor;
+import com.bladecoder.engineeditor.ui.ActorPanel;
+import com.bladecoder.engineeditor.ui.ProjectPanel;
+import com.bladecoder.engineeditor.ui.ProjectToolbar;
+import com.bladecoder.engineeditor.ui.ScenePanel;
+import com.kotcrab.vis.ui.VisUI;
+import com.kotcrab.vis.ui.widget.file.FileChooser;
+import com.strongjoshua.console.GUIConsole;
+
+import java.io.File;
+import java.io.IOException;
+
+//TODO: Set TITLE in window bar. Set '*' in the title when modified
+
+public class Editor implements ApplicationListener {
+    public static final String SKIN = "skin/BladeSkin/blade-skin.json";
+
+    Stage stage;
+    ScnEditor scnEditor;
+    Skin skin;
+
+    @Override
+    public void create() {
+
+        if (EditorLogger.debugMode()) {
+            EngineLogger.setDebug();
+        }
+
+        skin = new BladeSkin(Gdx.files.internal(SKIN));
+        VisUI.load();
+        FileChooser.setDefaultPrefsName("com.bladecoder.engineeditor.filechooser");
+
+        /* STAGE SETUP */
+        stage = new Stage(new ScreenViewport());
+        Gdx.input.setInputProcessor(stage);
+
+        setCtx();
+
+        Message.init(skin);
+
+        scnEditor = new ScnEditor(skin);
+        scnEditor.setBackground("background");
+        skin.getFont("default-font").getData().markupEnabled = true;
+
+        // RIGHT PANEL
+        ScenePanel scenePanel = new ScenePanel(skin);
+        ActorPanel actorPanel = new ActorPanel(skin);
+
+        Table rightPanel = new Table(skin);
+        rightPanel.top().left();
+        rightPanel.add(actorPanel).expand().fill().left();
+        rightPanel.setBackground("background");
+
+        SplitPane splitPaneRight = new SplitPane(scnEditor, rightPanel, false, skin);
+
+        splitPaneRight.setSplitAmount(0.75f);
+
+        // LEFT PANEL
+        ProjectPanel projectPanel = new ProjectPanel(skin);
+        Image img = new Image(Ctx.assetManager.getIcon("title"));
+        img.setScaling(Scaling.none);
+        img.setAlign(Align.left);
+
+        Table leftPanel = new Table(skin);
+        leftPanel.top().left().padLeft(10);
+        leftPanel.add(img).expand().fill().padBottom(20).padTop(20).padLeft(0).left();
+        leftPanel.row();
+        leftPanel.add(new ProjectToolbar(skin)).expandX().fill().left();
+        leftPanel.row();
+        leftPanel.add(projectPanel).expand().fill().left();
+        leftPanel.row();
+        leftPanel.add(scenePanel).expand().fill().left();
+        leftPanel.setBackground("background");
+
+        SplitPane splitPaneLeft = new SplitPane(leftPanel, splitPaneRight, false, skin);
+        splitPaneLeft.setFillParent(true);
+        splitPaneLeft.setSplitAmount(0.25f);
+        stage.addActor(splitPaneLeft);
+
+        // LOAD LAST OPEN PROJECT
+        String lastProject = Ctx.project.getEditorConfig().getProperty(Project.LAST_PROJECT_PROP, "");
+        final File lastProjectFile = new File(lastProject);
+
+        if (!lastProject.isEmpty() && lastProjectFile.exists()) {
+            EditorLogger.debug("Loading previous project: " + lastProject);
+
+            try {
+                EditorUtils.checkVersionAndLoadProject(lastProjectFile, stage, skin);
+            } catch (Exception e) {
+                EditorLogger.error("Error loading previous project.", e);
+                Ctx.project.closeProject();
+            }
+        }
+
+        stage.setScrollFocus(scnEditor.getScnWidget());
+        stage.setKeyboardFocus(scnEditor.getScnWidget());
+
+        // TooltipManager.getInstance().instant();
+        TooltipManager.getInstance().initialTime = 0.2f;
+        TooltipManager.getInstance().hideAll();
+        TooltipManager.getInstance().subsequentTime = 0.2f;
+    }
+
+    private void setCtx() {
+        Ctx.project = new Project();
+        Ctx.assetManager = new EditorAssetManager();
+
+        EditorLogger.setConsole(new GUIConsole());
+    }
+
+    @Override
+    public void render() {
+        Gdx.gl.glClearColor(0, 0, 0, 1);
+        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+
+        stage.act(Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f));
+
+        stage.draw();
+
+        EditorLogger.drawConsole();
+    }
+
+    @Override
+    public void resize(int width, int height) {
+        stage.getViewport().update(width, height, true);
+        EditorLogger.console.refresh();
+    }
+
+    @Override
+    public void pause() {
+
+    }
+
+    @Override
+    public void resume() {
+
+    }
+
+    @Override
+    public void dispose() {
+        scnEditor.dispose();
+        stage.dispose();
+        EditorLogger.console.dispose();
+        VisUI.dispose();
+
+        Ctx.project.saveConfig();
+    }
+
+    public void exit() {
+        if (Ctx.project.isLoaded() && Ctx.project.isModified()) {
+            new Dialog("Save Project", skin) {
+                protected void result(Object object) {
+                    if (((Boolean) object).booleanValue()) {
+                        try {
+                            Ctx.project.saveProject();
+                        } catch (IOException e1) {
+                            String msg = "Something went wrong while saving the actor.\n\n"
+                                    + e1.getClass().getSimpleName() + " - " + e1.getMessage();
+                            Message.showMsgDialog(getStage(), "Error", msg);
+
+                            EditorLogger.printStackTrace(e1);
+                        }
+                    }
+
+                    ((Main) Gdx.app).exitSaved();
+                }
+            }.text("Save changes to project?").button("Yes", true).button("No", false).key(Keys.ENTER, true)
+                    .key(Keys.ESCAPE, false).show(stage);
+
+        } else {
+            ((Main) Gdx.app).exitSaved();
+        }
+
+    }
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/EditorAssetManager.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/EditorAssetManager.java
similarity index 92%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/EditorAssetManager.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/EditorAssetManager.java
index 05588185e..f3ab3b84d 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/EditorAssetManager.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/EditorAssetManager.java
@@ -19,7 +19,7 @@
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engineeditor.common.EditorLogger;
 
 public class EditorAssetManager extends AssetManager {
 	public static final String ICON_ATLAS = "images/icons.atlas";
@@ -38,7 +38,7 @@ public TextureRegion getIcon(String name) {
 		AtlasRegion region = a.findRegion(name);
 
 		if (region == null) {
-			EngineLogger.error("Region " + name + " not found in icon atlas ");
+			EditorLogger.error("Region " + name + " not found in icon atlas ");
 		}
 
 		return region;
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/Main.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/Main.java
new file mode 100644
index 000000000..416d7795d
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/Main.java
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor;
+
+import com.badlogic.gdx.Files.FileType;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
+import com.badlogic.gdx.utils.SharedLibraryLoader;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.EditorLogger.Levels;
+import com.bladecoder.engineeditor.common.Versions;
+import org.lwjgl.glfw.GLFW;
+import org.lwjgl.glfw.GLFWVidMode;
+import org.lwjgl.system.Configuration;
+import org.lwjgl.system.macosx.LibC;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.lwjgl.glfw.GLFW.glfwGetPrimaryMonitor;
+import static org.lwjgl.glfw.GLFW.glfwGetVideoMode;
+
+public class Main extends Lwjgl3Application {
+
+    private final static Lwjgl3ApplicationConfiguration cfg = new Lwjgl3ApplicationConfiguration();
+
+    public static void main(final String[] args) {
+
+        if (SharedLibraryLoader.isMac && !"1".equals(System.getenv("JAVA_STARTED_ON_FIRST_THREAD_" + LibC.getpid()))) {
+            System.out.println("MacOs detected. Running in async mode.");
+            Configuration.GLFW_LIBRARY_NAME.set("glfw_async");
+        }
+
+        cfg.setTitle("Adventure Editor v" + Versions.getVersion());
+
+        cfg.setResizable(true);
+        cfg.useVsync(true);
+
+        List<String> iconList = new ArrayList<>();
+
+        if (Main.class.getResource("/images/ic_app64.png") != null)
+            iconList.add("images/ic_app64.png");
+
+        if (Main.class.getResource("/images/ic_app32.png") != null)
+            iconList.add("images/ic_app32.png");
+
+        if (Main.class.getResource("/images/ic_app16.png") != null)
+            iconList.add("images/ic_app16.png");
+
+        cfg.setWindowIcon(FileType.Internal, iconList.toArray(new String[0]));
+        cfg.setOpenGLEmulation(Lwjgl3ApplicationConfiguration.GLEmulation.GL20, 0, 0);
+
+        GLFW.glfwInit();
+        GLFWVidMode glfwGetVideoMode = glfwGetVideoMode(glfwGetPrimaryMonitor());
+        cfg.setWindowedMode(Math.max((int) (glfwGetVideoMode.width() * 0.9), 1920 / 2),
+                Math.max((int) (glfwGetVideoMode.height() * 0.9), 1080 / 2));
+
+        parseArgs(args);
+
+        new Main(new Editor(), cfg);
+    }
+
+    private static void parseArgs(String[] args) {
+        for (int i = 0; i < args.length; i++) {
+            if (args[i].equals("-f") && i < args.length - 1) {
+                try {
+                    File file = new File(args[i + 1]).getCanonicalFile();
+                    Ctx.project.loadProject(file);
+                } catch (Exception ex) {
+                    EditorLogger.printStackTrace(ex);
+                }
+            } else if (args[i].equals("-d")) {
+                EditorLogger.setDebugLevel(Levels.DEBUG);
+            } else if (args[i].equals("-opengl")) {
+                cfg.setOpenGLEmulation(Lwjgl3ApplicationConfiguration.GLEmulation.GL20, 0, 0);
+            } else if (args[i].equals("-angle")) {
+                System.out.println("Activating OpenGL emulation through ANGLE.");
+                cfg.setOpenGLEmulation(Lwjgl3ApplicationConfiguration.GLEmulation.ANGLE_GLES20, 0, 0);
+            }
+        }
+    }
+
+    public Main(Editor editor, Lwjgl3ApplicationConfiguration cfg) {
+        super(editor, cfg);
+    }
+
+    @Override
+    public void exit() {
+        ((Editor) getApplicationListener()).exit();
+    }
+
+    public void exitSaved() {
+        super.exit();
+    }
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ActionDetector.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ActionDetector.java
new file mode 100644
index 000000000..651c7742b
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ActionDetector.java
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.common;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+
+import com.badlogic.gdx.utils.reflect.ClassReflection;
+import com.badlogic.gdx.utils.reflect.ReflectionException;
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.ActionDescription;
+import com.bladecoder.engine.actions.ActionFactory;
+import com.bladecoder.engine.actions.DisableActionAction;
+import com.bladecoder.engine.actions.EndAction;
+import com.bladecoder.engine.util.ActionUtils;
+
+import eu.infomas.annotation.AnnotationDetector;
+import eu.infomas.annotation.AnnotationDetector.TypeReporter;
+
+public class ActionDetector {
+
+	private static HashMap<String, Class<?>> actions = null;
+
+	public static void detect() {
+
+		actions = new HashMap<String, Class<?>>();
+
+		final TypeReporter reporter = new TypeReporter() {
+
+			@SuppressWarnings("unchecked")
+			@Override
+			public Class<? extends Annotation>[] annotations() {
+				return new Class[] { ActionDescription.class };
+			}
+
+			@SuppressWarnings("unchecked")
+			@Override
+			public void reportTypeAnnotation(Class<? extends Annotation> annotation, String className) {
+				Class<Action> c = null;
+
+				try {
+					c = ClassReflection.forName(className);
+				} catch (ReflectionException e) {
+					EditorLogger.printStackTrace(e);
+				}
+
+				String name = ActionUtils.getName(c);
+
+				if ( !c.isAssignableFrom(EndAction.class) && 
+						!c.isAssignableFrom(DisableActionAction.class ))
+					actions.put(name, c);
+			}
+
+		};
+
+		final AnnotationDetector cf = new AnnotationDetector(reporter);
+
+		try {
+			cf.detect();
+		} catch (IOException e) {
+			EditorLogger.printStackTrace(e);
+		}
+	}
+
+	public static String[] getActionNames() {
+		if (actions == null) {
+			detect();
+		}
+		
+		ArrayList<String> names = new ArrayList<String>();
+		names.addAll(actions.keySet());
+
+		addCustomActions(names);
+
+		return names.toArray(new String[names.size()]);
+	}
+
+	public static Action create(String name, HashMap<String, String> params) {
+		Class<?> c = actions.get(name);
+		
+		if(c == null) {
+			// Search in custom actions
+			c = getCustomActionByName(name);
+		}
+
+		if (c == null) {
+			EditorLogger.error("Action with name '" + name + "' not found.");
+
+			return null;
+		}
+
+		try {
+			return ActionFactory.create(c.getName(), params);
+		} catch (ClassNotFoundException | ReflectionException e) {
+			EditorLogger.error("Action with name '" + name + "' not found.");
+
+			return null;
+		}
+	}
+
+	private static void addCustomActions(ArrayList<String> names) {
+		Hashtable<String, Class<?>> coreClasses = ((FolderClassLoader) ActionFactory.getActionClassLoader())
+				.getClasses();
+
+		for (Class<?> c : coreClasses.values()) {
+			if (c.getAnnotation(ActionDescription.class) != null) {
+				names.add(ActionUtils.getName(c));
+			}
+		}
+	}
+	
+	private static Class<?> getCustomActionByName(String name) {
+		Hashtable<String, Class<?>> coreClasses = ((FolderClassLoader) ActionFactory.getActionClassLoader())
+				.getClasses();
+
+		for (Class<?> c : coreClasses.values()) {
+			if (c.getAnnotation(ActionDescription.class) != null) {
+				if(name.equals(ActionUtils.getName(c)))
+						return c;
+			}
+		}
+		
+		return null;
+	}
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/AlignUtils.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/AlignUtils.java
new file mode 100644
index 000000000..195e6fdc4
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/AlignUtils.java
@@ -0,0 +1,54 @@
+package com.bladecoder.engineeditor.common;
+
+import com.badlogic.gdx.utils.Align;
+
+public class AlignUtils {
+
+	public static String getAlign(int align) {
+		switch (align) {
+		case Align.bottomRight:
+			return "bottom-right";
+		case Align.bottomLeft:
+			return "bottom-left";
+		case Align.topRight:
+			return "top-right";
+		case Align.topLeft:
+			return "top-left";
+		case Align.right:
+			return "right";
+		case Align.left:
+			return "left";
+		case Align.bottom:
+			return "bottom";
+		case Align.top:
+			return "top";
+		case Align.center:
+			return "center";
+		}
+
+		return "";
+	}
+
+	public static int getAlign(String s) {
+		if ("bottom-right".equals(s))
+			return Align.bottomRight;
+		else if ("bottom-left".equals(s))
+			return Align.bottomLeft;
+		else if ("top-right".equals(s))
+			return Align.topRight;
+		else if ("top-left".equals(s))
+			return Align.topLeft;
+		else if ("right".equals(s))
+			return Align.right;
+		else if ("left".equals(s))
+			return Align.left;
+		else if ("bottom".equals(s))
+			return Align.bottom;
+		else if ("top".equals(s))
+			return Align.top;
+		else if ("center".equals(s))
+			return Align.center;
+
+		return 0;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/CustomTextureUnpacker.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/CustomTextureUnpacker.java
new file mode 100644
index 000000000..b6b95eabc
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/CustomTextureUnpacker.java
@@ -0,0 +1,175 @@
+package com.bladecoder.engineeditor.common;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
+import java.awt.image.AffineTransformOp;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.TextureAtlasData;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.TextureAtlasData.Page;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.TextureAtlasData.Region;
+
+/**
+ * The libgdx TextureUnpacker doesn't support atlases with animation frames.
+ * 
+ * @author rgarcia
+ */
+public class CustomTextureUnpacker {
+	private static final int NINEPATCH_PADDING = 1;
+	private static final String OUTPUT_TYPE = "png";
+
+	/** Splits an atlas into seperate image and ninepatch files. */
+	public void splitAtlas(TextureAtlasData atlas, String outputDir) {
+		// create the output directory if it did not exist yet
+		File outputDirFile = new File(outputDir);
+		if (!outputDirFile.exists()) {
+			outputDirFile.mkdirs();
+			EditorLogger.debug(String.format("Creating directory: %s", outputDirFile.getPath()));
+		}
+
+		for (Page page : atlas.getPages()) {
+			// load the image file belonging to this page as a Buffered Image
+			BufferedImage img = null;
+			try {
+				img = ImageIO.read(page.textureFile.file());
+			} catch (IOException e) {
+				printExceptionAndExit(e);
+			}
+			for (Region region : atlas.getRegions()) {
+				EditorLogger.debug(
+						String.format("Processing image for %s(%s): x[%s] y[%s] w[%s] h[%s], rotate[%s]", region.name,
+								region.index, region.left, region.top, region.width, region.height, region.rotate));
+
+				// check if the page this region is in is currently loaded in a
+				// Buffered Image
+				if (region.page == page) {
+					BufferedImage splitImage = null;
+					String extension = null;
+
+					// check if the region is a ninepatch or a normal image and
+					// delegate accordingly
+					if (region.findValue("split") == null) {
+						splitImage = extractImage(img, region, outputDirFile, 0);
+						extension = OUTPUT_TYPE;
+					} else {
+						splitImage = extractNinePatch(img, region, outputDirFile);
+						extension = String.format("9.%s", OUTPUT_TYPE);
+					}
+
+					// check if the parent directories of this image file exist
+					// and create them if not
+					File imgOutput = new File(outputDirFile, String.format("%s.%s",
+							region.index == -1 ? region.name : region.name + "_" + region.index, extension));
+					File imgDir = imgOutput.getParentFile();
+					if (!imgDir.exists()) {
+						System.out.println(String.format("Creating directory: %s", imgDir.getPath()));
+						imgDir.mkdirs();
+					}
+
+					// save the image
+					try {
+						ImageIO.write(splitImage, OUTPUT_TYPE, imgOutput);
+					} catch (IOException e) {
+						printExceptionAndExit(e);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Extract an image from a texture atlas.
+	 * 
+	 * @param page          The image file related to the page the region is in
+	 * @param region        The region to extract
+	 * @param outputDirFile The output directory
+	 * @param padding       padding (in pixels) to apply to the image
+	 * @return The extracted image
+	 */
+	private BufferedImage extractImage(BufferedImage page, Region region, File outputDirFile, int padding) {
+		BufferedImage splitImage = null;
+
+		// get the needed part of the page and rotate if needed
+		if (region.rotate) {
+			BufferedImage srcImage = page.getSubimage(region.left, region.top, region.height, region.width);
+			splitImage = new BufferedImage(region.width, region.height, page.getType());
+
+			AffineTransform transform = new AffineTransform();
+			transform.rotate(Math.toRadians(90.0));
+			transform.translate(0, -region.width);
+			AffineTransformOp op = new AffineTransformOp(transform, AffineTransformOp.TYPE_BILINEAR);
+			op.filter(srcImage, splitImage);
+		} else {
+			splitImage = page.getSubimage(region.left, region.top, region.width, region.height);
+		}
+
+		// draw the image to a bigger one if padding is needed
+		if (padding > 0) {
+			BufferedImage paddedImage = new BufferedImage(splitImage.getWidth() + padding * 2,
+					splitImage.getHeight() + padding * 2, page.getType());
+			Graphics2D g2 = paddedImage.createGraphics();
+			g2.drawImage(splitImage, padding, padding, null);
+			g2.dispose();
+			return paddedImage;
+		} else if (region.originalWidth != region.width || region.originalHeight != region.height) {
+			BufferedImage paddedImage = new BufferedImage(region.originalWidth, region.originalHeight, page.getType());
+			Graphics2D g2 = paddedImage.createGraphics();
+//				g2.drawImage(splitImage, (int)region.offsetX, region.originalHeight - region.height, null);
+			g2.drawImage(splitImage, (int) region.offsetX, region.originalHeight - region.height - (int) region.offsetY,
+					null);
+			g2.dispose();
+			return paddedImage;
+		} else {
+			return splitImage;
+		}
+	}
+
+	/**
+	 * Extract a ninepatch from a texture atlas, according to the android
+	 * specification.
+	 * 
+	 * @see <a href=
+	 *      "http://developer.android.com/guide/topics/graphics/2d-graphics.html#nine-patch">ninepatch
+	 *      specification</a>
+	 * @param page   The image file related to the page the region is in
+	 * @param region The region to extract
+	 */
+	private BufferedImage extractNinePatch(BufferedImage page, Region region, File outputDirFile) {
+		BufferedImage splitImage = extractImage(page, region, outputDirFile, NINEPATCH_PADDING);
+		Graphics2D g2 = splitImage.createGraphics();
+		g2.setColor(Color.BLACK);
+
+		// Draw the four lines to save the ninepatch's padding and splits
+		int[] splits = region.findValue("split");
+		int startX = splits[0] + NINEPATCH_PADDING;
+		int endX = region.width - splits[1] + NINEPATCH_PADDING - 1;
+		int startY = splits[2] + NINEPATCH_PADDING;
+		int endY = region.height - splits[3] + NINEPATCH_PADDING - 1;
+		if (endX >= startX)
+			g2.drawLine(startX, 0, endX, 0);
+		if (endY >= startY)
+			g2.drawLine(0, startY, 0, endY);
+		int[] pads = region.findValue("pad");
+		if (pads != null) {
+			int padStartX = pads[0] + NINEPATCH_PADDING;
+			int padEndX = region.width - pads[1] + NINEPATCH_PADDING - 1;
+			int padStartY = pads[2] + NINEPATCH_PADDING;
+			int padEndY = region.height - pads[3] + NINEPATCH_PADDING - 1;
+			g2.drawLine(padStartX, splitImage.getHeight() - 1, padEndX, splitImage.getHeight() - 1);
+			g2.drawLine(splitImage.getWidth() - 1, padStartY, splitImage.getWidth() - 1, padEndY);
+		}
+		g2.dispose();
+
+		return splitImage;
+	}
+
+	private void printExceptionAndExit(Exception e) {
+		e.printStackTrace();
+		System.exit(1);
+	}
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/DesktopUtils.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/DesktopUtils.java
similarity index 87%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/DesktopUtils.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/common/DesktopUtils.java
index 8d8d8689b..7a727d7cb 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/DesktopUtils.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/DesktopUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
+package com.bladecoder.engineeditor.common;
 
 import java.awt.Component;
 import java.awt.Desktop;
@@ -34,8 +34,7 @@ public class DesktopUtils {
 	public static void browse(Component parent, String uri) {
 		boolean error = false;
 
-		if (Desktop.isDesktopSupported()
-				&& Desktop.getDesktop().isSupported(Action.BROWSE)) {
+		if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Action.BROWSE)) {
 			try {
 				Desktop.getDesktop().browse(new URI(uri));
 			} catch (URISyntaxException ex) {
@@ -68,8 +67,13 @@ public static void removeDir(String dir) throws IOException {
 		File files[] = f.listFiles();
 
 		if (files != null)
-			for (File f2 : files)
-				Files.delete(f2.toPath());
+			for (File f2 : files) {
+				if (f2.isDirectory()) {
+					removeDir(f2.getAbsolutePath());
+				} else {
+					Files.delete(f2.toPath());
+				}
+			}
 
 		Files.deleteIfExists(f.toPath());
 	}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/DinamicClassPath.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/DinamicClassPath.java
similarity index 97%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/DinamicClassPath.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/common/DinamicClassPath.java
index da3c6c34c..b0cb51774 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/DinamicClassPath.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/DinamicClassPath.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
+package com.bladecoder.engineeditor.common;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/EditorCommandExecutor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/EditorCommandExecutor.java
new file mode 100644
index 000000000..10a7dfeb7
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/EditorCommandExecutor.java
@@ -0,0 +1,119 @@
+package com.bladecoder.engineeditor.common;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger.Levels;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.qa.QA;
+import com.strongjoshua.console.CommandExecutor;
+
+public class EditorCommandExecutor extends CommandExecutor {
+	public void qa() {
+		QA qa = new QA();
+		qa.run(Ctx.project.getWorld());
+	}
+
+	public void checkI18NMissingKeys() {
+		try {
+			ModelTools.checkI18NMissingKeys();
+			EditorLogger.msg("PROCCESS FINISHED: checkI18NMissingKeys.");
+		} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+			EditorLogger.printStackTrace(e);
+		}
+	}
+
+	public void debug(boolean value) {
+		if (!value) {
+			EditorLogger.setDebugLevel(Levels.ERROR);
+			console.setLoggingToSystem(false);
+		} else {
+			EditorLogger.setDebugLevel(Levels.DEBUG);
+			console.setLoggingToSystem(true);
+		}
+	}
+
+	public void extractDialogs() {
+		ModelTools.extractDialogs();
+		EditorLogger.msg("ExtractDialogs FINISHED.");
+	}
+
+	public void cleanI18N() {
+		Ctx.project.getI18N().cleanI18N();
+		EditorLogger.msg("CleanI18N FINISHED.");
+	}
+
+	public void printUnusedSounds() {
+		ModelTools.printUnusedSounds();
+		EditorLogger.msg("PROCCESS FINISHED.");
+	}
+
+	public void checkI18N() {
+		try {
+			EditorLogger.msg("Check for MODEL missing keys in default translation file for current chapter.");
+			ModelTools.checkI18NMissingKeys();
+
+			EditorLogger.msg("Compare translation files with the base file:");
+			String[] files = new File(Ctx.project.getAssetPath() + Project.MODEL_PATH).list(new FilenameFilter() {
+				@Override
+				public boolean accept(File arg0, String arg1) {
+
+					if (arg1.contains("_") && arg1.endsWith(".properties"))
+						return true;
+
+					return false;
+				}
+			});
+
+			for (String f : files) {
+				int idx = f.indexOf('_');
+				String base = f.substring(0, idx);
+				String lang = f.substring(idx + 1, idx + 3);
+				EditorLogger.msg("Checking " + base + " LANG: " + lang);
+				I18NUtils.compare(Ctx.project.getAssetPath() + Project.MODEL_PATH, base, null, lang);
+			}
+		} catch (Exception e) {
+			EditorLogger.printStackTrace(e);
+		}
+
+		EditorLogger.msg("PROCCESS FINISHED.");
+	}
+
+	public void extractInkTexts(String story, String lang) {
+		try {
+			ModelTools.extractInkTexts(Ctx.project.getModelPath() + "/" + story + EngineAssetManager.INK_EXT, lang);
+		} catch (Exception e) {
+			EditorLogger.printStackTrace(e);
+		}
+
+		EditorLogger.msg("PROCCESS FINISHED.");
+	}
+
+	public void importInkTSV(String tsvFile, String storyName) {
+		try {
+			I18NUtils.importTSV(Ctx.project.getAssetPath() + Project.MODEL_PATH, tsvFile, storyName + "-ink",
+					"default");
+
+			EditorLogger.msg(tsvFile + " imported sucessfully.");
+
+		} catch (IOException e) {
+			EditorLogger.error("There was a problem importing the .tsv file.");
+			EditorLogger.printStackTrace(e);
+		}
+
+		EditorLogger.msg("PROCCESS FINISHED.");
+	}
+
+	public void readableInkDialogs(String story, String lang) {
+		try {
+			ModelTools.readableInkDialogs(story, lang);
+		} catch (Exception e) {
+			EditorLogger.printStackTrace(e);
+		}
+
+		EditorLogger.msg("PROCCESS FINISHED.");
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/EditorLogger.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/EditorLogger.java
new file mode 100644
index 000000000..3fe7f0ae1
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/EditorLogger.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.common;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.InputListener;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.bladecoder.engine.util.EngineLogger;
+import com.strongjoshua.console.Console;
+import com.strongjoshua.console.LogLevel;
+
+public class EditorLogger {
+	public static enum Levels {
+		DEBUG, ERROR
+	};
+
+	public static Levels level = Levels.ERROR;
+
+	public static Console console;
+
+	private final static List<String> threadedMessages = new ArrayList<>();
+
+	public static void debug(String message) {
+		if (level == Levels.DEBUG) {
+			console.log(message, LogLevel.DEFAULT);
+		}
+	}
+
+	public static void msg(String message) {
+		console.log(message, LogLevel.SUCCESS);
+	}
+
+	public static synchronized void msgThreaded(String message) {
+		threadedMessages.add(message);
+	}
+
+	public static synchronized void drawConsole() {
+
+		if (threadedMessages.size() > 0) {
+			for (String msg : threadedMessages)
+				msg(msg);
+
+			threadedMessages.clear();
+		}
+
+		console.draw();
+
+	}
+
+	public static void error(String message) {
+		console.log(message, LogLevel.ERROR);
+	}
+
+	public static void error(String message, Exception e) {
+		console.log(message + " Exception: " + e.getMessage(), LogLevel.ERROR);
+
+		printStackTrace(e);
+	}
+
+	public static void printStackTrace(Exception e) {
+		StringWriter sw = new StringWriter();
+		PrintWriter pw = new PrintWriter(sw);
+		e.printStackTrace(pw);
+		console.log(sw.toString(), LogLevel.ERROR);
+		e.printStackTrace();
+	}
+
+	public static void toggle() {
+		if (level == Levels.DEBUG) {
+			level = Levels.ERROR;
+			console.setLoggingToSystem(false);
+		} else {
+			level = Levels.DEBUG;
+			console.setLoggingToSystem(true);
+		}
+	}
+
+	public static boolean debugMode() {
+		if (level == Levels.DEBUG)
+			return true;
+
+		return false;
+	}
+
+	public static Levels getDebugLevel() {
+		return level;
+	}
+
+	public static void setDebugLevel(Levels l) {
+		level = l;
+	}
+
+	public static void setDebug() {
+		level = Levels.DEBUG;
+		EngineLogger.setDebug();
+		console.setLoggingToSystem(true);
+	}
+
+	public static void setConsole(Console console) {
+		EditorLogger.console = console;
+		EditorLogger.console.setDisplayKeyID(Keys.F1);
+		console.setMaxEntries(1000);
+
+		final Stage s = (Stage) console.getInputProcessor();
+		final Actor actor = s.getActors().items[0];
+		actor.addListener(new InputListener() {
+			@Override
+			public void exit(InputEvent event, float x, float y, int pointer, Actor toActor) {
+
+				if (toActor == null) {
+					s.setScrollFocus(null);
+				}
+			}
+		});
+
+		console.setCommandExecutor(new EditorCommandExecutor());
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/EditorUtils.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/EditorUtils.java
new file mode 100644
index 000000000..4a231184f
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/EditorUtils.java
@@ -0,0 +1,91 @@
+package com.bladecoder.engineeditor.common;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+import com.bladecoder.engineeditor.Ctx;
+
+public final class EditorUtils {
+	public static void checkVersionAndLoadProject(final File projectToLoad, final Stage stage, Skin skin)
+			throws FileNotFoundException, IOException {
+
+		if (!Ctx.project.checkVersion(projectToLoad)) {
+			new Dialog("Update Engine", skin) {
+				protected void result(Object object) {
+					if (((Boolean) object).booleanValue()) {
+						try {
+							Ctx.project.updateEngineVersion(projectToLoad);
+						} catch (IOException e) {
+							String msg = "Something went wrong while updating the engine.\n\n"
+									+ e.getClass().getSimpleName() + " - " + e.getMessage();
+							Message.showMsgDialog(getStage(), "Error", msg);
+
+							EditorLogger.error(msg, e);
+						}
+					}
+
+					loadProjectWithCustomClasses(projectToLoad, stage);
+				}
+			}.text("Your game uses an old (" + Ctx.project.getProjectBladeEngineVersion(projectToLoad)
+					+ ") Engine version. Do you want to update the engine?").button("Yes", true).button("No", false)
+					.key(Keys.ENTER, true).key(Keys.ESCAPE, false).show(stage);
+		} else {
+			loadProjectWithCustomClasses(projectToLoad, stage);
+		}
+	}
+
+	public static void loadProjectWithCustomClasses(final File projectToLoad, final Stage stage) {
+		Message.showMsg(stage, "Loading project...", true);
+
+		Timer.schedule(new Task() {
+
+			@Override
+			public void run() {
+				try {
+					Ctx.project.loadProject(projectToLoad);
+					Message.hideMsg();
+				} catch (Exception ex) {
+					if (ex.getCause() != null && ex.getCause().getCause() != null
+							&& ex.getCause().getCause() instanceof ClassNotFoundException) {
+						String msg = "The game have custom actions that can not be loaded. Probably the game needs to be compiled. Trying 'gradlew compile'...";
+						Message.showMsg(stage, msg, true);
+						Timer.post(new Task() {
+							@Override
+							public void run() {
+								if (RunProccess.runGradle(Ctx.project.getProjectDir(), "desktop:compileJava")) {
+									try {
+										Ctx.project.loadProject(projectToLoad);
+										Message.showMsg(stage, "Project loaded Successfully", 3);
+									} catch (IOException e) {
+										String msg = e.getClass().getSimpleName() + " - " + e.getMessage();
+										Message.hideMsg();
+										Message.showMsgDialog(stage, "Error loading project", msg);
+									}
+								} else {
+									Message.hideMsg();
+									Message.showMsgDialog(stage, "Error loading project",
+											"error running 'gradlew desktop:compileJava'");
+								}
+							}
+						});
+					} else {
+
+						String msg = ex.getClass().getSimpleName() + " - " + ex.getMessage();
+						Message.hideMsg();
+						Message.showMsgDialog(stage, "Error loading project", msg);
+					}
+
+					EditorLogger.printStackTrace(ex);
+				}
+			}
+		}, 0.05f);
+
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ElementUtils.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ElementUtils.java
new file mode 100644
index 000000000..087e58d21
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ElementUtils.java
@@ -0,0 +1,64 @@
+package com.bladecoder.engineeditor.common;
+
+import java.io.StringWriter;
+
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonReader;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engineeditor.Ctx;
+
+public class ElementUtils {
+	public static String getCheckedId(String id, String[] values) {
+		boolean checked = false;
+		int i = 1;
+
+		String idChecked = id;
+
+		String[] nl = values;
+
+		while (!checked) {
+			checked = true;
+
+			for (int j = 0; j < nl.length; j++) {
+				String id2 = nl[j];
+
+				if (id2.equals(idChecked)) {
+					i++;
+					idChecked = id + i;
+					checked = false;
+					break;
+				}
+			}
+		}
+
+		return idChecked;
+	}
+
+	public static Object cloneElement(Object e) {
+		Json json = new BladeJson(Ctx.project.getWorld(), Mode.MODEL);
+
+		if (e instanceof Action) {
+			StringWriter buffer = new StringWriter();
+			json.setWriter(buffer);
+			ActionUtils.writeJson((Action) e, json);
+			String str = buffer.toString();
+			EditorLogger.debug(str);
+			JsonValue root = new JsonReader().parse(str);
+			return ActionUtils.readJson(Ctx.project.getWorld(), json, root);
+		} else if (e instanceof Scene) {
+			String str = json.toJson(e, (Class<?>) null);
+			Scene s = new Scene(((Scene)e).getWorld());
+			JsonValue root = new JsonReader().parse(str);
+			s.read(json, root);
+			return s;
+		} else {
+			String str = json.toJson(e, (Class<?>) null);
+			return json.fromJson(e.getClass(), str);
+		}
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/FolderClassLoader.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/FolderClassLoader.java
new file mode 100644
index 000000000..26200dc26
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/FolderClassLoader.java
@@ -0,0 +1,113 @@
+package com.bladecoder.engineeditor.common;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Hashtable;
+
+public class FolderClassLoader extends ClassLoader {
+
+	private String dirName = null; // Path to the .class folder
+	private Hashtable<String, Class<?>> classes = new Hashtable<String, Class<?>>(); // used
+																						// to
+																						// cache
+																						// already
+
+	// defined classes
+	public FolderClassLoader(String dir) throws IOException {
+		super(FolderClassLoader.class.getClassLoader()); // calls the parent
+															// class
+															// loader's
+															// constructor
+
+		this.dirName = dir;
+
+		loadClassesInFolder(new File(dirName), null);
+	}
+
+	public void reload() throws IOException {
+		loadClassesInFolder(new File(dirName), null);
+	}
+
+	@Override
+	public Class<?> loadClass(String className) throws ClassNotFoundException {
+		return findClass(className);
+	}
+
+	@Override
+	public Class<?> findClass(String className) {
+		Class<?> result = null;
+
+		result = (Class<?>) classes.get(className); // checks in cached classes
+		if (result != null) {
+			return result;
+		}
+
+		try {
+			return findSystemClass(className);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	private void loadClassesInFolder(File folder, String classPackage) throws IOException, NoClassDefFoundError {
+		byte classByte[];
+
+		File[] list = folder.listFiles();
+
+		if (list != null) {
+
+			for (File f : list) {
+				if (f.isDirectory()) {
+
+					String pkg = classPackage;
+
+					if (pkg != null) {
+						pkg += ".";
+						pkg += f.getName();
+					} else {
+						pkg = f.getName();
+					}
+
+					loadClassesInFolder(f, pkg);
+				} else if (f.getName().endsWith(".class")) {
+					InputStream is = null;
+
+					try {
+
+						is = new FileInputStream(f);
+						ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+						int nextValue = is.read();
+						while (-1 != nextValue) {
+							byteStream.write(nextValue);
+							nextValue = is.read();
+						}
+
+						classByte = byteStream.toByteArray();
+						String className = classPackage + "." + f.getName().substring(0, f.getName().length() - 6);
+						EditorLogger.debug(">>>>>>>>>> LOADING CLASS: " + className);
+
+						if (classes.get(className) == null) {
+
+							Class<?> result = defineClass(className, classByte, 0, classByte.length, null);
+
+							classes.put(className, result);
+						}
+					} catch (NoClassDefFoundError e) {
+						EditorLogger.error("ERROR - Could not load class: " + e.getMessage());
+					} catch (IOException e) {						
+						throw e;
+					} finally {
+						is.close();
+					}
+				}
+			}
+		}
+	}
+
+	public Hashtable<String, Class<?>> getClasses() {
+		return classes;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/HttpUtils.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/HttpUtils.java
new file mode 100644
index 000000000..4aaba2db4
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/HttpUtils.java
@@ -0,0 +1,206 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.common;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * @author Aurelien Ribon | http://www.aurelienribon.com/
+ */
+public class HttpUtils {
+    public static DownloadTask downloadAsync(URL input, OutputStream output, Callback callback) {
+        final DownloadTask task = new DownloadTask(input, output, callback);
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                task.download();
+            }
+        }).start();
+
+        return task;
+    }
+
+    public interface Callback {
+        void completed();
+
+        void canceled();
+
+        void error(IOException ex);
+
+        void updated(int length, int totalLength);
+    }
+
+    public static class DownloadTask {
+        private final URL input;
+        private final OutputStream output;
+        private final Callback callback;
+        private boolean run = true;
+
+        public DownloadTask(URL input, OutputStream output, Callback callback) {
+            this.input = input;
+            this.output = output;
+            this.callback = callback;
+        }
+
+        public void stop() {
+            run = false;
+        }
+
+        public URL getInput() {
+            return input;
+        }
+
+        private void download() {
+            OutputStream os = null;
+            InputStream is = null;
+            IOException ex = null;
+
+            try {
+                HttpURLConnection connection = (HttpURLConnection) input.openConnection();
+                connection.setDoInput(true);
+                connection.setDoOutput(false);
+                connection.setUseCaches(true);
+                connection.setConnectTimeout(3000);
+                connection.connect();
+
+                is = new BufferedInputStream(connection.getInputStream(), 4096);
+                os = output;
+
+                byte[] data = new byte[4096];
+                int length = connection.getContentLength();
+                int total = 0;
+
+                int count;
+                while (run && (count = is.read(data)) != -1) {
+                    total += count;
+                    os.write(data, 0, count);
+                    if (callback != null)
+                        callback.updated(total, length);
+                }
+
+            } catch (IOException ex1) {
+                ex = ex1;
+
+            } finally {
+                if (os != null)
+                    try {
+                        os.flush();
+                        os.close();
+                    } catch (IOException ex1) {
+                    }
+                if (is != null)
+                    try {
+                        is.close();
+                    } catch (IOException ex1) {
+                    }
+
+                if (callback != null) {
+                    if (ex != null)
+                        callback.error(ex);
+                    else if (run == true)
+                        callback.completed();
+                    else
+                        callback.canceled();
+                }
+            }
+        }
+    }
+
+    public static String excutePost(String targetURL, String urlParameters) {
+        HttpURLConnection connection = null;
+        try {
+            // Create connection
+            URL url = new URL(targetURL);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+
+            connection.setRequestProperty("Content-Length", Integer.toString(urlParameters.getBytes().length));
+            connection.setRequestProperty("Content-Language", "en-US");
+
+            connection.setUseCaches(false);
+            connection.setDoOutput(true);
+
+            // Send request
+            DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
+            wr.writeBytes(urlParameters);
+            wr.close();
+
+            // Get Response
+            InputStream is = connection.getInputStream();
+            BufferedReader rd = new BufferedReader(new InputStreamReader(is));
+            StringBuilder response = new StringBuilder();
+
+            String line;
+            while ((line = rd.readLine()) != null) {
+                response.append(line);
+                response.append('\r');
+            }
+            rd.close();
+            return response.toString();
+        } catch (Exception e) {
+            EditorLogger.printStackTrace(e);
+            return null;
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+    }
+
+    public static String excuteHTTP(String targetURL, String urlParameters) {
+        BufferedReader in = null;
+        StringBuilder response = new StringBuilder();
+
+        try {
+            String httpsURL = targetURL;
+            URL myurl = new URL(httpsURL);
+            URLConnection con = myurl.openConnection();
+            InputStream ins = con.getInputStream();
+//			((HttpURLConnection)con).setRequestMethod("GET");
+            InputStreamReader isr = new InputStreamReader(ins);
+            in = new BufferedReader(isr);
+
+            String inputLine;
+
+            while ((inputLine = in.readLine()) != null) {
+                response.append(inputLine);
+            }
+        } catch (IOException e) {
+            EditorLogger.printStackTrace(e);
+            return null;
+        } finally {
+            if (in != null)
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    return null;
+                }
+        }
+
+        return response.toString();
+    }
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/I18NUtils.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/I18NUtils.java
new file mode 100644
index 000000000..86263b3f2
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/I18NUtils.java
@@ -0,0 +1,255 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.common;
+
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engineeditor.common.OrderedProperties.OrderedPropertiesBuilder;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Map.Entry;
+import java.util.Set;
+
+public class I18NUtils {
+    private static final String SEPARATOR = "\t";
+    private static final String TSV_EXT = ".tsv";
+    private static final String PROPERTIES_EXT = ".properties";
+
+    public static final void exportTSV(String modelPath, String outFile, final String chapterId, String defaultLocale)
+            throws FileNotFoundException, IOException {
+        File defaultChapter = new File(modelPath, chapterId + PROPERTIES_EXT);
+
+        File outputFile;
+
+        if (outFile == null)
+            outputFile = new File(modelPath, chapterId + TSV_EXT);
+        else
+            outputFile = new File(outFile);
+
+        // 1. Find all chapter properties
+        File[] files = new File(modelPath).listFiles(new FilenameFilter() {
+            @Override
+            public boolean accept(File arg0, String arg1) {
+                if (!arg1.endsWith(PROPERTIES_EXT) || !arg1.startsWith(chapterId + "_"))
+                    return false;
+
+                return true;
+            }
+        });
+
+        OrderedProperties props[] = new OrderedProperties[files.length + 1];
+
+        props[0] = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering().build();
+
+        props[0].load(new InputStreamReader(new FileInputStream(defaultChapter), I18N.ENCODING));
+
+        for (int i = 1; i < props.length; i++) {
+            props[i] = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering().build();
+            props[i].load(new InputStreamReader(new FileInputStream(files[i - 1]), I18N.ENCODING));
+        }
+
+        // WRITE THE OUTPUT FILE
+        BufferedWriter writer = null;
+
+        writer = new BufferedWriter(new FileWriter(outputFile));
+
+        String lang = defaultLocale;
+
+        writer.write("KEY");
+
+        // write header
+        for (int i = 0; i < props.length; i++) {
+            if (i != 0)
+                lang = files[i - 1].getName().substring(files[i - 1].getName().lastIndexOf('_') + 1,
+                        files[i - 1].getName().lastIndexOf('.'));
+
+            writer.write(SEPARATOR + lang);
+        }
+
+        writer.write("\n");
+
+        Set<Entry<String, String>> keySet = props[0].entrySet();
+
+        for (Entry<String, String> e : keySet) {
+            writer.write(e.getKey());
+
+            for (OrderedProperties p : props) {
+                if (p.getProperty(e.getKey()) == null) {
+                    writer.write(SEPARATOR + "**" + props[0].getProperty(e.getKey()).replace("\n", "\\n"));
+                    System.out.println("KEY NOT FOUND: " + e);
+                } else {
+                    writer.write(SEPARATOR + p.getProperty(e.getKey()).replace("\n", "\\n"));
+                }
+            }
+
+            writer.write("\n");
+        }
+
+        writer.close();
+    }
+
+    public static final void importTSV(String modelPath, String tsvFile, String chapterId, String defaultLocale)
+            throws FileNotFoundException, IOException {
+        File inputFile = new File(tsvFile);
+
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(inputFile), "UTF8"))) {
+            // get header
+            String line = br.readLine();
+
+            if (line != null) {
+                String[] langs = line.split(SEPARATOR);
+                OrderedProperties props[] = new OrderedProperties[langs.length - 1];
+
+                for (int i = 0; i < props.length; i++) {
+                    OrderedPropertiesBuilder builder = new OrderedPropertiesBuilder();
+                    builder.withSuppressDateInComment(true);
+                    props[i] = builder.build();
+                }
+
+                // get keys and texts
+                while ((line = br.readLine()) != null) {
+                    String[] values = line.split(SEPARATOR);
+
+                    if (values.length != langs.length) {
+                        EditorLogger.error("Incorrect line in .tsv: " + line);
+                        continue;
+                    }
+
+                    String key = values[0];
+
+                    for (int i = 0; i < props.length; i++) {
+                        String value = values[i + 1];
+                        if (value != null)
+                            value = value.replace("\\n", "\n");
+
+                        props[i].setProperty(key, value);
+                    }
+                }
+
+                // save properties
+                for (int i = 0; i < props.length; i++) {
+
+                    String i18nFilename;
+
+                    if (langs[i + 1].equals(defaultLocale)) {
+                        i18nFilename = modelPath + "/" + chapterId + PROPERTIES_EXT;
+                    } else {
+                        i18nFilename = modelPath + "/" + chapterId + "_" + langs[i + 1] + PROPERTIES_EXT;
+                    }
+
+                    FileOutputStream os = new FileOutputStream(i18nFilename);
+                    Writer out = new OutputStreamWriter(os, I18N.ENCODING);
+                    props[i].store(out, null);
+                }
+            }
+        }
+    }
+
+    public static final void newLocale(String modelPath, final String chapterId, String defaultLocale, String newLocale)
+            throws FileNotFoundException, IOException {
+        File defaultChapter = new File(modelPath, chapterId + PROPERTIES_EXT);
+        File newChapter = new File(modelPath, chapterId + "_" + newLocale + PROPERTIES_EXT);
+
+        OrderedProperties defaultProp = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering()
+                .build();
+        OrderedProperties newProp = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering()
+                .build();
+
+        defaultProp.load(new InputStreamReader(new FileInputStream(defaultChapter), I18N.ENCODING));
+
+        for (Entry<String, String> e : defaultProp.entrySet()) {
+            newProp.setProperty(e.getKey(), "**" + defaultProp.getProperty(e.getKey()));
+        }
+
+        // save new .properties
+        FileOutputStream os = new FileOutputStream(newChapter);
+        Writer out = new OutputStreamWriter(os, I18N.ENCODING);
+        newProp.store(out, newChapter.getName());
+    }
+
+    public static final void compare(String modelPath, final String chapterId, String defaultLocale, String destLocale)
+            throws FileNotFoundException, IOException {
+        File defaultChapter = new File(modelPath, chapterId + PROPERTIES_EXT);
+        File destChapter = new File(modelPath, chapterId + "_" + destLocale + PROPERTIES_EXT);
+
+        OrderedProperties defaultProp = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering()
+                .build();
+        OrderedProperties destProp = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering()
+                .build();
+
+        defaultProp.load(new InputStreamReader(new FileInputStream(defaultChapter), I18N.ENCODING));
+        destProp.load(new InputStreamReader(new FileInputStream(destChapter), I18N.ENCODING));
+
+        // SEARCH FOR NOT EXISTING DEST KEYS
+        for (Entry<String, String> e : defaultProp.entrySet()) {
+            if (destProp.getProperty(e.getKey()) == null) {
+                EditorLogger.error("Key not found in '" + destLocale + "' locale: " + e.getKey());
+            }
+        }
+
+        // SEARCH FOR NOT EXISTING DEFAULT CHAPTER KEYS
+        for (Entry<String, String> e : destProp.entrySet()) {
+            if (defaultProp.getProperty(e.getKey()) == null) {
+                EditorLogger.error("Key not found in default locale: " + e.getKey());
+            }
+        }
+    }
+
+    public static final void sync(String modelPath, final String chapterId, String defaultLocale, String destLocale)
+            throws FileNotFoundException, IOException {
+        File defaultChapter = new File(modelPath, chapterId + PROPERTIES_EXT);
+        File destChapter = new File(modelPath, chapterId + "_" + destLocale + PROPERTIES_EXT);
+
+        OrderedProperties defaultProp = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering()
+                .build();
+        OrderedProperties destProp = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering()
+                .build();
+
+        defaultProp.load(new InputStreamReader(new FileInputStream(defaultChapter), I18N.ENCODING));
+        destProp.load(new InputStreamReader(new FileInputStream(destChapter), I18N.ENCODING));
+
+        // SEARCH FOR NOT EXISTING DEST KEYS
+        for (String key : defaultProp.stringPropertyNames()) {
+            if (destProp.getProperty(key) == null) {
+                System.out.println("ADDING Key not found in '" + destLocale + "' locale: " + key + "="
+                        + defaultProp.getProperty(key));
+                destProp.setProperty(key, "**" + defaultProp.getProperty(key));
+            }
+        }
+
+        // SEARCH FOR NOT EXISTING DEFAULT CHAPTER KEYS
+        for (String key : destProp.stringPropertyNames()) {
+            if (defaultProp.getProperty(key) == null) {
+                System.out.println("DELETE MANUALLY Key not found in default locale: " + key);
+            }
+        }
+
+        // save dest .properties
+        FileOutputStream os = new FileOutputStream(destChapter);
+        Writer out = new OutputStreamWriter(os, I18N.ENCODING);
+        destProp.store(out, destChapter.getName());
+    }
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ImageUtils.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ImageUtils.java
new file mode 100644
index 000000000..bba0989ba
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ImageUtils.java
@@ -0,0 +1,226 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.common;
+
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+
+import javax.imageio.ImageIO;
+import javax.swing.ImageIcon;
+
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.Pixmap.Format;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.Texture.TextureFilter;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.TextureAtlasData;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.tools.texturepacker.TexturePacker;
+import com.badlogic.gdx.tools.texturepacker.TexturePacker.Settings;
+import com.bladecoder.engineeditor.Ctx;
+
+public class ImageUtils {
+
+	public static ImageIcon getImageIcon(URL u, int w) throws IOException {
+		BufferedImage img = null;
+		BufferedImage tmp = ImageIO.read(u);
+		ImageIcon icon = null;
+
+		if (tmp != null) {
+			float h = (float) tmp.getHeight() * (float) w / tmp.getWidth();
+
+			img = scaleImage(w, (int) h, tmp, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+			icon = new ImageIcon(img);
+		}
+
+		return icon;
+	}
+
+	public static BufferedImage scaleImage(int w, int h, BufferedImage img, Object interpolation) {
+		BufferedImage bi;
+
+		bi = new BufferedImage(w, h, img.getType());
+		Graphics2D g2d = bi.createGraphics();
+		// g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+		// RenderingHints.VALUE_ANTIALIAS_ON);
+		// g2d.addRenderingHints(new
+		// RenderingHints(RenderingHints.KEY_RENDERING,
+		// RenderingHints.VALUE_RENDER_QUALITY));
+
+		g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, interpolation);
+		g2d.drawImage(img, 0, 0, w, h, null);
+		g2d.dispose();
+		return bi;
+	}
+
+	public static void scaleImageFile(File org, File dest, float scale) throws IOException {
+		BufferedImage destImg = null;
+		BufferedImage orgImg = ImageIO.read(org);
+
+		if (orgImg != null) {
+			Object interpolation;
+
+			if (orgImg.getWidth() < 20) {
+				interpolation = RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR;
+			} else {
+				interpolation = RenderingHints.VALUE_INTERPOLATION_BICUBIC;
+			}
+
+			destImg = scaleImage(Math.max(1, (int) (orgImg.getWidth() * scale)),
+					Math.max(1, (int) (orgImg.getHeight() * scale)), orgImg, interpolation);
+			ImageIO.write(destImg, org.getName().substring(org.getName().lastIndexOf('.') + 1), dest);
+		}
+	}
+
+	/**
+	 * Scale all images in a folder.
+	 * 
+	 * WARNING: .etc1 file format is not supported.
+	 * 
+	 * @param orgDir
+	 * @param destDir
+	 * @param scale
+	 * @throws IOException
+	 */
+	public static void scaleDirFiles(File orgDir, File destDir, float scale) throws IOException {
+		File[] files = orgDir.listFiles(new FilenameFilter() {
+
+			@Override
+			public boolean accept(File dir, String name) {
+				if (name.toLowerCase().endsWith(".png") || name.toLowerCase().endsWith(".jpg"))
+					return true;
+
+				return false;
+			}
+		});
+
+		if (files != null) {
+			for (File f : files) {
+				if (f.getName().endsWith(".9.png")) { // 9 patches doesn't scale
+					Files.copy(f.toPath(), new File(destDir, f.getName()).toPath());
+				} else {
+					ImageUtils.scaleImageFile(f, new File(destDir, f.getName()), scale);
+				}
+			}
+		}
+	}
+
+	public static void scaleAtlas(File orgAtlas, File destDir, float scale) throws IOException {
+		File tmpDir = DesktopUtils.createTempDirectory();
+
+		EditorLogger.debug("SCALING: " + orgAtlas.getName());
+		unpackAtlas(orgAtlas, tmpDir);
+
+		String atlasParentPath = orgAtlas.getParentFile().getAbsolutePath();
+		TextureAtlasData atlasData = new TextureAtlasData(new FileHandle(orgAtlas), new FileHandle(atlasParentPath),
+				false);
+
+		String outputFormat = atlasData.getPages().get(0).textureFile.extension();
+
+		int maxWH = (int) (getRecommendedAtlasSize() * scale);
+
+		createAtlas(tmpDir.getAbsolutePath(), destDir.getAbsolutePath(), orgAtlas.getName(), scale, maxWH, maxWH,
+				atlasData.getPages().get(0).minFilter, atlasData.getPages().get(0).magFilter, outputFormat, true);
+
+		DesktopUtils.removeDir(tmpDir.getAbsolutePath());
+	}
+
+	public static void unpackAtlas(File orgAtlas, File destDir) {
+		CustomTextureUnpacker unpacker = new CustomTextureUnpacker();
+		String atlasParentPath = orgAtlas.getParentFile().getAbsolutePath();
+		TextureAtlasData atlas = new TextureAtlasData(new FileHandle(orgAtlas), new FileHandle(atlasParentPath), false);
+		unpacker.splitAtlas(atlas, destDir.getAbsolutePath());
+	}
+
+	public static void scaleDirAtlases(File orgDir, File destDir, float scale) throws IOException {
+		File[] files = orgDir.listFiles(new FilenameFilter() {
+
+			@Override
+			public boolean accept(File dir, String name) {
+				if (name.toLowerCase().endsWith(".atlas"))
+					return true;
+
+				return false;
+			}
+		});
+
+		for (File f : files) {
+			ImageUtils.scaleAtlas(f, destDir, scale);
+		}
+	}
+
+	public static int getRecommendedAtlasSize() {
+		int wWidth = Ctx.project.getWorld().getWidth();
+
+		return MathUtils.nextPowerOfTwo((int) (wWidth * 2f));
+	}
+
+	public static void createAtlas(String inDir, String outdir, String name, float scale, int maxWidth, int maxHeight,
+			TextureFilter filterMin, TextureFilter filterMag, String outputFormat, boolean stripWhiteSpace)
+			throws IOException {
+		Settings settings = new Settings();
+
+		settings.pot = false;
+		settings.paddingX = 2;
+		settings.paddingY = 2;
+		settings.duplicatePadding = false;
+		settings.edgePadding = true;
+		settings.rotation = false;
+		settings.minWidth = 16;
+		settings.minWidth = 16;
+		settings.stripWhitespaceX = stripWhiteSpace;
+		settings.stripWhitespaceY = stripWhiteSpace;
+		settings.alphaThreshold = 0;
+
+		settings.filterMin = filterMin;
+		settings.filterMag = filterMag;
+		settings.wrapX = Texture.TextureWrap.ClampToEdge;
+		settings.wrapY = Texture.TextureWrap.ClampToEdge;
+		settings.format = Format.RGBA8888;
+		settings.alias = true;
+		settings.outputFormat = outputFormat;
+		settings.jpegQuality = 0.9f;
+		settings.ignoreBlankImages = true;
+		settings.fast = false;
+		settings.debug = false;
+
+		settings.maxWidth = maxWidth;
+		settings.maxHeight = maxHeight;
+
+		EditorLogger.debug("ATLAS MAXWIDTH: " + settings.maxWidth);
+
+		File inTmpDir = new File(inDir);
+
+		// Resize images to create atlas for different resolutions
+		if (scale != 1.0f) {
+			inTmpDir = DesktopUtils.createTempDirectory();
+
+			ImageUtils.scaleDirFiles(new File(inDir), inTmpDir, scale);
+		}
+
+		TexturePacker.process(settings, inTmpDir.getAbsolutePath(), outdir,
+				name.endsWith(".atlas") ? name : name + ".atlas");
+
+		if (scale != 1.0f) {
+			DesktopUtils.removeDir(inTmpDir.getAbsolutePath());
+		}
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/Message.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/Message.java
new file mode 100644
index 000000000..dad15eb92
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/Message.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.common;
+
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
+
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.math.Interpolation;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.actions.Actions;
+import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+
+public class Message {
+	private static final float FADE_DURATION = 0f;
+	private static Label msg;
+	private static Skin skin;
+	private static boolean isModal;
+
+	public static void init(Skin skin) {
+		msg = new Label("", skin, "message") {
+
+			@Override
+			public Actor hit(float x, float y, boolean touchable) {
+				if (isModal)
+					return this;
+
+				return null;
+			}
+		};
+
+		Message.skin = skin;
+		msg.setWrap(true);
+		msg.setAlignment(Align.center, Align.center);
+	}
+
+	public static void showMsg(Stage stage, String text) {
+		showMsg(stage, text, false);
+	}
+
+	@SuppressWarnings("unused")
+	public static void showMsg(final Stage stage, final String text, final boolean modal) {
+
+		// show in the next frame to allow calling when no OpenGL context is available.
+		Timer.post(new Task() {
+
+			@Override
+			public void run() {
+				isModal = modal;
+
+				if (text == null) {
+					hideMsg();
+					return;
+				}
+
+				add(stage, text);
+
+				if (FADE_DURATION > 0) {
+					msg.getColor().a = 0;
+					msg.addAction(Actions.fadeIn(FADE_DURATION, Interpolation.fade));
+				}
+
+			}
+		});
+
+	}
+
+	private static void add(Stage stage, String text) {
+		msg.clearActions();
+
+		msg.setText(text);
+
+		GlyphLayout textLayout = new GlyphLayout();
+
+		textLayout.setText(msg.getStyle().font, text, Color.BLACK, stage.getWidth() * .8f, Align.center, true);
+
+		msg.setSize(textLayout.width + textLayout.height, textLayout.height + textLayout.height * 2);
+
+		if (!stage.getActors().contains(msg, true))
+			stage.addActor(msg);
+
+		msg.setPosition(Math.round((stage.getWidth() - msg.getWidth()) / 2),
+				Math.round((stage.getHeight() - msg.getHeight()) / 2));
+		msg.invalidate();
+	}
+
+	@SuppressWarnings("unused")
+	public static void showMsg(final Stage stage, final String text, final float duration) {
+
+		Timer.post(new Task() {
+
+			@Override
+			public void run() {
+				isModal = false;
+
+				if (text == null) {
+					hideMsg();
+					return;
+				}
+
+				add(stage, text);
+
+				if (FADE_DURATION > 0) {
+					msg.getColor().a = 0;
+					msg.addAction(sequence(Actions.fadeIn(FADE_DURATION, Interpolation.fade), Actions.delay(duration,
+							sequence(fadeOut(FADE_DURATION, Interpolation.fade), Actions.removeActor()))));
+				} else {
+					msg.addAction(sequence(Actions.delay(duration, Actions.removeActor())));
+				}
+			}
+		});
+
+	}
+
+	@SuppressWarnings("unused")
+	public static void hideMsg() {
+		isModal = false;
+		msg.setText("");
+
+		if (FADE_DURATION > 0) {
+			msg.addAction(sequence(fadeOut(FADE_DURATION, Interpolation.fade), Actions.removeActor()));
+		} else {
+			msg.remove();
+		}
+	}
+
+	public static void showMsgDialog(final Stage stage, final String title, final String msg) {
+
+		Timer.post(new Task() {
+
+			@Override
+			public void run() {
+				Message.hideMsg();
+				
+				new Dialog(title, skin).text(msg).button("Close", true).key(Keys.ENTER, true).key(Keys.ESCAPE, false)
+						.show(stage);
+			}
+		});
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ModelTools.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ModelTools.java
new file mode 100644
index 000000000..3f65720ac
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ModelTools.java
@@ -0,0 +1,683 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.common;
+
+import com.badlogic.gdx.utils.Base64Coder;
+import com.badlogic.gdx.utils.JsonReader;
+import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.JsonWriter.OutputType;
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.LookAtAction;
+import com.bladecoder.engine.actions.SayAction;
+import com.bladecoder.engine.actions.SetCutmodeAction;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.ink.InkManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.DialogOption;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SoundDesc;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.OrderedProperties.OrderedPropertiesBuilder;
+import com.bladecoder.engineeditor.model.Project;
+import org.apache.commons.io.FileUtils;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ModelTools {
+    public static void extractDialogs() {
+        Map<String, Scene> scenes = Ctx.project.getWorld().getScenes();
+
+        BufferedWriter writer = null;
+        try {
+            // create a temporary file
+            File dFile = new File(Ctx.project.getProjectPath() + "/" + "DIALOGS.md");
+
+            writer = new BufferedWriter(new FileWriter(dFile));
+
+            writer.write("# DIALOGS - " + (Ctx.project.getTitle() != null ? Ctx.project.getTitle().toUpperCase() : "")
+                    + "\n\n");
+
+            for (Scene scn : scenes.values()) {
+                Map<String, BaseActor> actors = scn.getActors();
+
+                writer.write("\n## SCENE: " + scn.getId() + "\n\n");
+
+                HashMap<String, Verb> verbs = scn.getVerbManager().getVerbs();
+
+                // Process SayAction of TALK type
+                for (Verb v : verbs.values()) {
+                    ArrayList<Action> actions = v.getActions();
+
+                    for (Action act : actions) {
+
+                        if (act instanceof SayAction) {
+                            String type = ActionUtils.getStringValue(act, "type");
+
+                            if ("TALK".equals(type)) {
+                                String actor = ActionUtils.getStringValue(act, "actor").toUpperCase();
+                                String rawText = ActionUtils.getStringValue(act, "text");
+                                String text = Ctx.project.translate(rawText).replace("\\n\\n", "\n").replace("\\n",
+                                        "\n");
+
+                                writer.write(actor + ": " + text + "\n");
+                            }
+                        }
+                    }
+                }
+
+                for (BaseActor a : actors.values()) {
+                    if (a instanceof InteractiveActor) {
+                        InteractiveActor ia = (InteractiveActor) a;
+
+                        verbs = ia.getVerbManager().getVerbs();
+
+                        // Process SayAction of TALK type
+                        for (Verb v : verbs.values()) {
+                            ArrayList<Action> actions = v.getActions();
+
+                            for (Action act : actions) {
+
+                                if (act instanceof SayAction) {
+                                    String type = ActionUtils.getStringValue(act, "type");
+
+                                    if ("TALK".equals(type)) {
+                                        String actor = ActionUtils.getStringValue(act, "actor").toUpperCase();
+                                        String rawText = ActionUtils.getStringValue(act, "text");
+                                        String text = Ctx.project.translate(rawText).replace("\\n\\n", "\n")
+                                                .replace("\\n", "\n");
+
+                                        writer.write(actor + ": " + text + "\n");
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    if (a instanceof CharacterActor) {
+                        CharacterActor ca = (CharacterActor) a;
+
+                        HashMap<String, Dialog> dialogs = ca.getDialogs();
+
+                        if (dialogs == null)
+                            continue;
+
+                        // Process SayAction of TALK type
+                        for (Dialog d : dialogs.values()) {
+                            ArrayList<DialogOption> options = d.getOptions();
+
+                            if (options.size() > 0)
+                                writer.write("\n**" + ca.getId().toUpperCase() + " - " + d.getId() + "**\n\n");
+
+                            for (DialogOption o : options) {
+                                String text = o.getText();
+                                String response = o.getResponseText();
+
+                                writer.write(scn.getPlayer().getId().toUpperCase() + ": "
+                                        + Ctx.project.translate(text).replace("\\n\\n", "\n").replace("\\n", "\n")
+                                        + "\n");
+
+                                if (response != null)
+                                    writer.write(ca.getId().toUpperCase() + ": " + Ctx.project.translate(response)
+                                            .replace("\\n\\n", "\n").replace("\\n", "\n") + "\n\n");
+                            }
+                        }
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            EditorLogger.printStackTrace(e);
+        } finally {
+            try {
+                // Close the writer regardless of what happens...
+                writer.close();
+            } catch (Exception e) {
+            }
+        }
+    }
+
+    public static final void addCutMode() {
+        Map<String, Scene> scenes = Ctx.project.getWorld().getScenes();
+
+        for (Scene scn : scenes.values()) {
+            Map<String, BaseActor> actors = scn.getActors();
+
+            for (BaseActor a : actors.values()) {
+                if (a instanceof InteractiveActor) {
+                    InteractiveActor ia = (InteractiveActor) a;
+
+                    HashMap<String, Verb> verbs = ia.getVerbManager().getVerbs();
+
+                    for (Verb v : verbs.values()) {
+                        ArrayList<Action> actions = v.getActions();
+
+                        // Don't process verbs for inventory
+                        if (v.getState() != null && v.getState().equalsIgnoreCase("INVENTORY"))
+                            continue;
+
+                        if (actions.size() == 1) {
+                            Action act = actions.get(0);
+
+                            if (act instanceof LookAtAction || act instanceof SayAction) {
+                                actions.clear();
+
+                                SetCutmodeAction cma1 = new SetCutmodeAction();
+                                SetCutmodeAction cma2 = new SetCutmodeAction();
+                                try {
+                                    ActionUtils.setParam(cma1, "value", "true");
+                                    ActionUtils.setParam(cma2, "value", "false");
+
+                                } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+                                    EditorLogger.printStackTrace(e);
+                                }
+
+                                actions.add(cma1);
+                                actions.add(act);
+                                actions.add(cma2);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Ctx.project.setModified();
+    }
+
+    public static void fixSaySubtitleActor() {
+        Map<String, Scene> scenes = Ctx.project.getWorld().getScenes();
+
+        for (Scene scn : scenes.values()) {
+            Map<String, BaseActor> actors = scn.getActors();
+
+            HashMap<String, Verb> verbs = scn.getVerbManager().getVerbs();
+
+            for (Verb v : verbs.values()) {
+                ArrayList<Action> actions = v.getActions();
+
+                for (Action act : actions) {
+
+                    if (act instanceof SayAction) {
+                        try {
+
+                            String stringValue = ActionUtils.getStringValue(act, "type");
+
+                            if (stringValue.equals("SUBTITLE"))
+                                ActionUtils.setParam(act, "actor", "$PLAYER");
+                        } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+                            EditorLogger.printStackTrace(e);
+                            return;
+                        }
+                    }
+                }
+            }
+
+            for (BaseActor a : actors.values()) {
+                if (a instanceof InteractiveActor) {
+                    InteractiveActor ia = (InteractiveActor) a;
+
+                    verbs = ia.getVerbManager().getVerbs();
+
+                    for (Verb v : verbs.values()) {
+                        ArrayList<Action> actions = v.getActions();
+
+                        for (Action act : actions) {
+
+                            if (act instanceof SayAction) {
+                                try {
+
+                                    String stringValue = ActionUtils.getStringValue(act, "type");
+
+                                    if (stringValue.equals("SUBTITLE"))
+                                        ActionUtils.setParam(act, "actor", "$PLAYER");
+                                } catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+                                    EditorLogger.printStackTrace(e);
+                                    return;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Ctx.project.setModified();
+    }
+
+    public static final void checkI18NMissingKeys()
+            throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
+        Map<String, Scene> scenes = Ctx.project.getWorld().getScenes();
+
+        for (Scene scn : scenes.values()) {
+            Map<String, BaseActor> actors = scn.getActors();
+
+            // SCENE VERBS
+            HashMap<String, Verb> verbs = scn.getVerbManager().getVerbs();
+
+            for (Verb v : verbs.values()) {
+                ArrayList<Action> actions = v.getActions();
+
+                for (Action act : actions) {
+
+                    String[] params = ActionUtils.getFieldNames(act);
+
+                    for (String p : params) {
+                        String val = ActionUtils.getStringValue(act, p);
+
+                        if (val != null && !val.isEmpty() && val.charAt(0) == I18N.PREFIX) {
+                            String trans = Ctx.project.translate(val);
+
+                            if (trans == val) {
+                                EditorLogger.error("Key not found: " + val);
+                            }
+                        }
+                    }
+                }
+            }
+
+            for (BaseActor a : actors.values()) {
+                if (a instanceof InteractiveActor) {
+                    InteractiveActor ia = (InteractiveActor) a;
+
+                    // DESC
+                    if (ia.getDesc() != null && !ia.getDesc().isEmpty() && ia.getDesc().charAt(0) == I18N.PREFIX) {
+                        String trans = Ctx.project.translate(ia.getDesc());
+
+                        if (trans == ia.getDesc()) {
+                            EditorLogger.error("Key not found: " + ia.getDesc());
+                        }
+                    }
+
+                    // ACTOR VERBS
+                    verbs = ia.getVerbManager().getVerbs();
+
+                    for (Verb v : verbs.values()) {
+                        ArrayList<Action> actions = v.getActions();
+
+                        for (Action act : actions) {
+
+                            String[] params = ActionUtils.getFieldNames(act);
+
+                            for (String p : params) {
+                                String val = ActionUtils.getStringValue(act, p);
+
+                                if (val != null && !val.isEmpty() && val.charAt(0) == I18N.PREFIX) {
+                                    String trans = Ctx.project.translate(val);
+
+                                    if (trans == val) {
+                                        EditorLogger.error("Key not found: " + val);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // DIALOGS
+                if (a instanceof CharacterActor) {
+                    HashMap<String, Dialog> dialogs = ((CharacterActor) a).getDialogs();
+
+                    if (dialogs != null) {
+                        for (Dialog d : dialogs.values()) {
+                            ArrayList<DialogOption> options = d.getOptions();
+
+                            for (DialogOption o : options) {
+
+                                if (o.getText() != null && !o.getText().isEmpty()
+                                        && o.getText().charAt(0) == I18N.PREFIX) {
+                                    String trans = Ctx.project.translate(o.getText());
+
+                                    if (trans == o.getText()) {
+                                        EditorLogger.error("Key not found: " + o.getText());
+                                    }
+                                }
+
+                                if (o.getResponseText() != null && !o.getResponseText().isEmpty()
+                                        && o.getResponseText().charAt(0) == I18N.PREFIX) {
+                                    String trans = Ctx.project.translate(o.getResponseText());
+
+                                    if (trans == o.getResponseText()) {
+                                        EditorLogger.error("Key not found: " + o.getResponseText());
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
+    public static void printUnusedSounds() {
+        ArrayList<String> unusedSounds = new ArrayList<>(Arrays.asList(getSoundList()));
+
+        HashMap<String, SoundDesc> sounds = Ctx.project.getWorld().getSounds();
+
+        if (sounds != null) {
+            for (SoundDesc s : sounds.values()) {
+                unusedSounds.remove(s.getFilename());
+            }
+        }
+
+        for (String s : unusedSounds)
+            EditorLogger.error(s);
+    }
+
+    public static String[] getSoundList() {
+        String path = Ctx.project.getAssetPath() + Project.SOUND_PATH;
+
+        File f = new File(path);
+
+        String soundFiles[] = f.list(new FilenameFilter() {
+
+            @Override
+            public boolean accept(File arg0, String arg1) {
+                if (arg1.endsWith(".ogg") || arg1.endsWith(".wav") || arg1.endsWith(".mp3"))
+                    return true;
+
+                return false;
+            }
+        });
+
+        if (soundFiles == null)
+            soundFiles = new String[0];
+
+        Arrays.sort(soundFiles);
+
+        return soundFiles;
+    }
+
+    public static void extractInkTexts(String file, String lang) throws IOException {
+
+        BufferedReader br = new BufferedReader(
+                new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
+        StringBuilder sb = new StringBuilder();
+
+        try {
+            String line = br.readLine();
+
+            // Replace the BOM mark
+            if (line != null)
+                line = line.replace('\uFEFF', ' ');
+
+            while (line != null) {
+                sb.append(line);
+                sb.append("\n");
+                line = br.readLine();
+            }
+
+        } finally {
+            br.close();
+        }
+
+        JsonValue root = new JsonReader().parse(sb.toString());
+
+        // .tsv generation to help in translation
+        StringBuilder tsvString = new StringBuilder();
+
+        // .md generation to have a better readable document of texts
+        StringBuilder mdString = new StringBuilder();
+
+        OrderedPropertiesBuilder builder = new OrderedPropertiesBuilder();
+        builder.withSuppressDateInComment(true);
+        OrderedProperties prop = builder.build();
+
+        extractInkTextsInternal(root, tsvString, mdString, prop);
+        FileUtils.writeStringToFile(new File(file + ".tsv"), tsvString.toString());
+        FileUtils.writeStringToFile(new File(file + ".txt"), mdString.toString());
+
+        String json = root.toJson(OutputType.json);
+        FileUtils.writeStringToFile(new File(file), json);
+
+        try {
+            String file2 = file.substring(0, file.length() - EngineAssetManager.INK_EXT.length());
+
+            if (lang == null || lang.isEmpty() || lang.equals("default"))
+                file2 += "-ink.properties";
+            else
+                file2 += "-ink" + "_" + lang + ".properties";
+
+            FileOutputStream os = new FileOutputStream(file2);
+            Writer out = new OutputStreamWriter(os, I18N.ENCODING);
+            prop.store(out, null);
+        } catch (IOException e) {
+            EditorLogger.error("ERROR WRITING BUNDLE: " + file + ".properties");
+        }
+    }
+
+    private static void extractInkTextsInternal(JsonValue v, StringBuilder sbTSV, StringBuilder sbMD,
+                                                OrderedProperties prop) {
+        if (v.isArray() || v.isObject()) {
+            if (v.name != null && v.isArray() && v.parent != null && v.parent.parent != null
+                    && v.parent.parent.parent != null) {
+                if (v.name.contains("-"))
+                    sbMD.append('\n');
+                else if (v.parent.parent.parent.parent == null)
+                    sbMD.append("\n==== " + v.name + " ====\n");
+                else if (v.name.equals("s"))
+                    sbMD.append("  * ");
+                // else
+                // sbMD.append("\n-- " + v.name + " --\n");
+            }
+
+            for (int i = 0; i < v.size; i++) {
+                JsonValue aValue = v.get(i);
+
+                // Ignore string declr ej. "xxx"
+                if (i > 0 && v.get(i - 1).isString() && v.get(i - 1).asString().equals("str")) {
+                    // check if inside a choice with [xxx] text.
+
+                    // comparison == or !=?
+                    if (v.size > i + 2 && v.get(i + 2).isString()
+                            && (v.get(i + 2).asString().equals("==") || v.get(i + 2).asString().equals("!=")))
+                        continue;
+
+                    // find "/ev"
+                    boolean ev = false;
+                    int j = i + 2;
+                    while (j < v.size && !ev) {
+                        JsonValue next = v.get(j);
+                        if (!next.isObject() && next.asString().equals("/ev")) {
+                            ev = true;
+                        }
+
+                        j++;
+                    }
+
+                    JsonValue next = v.get(j);
+                    if (!next.isObject() || next.get("*") == null)
+                        continue;
+                }
+
+                // Ignore tags
+                if (i > 0 && v.get(i - 1).isString() && v.get(i - 1).asString().equals("#")) {
+                    continue;
+                }
+
+                // Ignore listInt checks
+                if (v.size > i + 2 && v.get(i + 2).isString() && v.get(i + 2).asString().equals("listInt")) {
+                    continue;
+                }
+
+                extractInkTextsInternal(aValue, sbTSV, sbMD, prop);
+            }
+
+        } else if (v.isString() && !v.asString().isEmpty() && v.asString().charAt(0) == '^') {
+            String value = v.asString().substring(1).trim();
+
+            if (value.length() == 0 || value.charAt(0) == InkManager.COMMAND_MARK)
+                return;
+
+            // if we are inside an expression, exit
+
+
+            String charName = "";
+            int idx = value.indexOf(InkManager.COMMAND_MARK);
+
+            if (idx == -1) {
+                idx = value.indexOf(InkManager.CHAR_SEPARATOR_MARK);
+            }
+
+            if (idx != -1) {
+                String charNameTmp = value.substring(0, idx).trim();
+
+                if (charNameTmp.indexOf(' ') == -1) {
+                    // charName shouldn't contain spaces, if found means that intentional ':' is used in line.
+                    charName = charNameTmp;
+                    value = value.substring(idx + 1).trim();
+
+                    if (value.length() == 0)
+                        return;
+                }
+            }
+
+            String key;
+
+            try {
+                MessageDigest md = MessageDigest.getInstance("SHA-1");
+                byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
+                md.update(bytes);
+                byte[] digest = md.digest();
+                key = Base64Coder.encodeLines(digest).substring(0, InkManager.KEY_SIZE);
+            } catch (NoSuchAlgorithmException e) {
+                EditorLogger.error("Error encoding key." + e);
+                return;
+            }
+
+            prop.setProperty(key, value);
+            sbTSV.append(key).append("\t").append(charName).append("\t").append(value).append("\n");
+
+            sbMD.append(charName).append(charName.isEmpty() ? "" : ": ").append(value).append(" (").append(key)
+                    .append(")\n");
+
+            if (charName.isEmpty())
+                v.set("^" + I18N.PREFIX + key);
+            else
+                v.set("^" + charName + InkManager.CHAR_SEPARATOR_MARK + I18N.PREFIX + key);
+        }
+    }
+
+    public static void readableInkDialogs(String story, String lang) throws IOException {
+        String file = Ctx.project.getModelPath() + "/" + story + EngineAssetManager.INK_EXT;
+
+        StringBuilder sb = new StringBuilder();
+
+        try (BufferedReader br = new BufferedReader(
+                new InputStreamReader(Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8))) {
+            String line = br.readLine();
+
+            // Replace the BOM mark
+            if (line != null)
+                line = line.replace('\uFEFF', ' ');
+
+            while (line != null) {
+                sb.append(line);
+                sb.append("\n");
+                line = br.readLine();
+            }
+
+        }
+
+        JsonValue root = new JsonReader().parse(sb.toString());
+
+        // TODO: Add lang and check if default
+        File propFile = new File(Ctx.project.getModelPath() + "/" + story + "-ink.properties");
+        OrderedProperties langProp = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering()
+                .build();
+
+        langProp.load(new InputStreamReader(Files.newInputStream(propFile.toPath()), I18N.ENCODING));
+
+        // .md generation to have a better readable document of texts
+        StringBuilder mdString = new StringBuilder();
+
+        readableInkDialogsInternal(root, mdString, langProp);
+        FileUtils.writeStringToFile(new File(Ctx.project.getModelPath() + "/" + story + "-DIALOGS.txt"),
+                mdString.toString());
+    }
+
+    private static void readableInkDialogsInternal(JsonValue v, StringBuilder sbMD, OrderedProperties prop) {
+        if (v.isArray() || v.isObject()) {
+            if (v.name != null && v.isArray() && v.parent != null && v.parent.parent != null
+                    && v.parent.parent.parent != null) {
+                if (v.name.contains("-"))
+                    sbMD.append('\n');
+                else if (v.parent.parent.parent.parent == null)
+                    sbMD.append("\n==== ").append(v.name).append(" ====\n");
+                else if (v.name.equals("s"))
+                    sbMD.append("  * ");
+                // else
+                // sbMD.append("\n-- " + v.name + " --\n");
+            }
+
+            for (int i = 0; i < v.size; i++) {
+                JsonValue aValue = v.get(i);
+
+                readableInkDialogsInternal(aValue, sbMD, prop);
+            }
+
+        } else if (v.isString() && v.asString().charAt(0) == '^') {
+            String key = v.asString().substring(1).trim();
+
+            if (key.length() == 0 || key.charAt(0) == '>')
+                return;
+
+            int idx = key.indexOf('>');
+            String charName = "";
+
+            if (idx != -1) {
+                charName = key.substring(0, idx).trim();
+                key = key.substring(idx + 1).trim();
+
+                if (key.length() <= 1)
+                    return;
+            }
+
+            key = key.substring(1);
+
+            String value = prop.getProperty(key);
+
+            sbMD.append(charName).append(charName.isEmpty() ? "" : ": ").append(value).append(" (").append(key)
+                    .append(")\n");
+        }
+    }
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/OrderedProperties.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/OrderedProperties.java
new file mode 100644
index 000000000..7008c8dfe
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/OrderedProperties.java
@@ -0,0 +1,573 @@
+package com.bladecoder.engineeditor.common;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Serializable;
+import java.io.Writer;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.InvalidPropertiesFormatException;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.Vector;
+
+/**
+ * This class provides an alternative to the JDK's {@link Properties} class. It
+ * fixes the design flaw of using inheritance over composition, while keeping up
+ * the same APIs as the original class. Keys and values are guaranteed to be of
+ * type {@link String}.
+ * <p/>
+ * This class is not synchronized, contrary to the original implementation.
+ * <p/>
+ * As additional functionality, this class keeps its properties in a
+ * well-defined order. By default, the order is the one in which the individual
+ * properties have been added, either through explicit API calls or through
+ * reading them top-to-bottom from a properties file.
+ * <p/>
+ * Also, an optional flag can be set to omit the comment that contains the
+ * current date when storing the properties to a properties file.
+ * <p/>
+ * Currently, this class does not support the concept of default properties,
+ * contrary to the original implementation.
+ * <p/>
+ * <strong>Note that this implementation is not synchronized.</strong> If
+ * multiple threads access ordered properties concurrently, and at least one of
+ * the threads modifies the ordered properties structurally, it <em>must</em> be
+ * synchronized externally. This is typically accomplished by synchronizing on
+ * some object that naturally encapsulates the properties.
+ * <p/>
+ * Note that the actual (and quite complex) logic of parsing and storing
+ * properties from and to a stream is delegated to the {@link Properties} class
+ * from the JDK.
+ *
+ * @see Properties
+ */
+
+public final class OrderedProperties implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private transient Map<String, String> properties;
+	private transient boolean suppressDate;
+
+	/**
+	 * Creates a new instance that will keep the properties in the order they have
+	 * been added. Other than the ordering of the keys, this instance behaves like
+	 * an instance of the {@link Properties} class.
+	 */
+	public OrderedProperties() {
+		this(new LinkedHashMap<String, String>(), false);
+	}
+
+	private OrderedProperties(Map<String, String> properties, boolean suppressDate) {
+		this.properties = properties;
+		this.suppressDate = suppressDate;
+	}
+
+	/**
+	 * See {@link Properties#getProperty(String)}.
+	 */
+	public String getProperty(String key) {
+		return properties.get(key);
+	}
+
+	/**
+	 * See {@link Properties#getProperty(String, String)}.
+	 */
+	public String getProperty(String key, String defaultValue) {
+		String value = properties.get(key);
+		return (value == null) ? defaultValue : value;
+	}
+
+	/**
+	 * See {@link Properties#setProperty(String, String)}.
+	 */
+	public String setProperty(String key, String value) {
+		return properties.put(key, value);
+	}
+
+	/**
+	 * Removes the property with the specified key, if it is present. Returns the
+	 * value of the property, or <tt>null</tt> if there was no property with the
+	 * specified key.
+	 *
+	 * @param key the key of the property to remove
+	 * @return the previous value of the property, or <tt>null</tt> if there was no
+	 *         property with the specified key
+	 */
+	public String removeProperty(String key) {
+		return properties.remove(key);
+	}
+
+	/**
+	 * Returns <tt>true</tt> if there is a property with the specified key.
+	 *
+	 * @param key the key whose presence is to be tested
+	 */
+	public boolean containsProperty(String key) {
+		return properties.containsKey(key);
+	}
+
+	/**
+	 * See {@link Properties#size()}.
+	 */
+	public int size() {
+		return properties.size();
+	}
+
+	/**
+	 * See {@link Properties#isEmpty()}.
+	 */
+	public boolean isEmpty() {
+		return properties.isEmpty();
+	}
+
+	/**
+	 * See {@link Properties#propertyNames()}.
+	 */
+	public Enumeration<String> propertyNames() {
+		return new Vector<>(properties.keySet()).elements();
+	}
+
+	/**
+	 * See {@link Properties#stringPropertyNames()}.
+	 */
+	public Set<String> stringPropertyNames() {
+		return new LinkedHashSet<>(properties.keySet());
+	}
+
+	/**
+	 * See {@link Properties#entrySet()}.
+	 */
+	public Set<Map.Entry<String, String>> entrySet() {
+		return new LinkedHashSet<>(properties.entrySet());
+	}
+
+	/**
+	 * See {@link Properties#load(InputStream)}.
+	 */
+	public void load(InputStream stream) throws IOException {
+		CustomProperties customProperties = new CustomProperties(this.properties);
+		customProperties.load(stream);
+	}
+
+	/**
+	 * See {@link Properties#load(Reader)}.
+	 */
+	public void load(Reader reader) throws IOException {
+		CustomProperties customProperties = new CustomProperties(this.properties);
+		customProperties.load(reader);
+	}
+
+	/**
+	 * See {@link Properties#loadFromXML(InputStream)}.
+	 */
+	public void loadFromXML(InputStream stream) throws IOException, InvalidPropertiesFormatException {
+		CustomProperties customProperties = new CustomProperties(this.properties);
+		customProperties.loadFromXML(stream);
+	}
+
+	/**
+	 * See {@link Properties#store(OutputStream, String)}.
+	 */
+	public void store(OutputStream stream, String comments) throws IOException {
+		CustomProperties customProperties = new CustomProperties(this.properties);
+		if (suppressDate) {
+			customProperties.store(
+					new DateSuppressingPropertiesBufferedWriter(new OutputStreamWriter(stream, "8859_1")), comments);
+		} else {
+			customProperties.store(stream, comments);
+		}
+	}
+
+	/**
+	 * See {@link Properties#store(Writer, String)}.
+	 */
+	public void store(Writer writer, String comments) throws IOException {
+		CustomProperties customProperties = new CustomProperties(this.properties);
+		if (suppressDate) {
+			customProperties.store(new DateSuppressingPropertiesBufferedWriter(writer), comments);
+		} else {
+			customProperties.store(writer, comments);
+		}
+	}
+
+	/**
+	 * See {@link Properties#storeToXML(OutputStream, String)}.
+	 */
+	public void storeToXML(OutputStream stream, String comment) throws IOException {
+		CustomProperties customProperties = new CustomProperties(this.properties);
+		customProperties.storeToXML(stream, comment);
+	}
+
+	/**
+	 * See {@link Properties#storeToXML(OutputStream, String, String)}.
+	 */
+	public void storeToXML(OutputStream stream, String comment, String encoding) throws IOException {
+		CustomProperties customProperties = new CustomProperties(this.properties);
+		customProperties.storeToXML(stream, comment, encoding);
+	}
+
+	/**
+	 * See {@link Properties#list(PrintStream)}.
+	 */
+	public void list(PrintStream stream) {
+		CustomProperties customProperties = new CustomProperties(this.properties);
+		customProperties.list(stream);
+	}
+
+	/**
+	 * See {@link Properties#list(PrintWriter)}.
+	 */
+	public void list(PrintWriter writer) {
+		CustomProperties customProperties = new CustomProperties(this.properties);
+		customProperties.list(writer);
+	}
+
+	/**
+	 * Convert this instance to a {@link Properties} instance.
+	 *
+	 * @return the {@link Properties} instance
+	 */
+	public Properties toJdkProperties() {
+		Properties jdkProperties = new Properties();
+		for (Map.Entry<String, String> entry : this.entrySet()) {
+			jdkProperties.put(entry.getKey(), entry.getValue());
+		}
+		return jdkProperties;
+	}
+
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+
+		if (other == null || getClass() != other.getClass()) {
+			return false;
+		}
+
+		OrderedProperties that = (OrderedProperties) other;
+		return Arrays.equals(properties.entrySet().toArray(), that.properties.entrySet().toArray());
+	}
+
+	@Override
+	public int hashCode() {
+		return Arrays.hashCode(properties.entrySet().toArray());
+	}
+
+	private void writeObject(ObjectOutputStream stream) throws IOException {
+		stream.defaultWriteObject();
+		stream.writeObject(properties);
+		stream.writeBoolean(suppressDate);
+	}
+
+	@SuppressWarnings("unchecked")
+	private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
+		stream.defaultReadObject();
+		properties = (Map<String, String>) stream.readObject();
+		suppressDate = stream.readBoolean();
+	}
+
+	/**
+	 * See {@link Properties#toString()}.
+	 */
+	@Override
+	public String toString() {
+		return properties.toString();
+	}
+
+	/**
+	 * Creates a new instance that will have both the same property entries and the
+	 * same behavior as the given source.
+	 * <p/>
+	 * Note that the source instance and the copy instance will share the same
+	 * comparator instance if a custom ordering had been configured on the source.
+	 *
+	 * @param source the source to copy from
+	 * @return the copy
+	 */
+	public static OrderedProperties copyOf(OrderedProperties source) {
+		// create a copy that has the same behaviour
+		OrderedPropertiesBuilder builder = new OrderedPropertiesBuilder();
+		builder.withSuppressDateInComment(source.suppressDate);
+		if (source.properties instanceof TreeMap) {
+			builder.withOrdering(((TreeMap<String, String>) source.properties).comparator());
+		}
+		OrderedProperties result = builder.build();
+
+		// copy the properties from the source to the target
+		for (Map.Entry<String, String> entry : source.entrySet()) {
+			result.setProperty(entry.getKey(), entry.getValue());
+		}
+		return result;
+	}
+
+	/**
+	 * Builder for {@link OrderedProperties} instances.
+	 */
+	public static final class OrderedPropertiesBuilder {
+
+		private Comparator<? super String> comparator;
+		private boolean suppressDate;
+
+		/**
+		 * Use a custom ordering of the keys.
+		 *
+		 * @param comparator the ordering to apply on the keys
+		 * @return the builder
+		 */
+		public OrderedPropertiesBuilder withOrdering(Comparator<? super String> comparator) {
+			this.comparator = comparator;
+			return this;
+		}
+
+		/**
+		 * Suppress the comment that contains the current date when storing the
+		 * properties.
+		 *
+		 * @param suppressDate whether to suppress the comment that contains the current
+		 *                     date
+		 * @return the builder
+		 */
+		public OrderedPropertiesBuilder withSuppressDateInComment(boolean suppressDate) {
+			this.suppressDate = suppressDate;
+			return this;
+		}
+
+		public OrderedPropertiesBuilder withOrderingCaseSensitive() {
+			this.comparator = new Comparator<String>() {
+
+				@Override
+				public int compare(String a, String b) {
+					return a.compareTo(b);
+				}
+			};
+
+			return this;
+
+		}
+
+		public OrderedPropertiesBuilder withOrdering() {
+			this.comparator = String.CASE_INSENSITIVE_ORDER;
+
+			return this;
+		}
+
+		/**
+		 * Builds a new {@link OrderedProperties} instance.
+		 *
+		 * @return the new instance
+		 */
+		public OrderedProperties build() {
+			Map<String, String> properties = (this.comparator != null) ? new TreeMap<String, String>(comparator)
+					: new LinkedHashMap<String, String>();
+			return new OrderedProperties(properties, suppressDate);
+		}
+
+	}
+
+	/**
+	 * Custom {@link Properties} that delegates reading, writing, and enumerating
+	 * properties to the backing {@link OrderedProperties} instance's properties.
+	 */
+	@SuppressWarnings("serial")
+	private static final class CustomProperties extends Properties {
+
+		private final Map<String, String> targetProperties;
+
+		private CustomProperties(Map<String, String> targetProperties) {
+			this.targetProperties = targetProperties;
+		}
+
+		@Override
+		public Object get(Object key) {
+			return targetProperties.get(key);
+		}
+
+		@Override
+		public Object put(Object key, Object value) {
+			return targetProperties.put((String) key, (String) value);
+		}
+
+		@Override
+		public String getProperty(String key) {
+			return targetProperties.get(key);
+		}
+
+		@Override
+		public Enumeration<Object> keys() {
+			return new Vector<Object>(targetProperties.keySet()).elements();
+		}
+
+		@Override
+		public Set<Object> keySet() {
+			return new LinkedHashSet<Object>(targetProperties.keySet());
+		}
+
+		@Override
+		public void store(Writer writer, String comments) throws IOException {
+			store1((writer instanceof BufferedWriter) ? (BufferedWriter) writer : new BufferedWriter(writer), comments,
+					false);
+		}
+
+		@Override
+		public void store(OutputStream out, String comments) throws IOException {
+			store1(new BufferedWriter(new OutputStreamWriter(out, "8859_1")), comments, true);
+		}
+
+		private void store1(BufferedWriter bw, String comments, boolean escUnicode) throws IOException {
+
+			synchronized (this) {
+				for (Enumeration<?> e = keys(); e.hasMoreElements();) {
+					String key = (String) e.nextElement();
+					String val = (String) get(key);
+					key = saveConvert(key, true, escUnicode);
+					/*
+					 * No need to escape embedded and trailing spaces for value, hence pass false to
+					 * flag.
+					 */
+					val = saveConvert(val, false, escUnicode);
+					bw.write(key + "=" + val);
+					bw.newLine();
+				}
+			}
+			bw.flush();
+		}
+
+		/*
+		 * Converts unicodes to encoded &#92;uxxxx and escapes special characters with a
+		 * preceding slash
+		 */
+		private String saveConvert(String theString, boolean escapeSpace, boolean escapeUnicode) {
+			int len = theString.length();
+			int bufLen = len * 2;
+			if (bufLen < 0) {
+				bufLen = Integer.MAX_VALUE;
+			}
+			StringBuilder outBuffer = new StringBuilder(bufLen);
+
+			for (int x = 0; x < len; x++) {
+				char aChar = theString.charAt(x);
+				// Handle common case first, selecting largest block that
+				// avoids the specials below
+				if ((aChar > 61) && (aChar < 127)) {
+					if (aChar == '\\') {
+						outBuffer.append('\\');
+						outBuffer.append('\\');
+						continue;
+					}
+					outBuffer.append(aChar);
+					continue;
+				}
+				switch (aChar) {
+				case ' ':
+					if (x == 0 || escapeSpace)
+						outBuffer.append('\\');
+					outBuffer.append(' ');
+					break;
+				case '\t':
+					outBuffer.append('\\');
+					outBuffer.append('t');
+					break;
+				case '\n':
+					outBuffer.append('\\');
+					outBuffer.append('n');
+					break;
+				case '\r':
+					outBuffer.append('\\');
+					outBuffer.append('r');
+					break;
+				case '\f':
+					outBuffer.append('\\');
+					outBuffer.append('f');
+					break;
+				case '=': // Fall through
+				case ':': // Fall through
+				case '#': // Fall through
+//    			case '!':
+					outBuffer.append('\\');
+					outBuffer.append(aChar);
+					break;
+				default:
+					if (((aChar < 0x0020) || (aChar > 0x007e)) && escapeUnicode) {
+						outBuffer.append('\\');
+						outBuffer.append('u');
+						outBuffer.append(toHex((aChar >> 12) & 0xF));
+						outBuffer.append(toHex((aChar >> 8) & 0xF));
+						outBuffer.append(toHex((aChar >> 4) & 0xF));
+						outBuffer.append(toHex(aChar & 0xF));
+					} else {
+						outBuffer.append(aChar);
+					}
+				}
+			}
+			return outBuffer.toString();
+		}
+
+		/**
+		 * Convert a nibble to a hex character
+		 * 
+		 * @param nibble the nibble to convert.
+		 */
+		private static char toHex(int nibble) {
+			return hexDigit[(nibble & 0xF)];
+		}
+
+		private static final char[] hexDigit = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D',
+				'E', 'F' };
+
+	}
+
+	/**
+	 * Custom {@link BufferedWriter} for storing properties that will write all
+	 * leading lines of comments except the last comment line. Using the JDK
+	 * Properties class to store properties, the last comment line always contains
+	 * the current date which is what we want to filter out.
+	 */
+	private static final class DateSuppressingPropertiesBufferedWriter extends BufferedWriter {
+
+		private final String LINE_SEPARATOR = System.getProperty("line.separator");
+
+		private StringBuilder currentComment;
+		private String previousComment;
+
+		private DateSuppressingPropertiesBufferedWriter(Writer out) {
+			super(out);
+		}
+
+		@Override
+		public void write(String string) throws IOException {
+			if (currentComment != null) {
+				currentComment.append(string);
+				if (string.endsWith(LINE_SEPARATOR)) {
+					if (previousComment != null) {
+						super.write(previousComment);
+					}
+
+					previousComment = currentComment.toString();
+					currentComment = null;
+				}
+			} else if (string.startsWith("#")) {
+				currentComment = new StringBuilder(string);
+			} else {
+				super.write(string);
+			}
+		}
+
+	}
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/RunProccess.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/RunProccess.java
new file mode 100644
index 000000000..20efebbba
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/RunProccess.java
@@ -0,0 +1,219 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.common;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Run Java Process in a new VM
+ *
+ * @author rgarcia
+ */
+public class RunProccess {
+    private static final String ANT_MAIN_CLASS = "org.apache.tools.ant.launch.Launcher";
+
+    private static String getClasspath(List<String> classpathEntries) {
+        StringBuilder builder = new StringBuilder();
+        int count = 0;
+        final int totalSize = classpathEntries.size();
+        for (String classpathEntry : classpathEntries) {
+            builder.append(classpathEntry);
+            count++;
+            if (count < totalSize) {
+                builder.append(System.getProperty("path.separator"));
+            }
+        }
+        return builder.toString();
+    }
+
+    public static boolean runBladeEngine(File prjFolder, String chapter, String scene, boolean fullscreen)
+            throws IOException {
+        List<String> args = new ArrayList<>();
+        args.add(":desktop:run");
+        String appArgs = "-PappArgs=['-d'";
+
+        if (!fullscreen)
+            appArgs += ",'-w'";
+
+        if (chapter != null) {
+            appArgs += ",'-chapter','" + chapter + "'";
+        }
+
+        if (scene != null) {
+            appArgs += ",'-t','" + scene + "'";
+        }
+
+        appArgs += "]";
+        args.add(appArgs);
+
+        return runGradle(prjFolder, args);
+    }
+
+    public static boolean runBladeEngineInternal(File prjFolder, String chapter, String scene) throws IOException {
+        List<String> args = new ArrayList<>();
+        args.add("-w");
+        args.add("-adv-dir");
+        args.add(prjFolder.getAbsolutePath());
+
+        if (scene != null) {
+            args.add("-t");
+            args.add(scene);
+        }
+
+        if (chapter != null) {
+            args.add("-chapter");
+            args.add(chapter);
+        }
+
+        List<String> cp = new ArrayList<>();
+        cp.add(System.getProperty("java.class.path"));
+
+        runJavaProccess("com.bladecoder.engineeditor.utils.DesktopLauncher", cp, args);
+
+        return true;
+    }
+
+    public static Process runJavaProccess(String mainClass, List<String> classpathEntries, List<String> args)
+            throws IOException {
+        String javaRT = System.getProperty("java.home") + "/bin/java";
+        String workingDirectory = ".";
+
+        List<String> argumentsList = new ArrayList<>();
+        argumentsList.add(javaRT);
+
+        if (classpathEntries != null && classpathEntries.size() > 0) {
+            argumentsList.add("-classpath");
+            argumentsList.add(getClasspath(classpathEntries));
+        }
+
+        argumentsList.add(mainClass);
+
+        if (args != null)
+            argumentsList.addAll(args);
+
+        ProcessBuilder processBuilder = new ProcessBuilder(argumentsList.toArray(new String[argumentsList.size()]));
+        // processBuilder.redirectErrorStream(true);
+        processBuilder.directory(new File(workingDirectory));
+        processBuilder.inheritIO();
+
+        return processBuilder.start();
+    }
+
+    public static Process runJavaHomeBin(String bin, List<String> args) throws IOException {
+        String cmd = System.getProperty("java.home") + "/bin/" + bin;
+        String workingDirectory = ".";
+
+        List<String> argumentsList = new ArrayList<>();
+        argumentsList.add(cmd);
+
+        if (args != null)
+            argumentsList.addAll(args);
+
+        ProcessBuilder processBuilder = new ProcessBuilder(argumentsList.toArray(new String[argumentsList.size()]));
+        // processBuilder.redirectErrorStream(true);
+        processBuilder.directory(new File(workingDirectory));
+        processBuilder.inheritIO();
+
+        return processBuilder.start();
+    }
+
+    public static boolean runGradle(File workingDir, List<String> parameters) {
+        String exec = workingDir.getAbsolutePath() + "/"
+                + (System.getProperty("os.name").contains("Windows") ? "gradlew.bat" : "gradlew");
+
+        List<String> argumentsList = new ArrayList<>();
+        argumentsList.add(exec);
+        argumentsList.addAll(parameters);
+
+        EditorLogger.msgThreaded("Executing 'gradlew " + parameters + "'");
+
+        try {
+            final ProcessBuilder pb = new ProcessBuilder(argumentsList).directory(workingDir).redirectErrorStream(true);
+
+            // TODO: READ OUTPUT FROM pb AND print in output stream
+            // if (System.console() != null)
+            // pb.inheritIO();
+
+            final Process process = pb.start();
+
+            BufferedReader in = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            String line;
+            while ((line = in.readLine()) != null) {
+                EditorLogger.msgThreaded(line);
+            }
+
+            process.waitFor();
+            return process.exitValue() == 0;
+        } catch (Exception e) {
+            EditorLogger.msgThreaded("ERROR: " + e.getMessage());
+            return false;
+        }
+    }
+
+    public static boolean runInklecate(File workingDir, List<String> parameters) {
+        String exec = workingDir.getAbsolutePath() + "/" + "inklecate.exe";
+
+        if (!new File(exec).exists()) {
+            exec = workingDir.getAbsolutePath() + "/" + "inklecate";
+        }
+
+        if (!new File(exec).exists()) {
+            EditorLogger.msgThreaded("ERROR: Could not find inklecate.exe or inklecate in " + workingDir.getAbsolutePath());
+            return false;
+        }
+
+        List<String> argumentsList = new ArrayList<>();
+        argumentsList.add(exec);
+        argumentsList.addAll(parameters);
+
+        EditorLogger.msgThreaded("Executing 'inklecate " + parameters + "'");
+
+        try {
+            final ProcessBuilder pb = new ProcessBuilder(argumentsList).directory(workingDir).redirectErrorStream(true);
+
+            // TODO: READ OUTPUT FROM pb AND print in output stream
+            // if (System.console() != null)
+            // pb.inheritIO();
+
+            final Process process = pb.start();
+
+            BufferedReader in = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            String line;
+            while ((line = in.readLine()) != null) {
+                EditorLogger.msgThreaded(line);
+            }
+
+            process.waitFor();
+            return process.exitValue() == 0;
+        } catch (Exception e) {
+            EditorLogger.msgThreaded("ERROR: " + e.getMessage());
+            return false;
+        }
+    }
+
+    public static boolean runGradle(File workingDir, String parameters) {
+
+        String[] split = parameters.split(" ");
+
+        return runGradle(workingDir, Arrays.asList(split));
+    }
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/TemplateUtils.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/TemplateUtils.java
similarity index 98%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/TemplateUtils.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/common/TemplateUtils.java
index 1e839ebd2..edbc838aa 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/TemplateUtils.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/TemplateUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.utils;
+package com.bladecoder.engineeditor.common;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/Versions.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/Versions.java
new file mode 100644
index 000000000..44b9abb28
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/Versions.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.common;
+
+import java.io.InputStream;
+import java.util.Properties;
+
+public class Versions {
+    private static final String VERSION_PROP = "version";
+    private static final String LIBGDX_VERSION_PROP = "libgdxVersion";
+    private static final String ROBOVM_VERSION_PROP = "roboVMVersion";
+    private static final String ANDROID_API_LEVEL_PROP = "androidAPILevel";
+    private static final String ANDROID_GRADLE_VERSION_PROP = "androidGradlePluginVersion";
+    private static final String BLADE_INK_VERSION_PROP = "bladeInkVersion";
+
+    public static final String PROPERTIES_FILENAME = "/versions.properties";
+
+    private static Properties config = null;
+
+    private static String getProperty(String key, String defaultValue) {
+        if (config == null) {
+            config = new Properties();
+
+            try {
+                InputStream is = Versions.class.getResourceAsStream(PROPERTIES_FILENAME);
+                config.load(is);
+            } catch (Exception e) {
+                EditorLogger.error("ERROR LOADING VERSION FILE: " + e.getMessage());
+            }
+        }
+
+        return config.getProperty(key, defaultValue);
+    }
+
+    public static String getVersion() {
+        return getProperty(VERSION_PROP, null);
+    }
+
+    public static String getLibgdxVersion() {
+        return getProperty(LIBGDX_VERSION_PROP, null);
+    }
+
+    public static String getRoboVMVersion() {
+        return getProperty(ROBOVM_VERSION_PROP, null);
+    }
+
+    public static String getAndroidAPILevel() {
+        return getProperty(ANDROID_API_LEVEL_PROP, null);
+    }
+
+    public static void setAndroidAPILevel(String v) {
+        config.setProperty(ANDROID_API_LEVEL_PROP, v);
+    }
+
+    public static String getAndroidGradlePluginVersion() {
+        return getProperty(ANDROID_GRADLE_VERSION_PROP, null);
+    }
+
+    public static String getBladeInkVersion() {
+        return getProperty(BLADE_INK_VERSION_PROP, null);
+    }
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ZipUtils.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ZipUtils.java
new file mode 100644
index 000000000..b3100c9ca
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/common/ZipUtils.java
@@ -0,0 +1,182 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.common;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.zip.Deflater;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+public class ZipUtils {
+    // 4MB buffer
+    private static final byte[] BUFFER = new byte[4096 * 1024];
+
+    // copy input to output stream
+    private static void copy(InputStream input, OutputStream output) throws IOException {
+        int bytesRead;
+        while ((bytesRead = input.read(BUFFER)) != -1) {
+            output.write(BUFFER, 0, bytesRead);
+        }
+    }
+
+    public static void mergeZIPs(String f[], String dest) throws Exception {
+        // Needed to avoid appending repeated entries.
+        HashMap<String, String> destEntries = new HashMap<String, String>();
+
+        // read the org zips
+        ZipFile fZip[] = new ZipFile[f.length];
+
+        for (int i = 0; i < fZip.length; i++)
+            fZip[i] = new ZipFile(f[i]);
+
+        // write the dest zip
+        ZipOutputStream destZip = new ZipOutputStream(new FileOutputStream(dest));
+
+        // copy contents from f zip to the dest zip
+
+        for (ZipFile z : fZip) {
+            Enumeration<? extends ZipEntry> entries = z.entries();
+            while (entries.hasMoreElements()) {
+                ZipEntry e = entries.nextElement();
+
+                String name = e.getName();
+                if (destEntries.get(name) == null) {
+                    destEntries.put(name, name);
+                    EditorLogger.debug("copy: " + e.getName());
+                    destZip.putNextEntry(e);
+                    EditorLogger.debug("putnextEntry done");
+                    if (!e.isDirectory()) {
+                        copy(z.getInputStream(e), destZip);
+                    }
+                    destZip.closeEntry();
+                }
+            }
+        }
+
+        EditorLogger.debug("appending done ");
+
+        // close
+        for (ZipFile z : fZip) {
+            z.close();
+        }
+
+        destZip.close();
+    }
+
+    public static void packZip(List<File> sources, File output) throws IOException {
+        EditorLogger.debug("Packaging to " + output.getName());
+        ZipOutputStream zipOut = new ZipOutputStream(new FileOutputStream(output));
+        zipOut.setLevel(Deflater.DEFAULT_COMPRESSION);
+
+        for (File source : sources) {
+            if (source.isDirectory()) {
+                zipDir(zipOut, "", source);
+            } else {
+                zipFile(zipOut, "", source);
+            }
+        }
+        zipOut.flush();
+        zipOut.close();
+        EditorLogger.debug("Done");
+    }
+
+    private static String buildPath(String path, String file) {
+        if (path == null || path.isEmpty()) {
+            return file;
+        } else {
+            return path + "/" + file;
+        }
+    }
+
+    private static void zipDir(ZipOutputStream zos, String path, File dir) throws IOException {
+        if (!dir.canRead()) {
+            EditorLogger.error("Cannot read " + dir.getCanonicalPath()
+                    + " (maybe because of permissions)");
+            return;
+        }
+
+        File[] files = dir.listFiles();
+        path = buildPath(path, dir.getName());
+        EditorLogger.debug("Adding Directory " + path);
+
+        for (File source : files) {
+            if (source.isDirectory()) {
+                zipDir(zos, path, source);
+            } else {
+                zipFile(zos, path, source);
+            }
+        }
+
+        EditorLogger.debug("Leaving Directory " + path);
+    }
+
+    private static void zipFile(ZipOutputStream zos, String path, File file) throws IOException {
+        if (!file.canRead()) {
+            EditorLogger.error("Cannot read " + file.getCanonicalPath()
+                    + " (maybe because of permissions)");
+            return;
+        }
+
+        EditorLogger.debug("Compressing " + file.getName());
+        zos.putNextEntry(new ZipEntry(buildPath(path, file.getName())));
+
+        FileInputStream fis = new FileInputStream(file);
+
+        byte[] buffer = new byte[4092];
+        int byteCount = 0;
+        while ((byteCount = fis.read(buffer)) != -1) {
+            zos.write(buffer, 0, byteCount);
+        }
+
+        fis.close();
+        zos.closeEntry();
+    }
+
+    public static void unzip(File zipFile, Path targetDir) throws IOException {
+        InputStream is = Files.newInputStream(zipFile.toPath());
+
+        targetDir = targetDir.toAbsolutePath();
+
+        try (ZipInputStream zipIn = new ZipInputStream(is)) {
+            for (ZipEntry ze; (ze = zipIn.getNextEntry()) != null; ) {
+                Path resolvedPath = targetDir.resolve(ze.getName()).normalize();
+                if (!resolvedPath.startsWith(targetDir)) {
+                    // see: https://snyk.io/research/zip-slip-vulnerability
+                    throw new RuntimeException("Entry with an illegal path: "
+                            + ze.getName());
+                }
+                if (ze.isDirectory()) {
+                    Files.createDirectories(resolvedPath);
+                } else {
+                    Files.createDirectories(resolvedPath.getParent());
+                    Files.copy(zipIn, resolvedPath);
+                }
+            }
+        }
+    }
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/Chapter.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/Chapter.java
new file mode 100644
index 000000000..994a898f9
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/Chapter.java
@@ -0,0 +1,127 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.model;
+
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import org.apache.commons.io.FileUtils;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.net.URL;
+
+public class Chapter {
+    private String modelPath;
+    private String id;
+
+    public Chapter(String modelPath) {
+        this.modelPath = modelPath;
+
+        if (!modelPath.endsWith("/"))
+            this.modelPath = modelPath + "/";
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String toString() {
+        return getId();
+    }
+
+    public void load(String id) throws IOException {
+        setId(id);
+        Ctx.project.getWorld().getSerializer().loadChapter(id, null, false);
+    }
+
+    public void save() throws IOException {
+        Ctx.project.getWorld().getSerializer().saveModel(id);
+    }
+
+    public String[] getChapters() {
+
+        String[] chapters = new File(modelPath).list(new FilenameFilter() {
+            @Override
+            public boolean accept(File arg0, String arg1) {
+                if (!arg1.endsWith(EngineAssetManager.CHAPTER_EXT) && !arg1.endsWith(".chapter"))
+                    return false;
+
+                return true;
+            }
+        });
+
+        for (int i = 0; i < chapters.length; i++) {
+            if (chapters[i].endsWith(EngineAssetManager.CHAPTER_EXT))
+                chapters[i] = chapters[i].substring(0, chapters[i].lastIndexOf(EngineAssetManager.CHAPTER_EXT));
+            else
+                chapters[i] = chapters[i].substring(0, chapters[i].lastIndexOf(".chapter"));
+        }
+
+        return chapters;
+    }
+
+    public String getInitChapter() {
+        String init = Ctx.project.getWorld().getInitChapter();
+
+        if (init == null || init.isEmpty()) {
+            init = getChapters()[0];
+
+            Ctx.project.getWorld().setInitChapter(init);
+        }
+
+        return init;
+    }
+
+    public String createChapter(String id) throws TransformerException, ParserConfigurationException, IOException {
+        String checkedId = ElementUtils.getCheckedId(id, getChapters());
+
+        URL inputUrl = getClass().getResource("/projectTmpl/assets/model/00.chapter.json");
+        File dest = new File(modelPath + checkedId + EngineAssetManager.CHAPTER_EXT);
+        FileUtils.copyURLToFile(inputUrl, dest);
+
+        return checkedId;
+    }
+
+    public void renameChapter(String oldId, String newId)
+            throws TransformerException, ParserConfigurationException, SAXException, IOException {
+        File f = new File(modelPath + id + EngineAssetManager.CHAPTER_EXT);
+        f.renameTo(new File(modelPath + newId + EngineAssetManager.CHAPTER_EXT));
+
+        String i18nFilename = modelPath + id + ".properties";
+        f = new File(i18nFilename);
+        f.renameTo(new File(modelPath + newId + ".properties"));
+    }
+
+    public void deleteChapter(String id)
+            throws TransformerException, ParserConfigurationException, SAXException, IOException {
+        File f = new File(modelPath + id + EngineAssetManager.CHAPTER_EXT);
+        f.delete();
+
+        String i18nFilename = modelPath + id + ".properties";
+        f = new File(i18nFilename);
+        f.delete();
+    }
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/I18NHandler.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/I18NHandler.java
new file mode 100644
index 000000000..0313bd8e6
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/I18NHandler.java
@@ -0,0 +1,539 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.model;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.DisableActionAction;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.DialogOption;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.TextRenderer;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.OrderedProperties;
+import com.bladecoder.engineeditor.common.OrderedProperties.OrderedPropertiesBuilder;
+
+public class I18NHandler {
+	public static final String WORLD_VERBS_PREFIX = "default";
+
+	private String modelPath;
+	private String worldFilename;
+	private String chapterFilename;
+
+	private OrderedProperties i18nWorld;
+	private OrderedProperties i18nChapter;
+
+	public I18NHandler(String modelPath) {
+		this.worldFilename = EngineAssetManager.WORLD_FILENAME;
+		this.modelPath = modelPath;
+
+		if (!modelPath.endsWith("/"))
+			this.modelPath = modelPath + "/";
+
+		i18nWorld = loadI18N(worldFilename);
+	}
+
+	private String getI18NFilename(String modelFilename) {
+		return modelPath + modelFilename + ".properties";
+	}
+
+	public void load(String chapterId) {
+		this.chapterFilename = chapterId;
+		i18nChapter = loadI18N(chapterFilename);
+	}
+
+	private OrderedProperties loadI18N(String modelFilename) {
+		String i18nFilename = getI18NFilename(modelFilename);
+
+		// To save in alphabetical order we use the OrderedProperties
+		OrderedProperties i18n = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering().build();
+
+		try {
+			i18n.load(new InputStreamReader(new FileInputStream(i18nFilename), I18N.ENCODING));
+		} catch (IOException e) {
+			EditorLogger.error("ERROR LOADING BUNDLE: " + i18nFilename);
+		}
+
+		return i18n;
+	}
+
+	public String getWorldTranslation(String key) {
+		if (key == null || key.isEmpty() || key.charAt(0) != I18N.PREFIX || i18nWorld == null)
+			return key;
+
+		return i18nWorld.getProperty(key.substring(1), key);
+	}
+
+	/**
+	 * Returns the translation from chapter property
+	 * 
+	 * @param key
+	 * @return
+	 */
+	public String getTranslation(String key) {
+		if (key == null || key.isEmpty() || key.charAt(0) != I18N.PREFIX || i18nChapter == null)
+			return key;
+
+		return i18nChapter.getProperty(key.substring(1), key);
+	}
+
+	public void setTranslation(String key, String value) {
+		if (key.charAt(0) != I18N.PREFIX) {
+			if (value == null || value.equals(""))
+				i18nChapter.removeProperty(key);
+			else
+				i18nChapter.setProperty(key, value);
+		} else {
+			if (value == null || value.equals(""))
+				i18nChapter.removeProperty(key.substring(1));
+			else
+				i18nChapter.setProperty(key.substring(1), value);
+		}
+	}
+
+	public void setWorldTranslation(String key, String value) {
+		if (key.charAt(0) != I18N.PREFIX) {
+			if (value == null || value.equals(""))
+				i18nWorld.removeProperty(key);
+			else
+				i18nWorld.setProperty(key, value);
+		} else {
+			if (value == null || value.equals(""))
+				i18nWorld.removeProperty(key.substring(1));
+			else
+				i18nWorld.setProperty(key.substring(1), value);
+		}
+	}
+
+	private void save(String filename, OrderedProperties p) {
+		String i18nFilename = getI18NFilename(filename);
+
+		deleteUnusedKeys();
+
+		try {
+			FileOutputStream os = new FileOutputStream(i18nFilename);
+			Writer out = new OutputStreamWriter(os, I18N.ENCODING);
+			p.store(out, filename);
+		} catch (IOException e) {
+			EditorLogger.error("ERROR WRITING BUNDLE: " + i18nFilename);
+		}
+	}
+
+	public void save() throws FileNotFoundException {
+		save(worldFilename, i18nWorld);
+		save(chapterFilename, i18nChapter);
+	}
+
+	public void putTranslationsInElement(Scene scn) {
+
+		HashMap<String, Verb> verbs = scn.getVerbManager().getVerbs();
+
+		for (Verb v : verbs.values())
+			putTranslationsInElement(v, false);
+
+		for (BaseActor a : scn.getActors().values()) {
+			putTranslationsInElement(a);
+		}
+	}
+
+	public void putTranslationsInElement(BaseActor a) {
+		if (a instanceof InteractiveActor) {
+			InteractiveActor ia = (InteractiveActor) a;
+
+			// 1. DESC attribute
+			ia.setDesc(getTranslation(ia.getDesc()));
+
+			// 2. ACTIONS
+			HashMap<String, Verb> verbs = ia.getVerbManager().getVerbs();
+
+			for (Verb v : verbs.values())
+				putTranslationsInElement(v, false);
+
+			// 3. DIALOGS
+			if (a instanceof CharacterActor) {
+				HashMap<String, Dialog> dialogs = ((CharacterActor) a).getDialogs();
+
+				if (dialogs != null) {
+					for (Dialog d : dialogs.values())
+						putTranslationsInElement(d);
+				}
+			}
+
+			// 4. Text for TextRenderer
+			if (a instanceof SpriteActor && ((SpriteActor) a).getRenderer() instanceof TextRenderer) {
+
+				TextRenderer r = (TextRenderer) ((SpriteActor) a).getRenderer();
+
+				r.setText(getTranslation(r.getText()));
+			}
+		}
+	}
+
+	public void putTranslationsInElement(Verb v, boolean worldScope) {
+		ArrayList<Action> actions = v.getActions();
+
+		for (Action a : actions) {
+			putTranslationsInElement(a, worldScope);
+		}
+	}
+
+	public void putTranslationsInElement(Action a, boolean worldScope) {
+		String[] names = ActionUtils.getFieldNames(a);
+
+		for (String name : names) {
+			if (name.toLowerCase().endsWith("text")) {
+
+				try {
+					String value = null;
+
+					if (worldScope)
+						value = getWorldTranslation(ActionUtils.getStringValue(a, name));
+					else
+						value = getTranslation(ActionUtils.getStringValue(a, name));
+
+					ActionUtils.setParam(a, name, value);
+				} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+					EditorLogger.error(e.getMessage());
+				}
+			}
+		}
+	}
+
+	public void putTranslationsInElement(Dialog d) {
+		ArrayList<DialogOption> options = d.getOptions();
+
+		for (DialogOption o : options) {
+			putTranslationsInElement(o);
+		}
+	}
+
+	public void putTranslationsInElement(DialogOption o) {
+		o.setText(getTranslation(o.getText()));
+		o.setResponseText(getTranslation(o.getResponseText()));
+	}
+
+	public void extractStrings(Scene scn) {
+		HashMap<String, Verb> verbs = scn.getVerbManager().getVerbs();
+
+		for (Verb v : verbs.values())
+			extractStrings(scn.getId(), null, v);
+
+		for (BaseActor a : scn.getActors().values()) {
+			extractStrings(scn.getId(), a);
+		}
+	}
+
+	public void extractStrings(String sceneid, BaseActor a) {
+		if (a instanceof InteractiveActor) {
+			InteractiveActor ia = (InteractiveActor) a;
+
+			// 1. DESC attribute
+			if (ia.getDesc() != null && !ia.getDesc().isEmpty() && ia.getDesc().charAt(0) != I18N.PREFIX) {
+				String key = genKey(sceneid, a.getId(), "desc");
+				String value = ia.getDesc();
+				ia.setDesc(key);
+				setTranslation(key, value);
+			}
+
+			// 2. ACTIONS
+			HashMap<String, Verb> verbs = ia.getVerbManager().getVerbs();
+
+			for (Verb v : verbs.values())
+				extractStrings(sceneid, a.getId(), v);
+
+			// 3. DIALOGS
+			if (a instanceof CharacterActor) {
+				HashMap<String, Dialog> dialogs = ((CharacterActor) a).getDialogs();
+
+				if (dialogs != null)
+					for (Dialog d : dialogs.values())
+						extractStrings(sceneid, a.getId(), d);
+			}
+
+			// 4. Text for TextRenderer
+			if (a instanceof SpriteActor && ((SpriteActor) a).getRenderer() instanceof TextRenderer) {
+
+				TextRenderer r = (TextRenderer) ((SpriteActor) a).getRenderer();
+
+				String v = r.getText();
+
+				if (v != null && !v.isEmpty() && v.charAt(0) != I18N.PREFIX) {
+					String key = genKey(sceneid, a.getId(), "text");
+					r.setText(key, r.getText());
+					setTranslation(key, v);
+				}
+			}
+		}
+	}
+
+	public void extractStrings(String sceneid, String actorid, Verb v) {
+		ArrayList<Action> actions = v.getActions();
+
+		for (int i = 0; i < actions.size(); i++) {
+			Action a = actions.get(i);
+
+			extractStrings(sceneid, actorid, v.getHashKey(), i, a);
+		}
+	}
+
+	public void extractStrings(String sceneid, String actorid, Dialog d) {
+		ArrayList<DialogOption> options = d.getOptions();
+
+		for (int i = 0; i < options.size(); i++) {
+			DialogOption o = options.get(i);
+
+			extractStrings(sceneid, actorid, d.getId(), i, o);
+		}
+	}
+
+	public void extractStrings(String sceneid, String actorid, String dialogid, int pos, DialogOption o) {
+		if (o.getText() != null && !o.getText().isEmpty() && o.getText().charAt(0) != I18N.PREFIX) {
+			String key = genKey(sceneid, actorid, dialogid, pos, "text");
+			String value = o.getText();
+			o.setText(key);
+			setTranslation(key, value);
+		}
+
+		if (o.getResponseText() != null && !o.getResponseText().isEmpty()
+				&& o.getResponseText().charAt(0) != I18N.PREFIX) {
+			String key = genKey(sceneid, actorid, dialogid, pos, "responseText");
+			String value = o.getResponseText();
+			o.setResponseText(key);
+			setTranslation(key, value);
+		}
+	}
+
+	public void extractStrings(String sceneid, String actorid, String parent, int pos, Action a) {
+		String[] names = ActionUtils.getFieldNames(a);
+
+		for (String name : names) {
+			if (name.toLowerCase().endsWith("text")) {
+
+				try {
+					String value = ActionUtils.getStringValue(a, name);
+
+					if (value != null && !value.isEmpty() && value.charAt(0) != I18N.PREFIX) {
+						String key = genKey(sceneid, actorid, parent, pos, name);
+						ActionUtils.setParam(a, name, key);
+
+						if (sceneid == null)
+							setWorldTranslation(key, value);
+						else
+							setTranslation(key, value);
+					}
+				} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+					EditorLogger.error(e.getMessage());
+				}
+			}
+		}
+	}
+
+	public String genKey(String sceneid, String actorid, String property) {
+		String key = I18N.PREFIX + sceneid + "." + actorid + "." + property;
+
+		return getNotDuplicateKey(key);
+	}
+
+	public String genKey(String sceneid, String actorid, String parent, int pos, String property) {
+		String key = I18N.PREFIX + (sceneid == null ? WORLD_VERBS_PREFIX : sceneid)
+				+ (actorid == null ? "" : "." + actorid) + "." + parent + "." + pos + "." + property;
+
+		if (sceneid == null)
+			return getNotDuplicateKeyWorld(key);
+
+		return getNotDuplicateKey(key);
+	}
+
+	public String getNotDuplicateKey(String key) {
+		// first delete all numbers at the end to avoid always growing keys
+		String key2 = key.replaceAll("\\d*$", "");
+
+		if (key2.isEmpty())
+			key2 = key;
+
+		int i = 0;
+
+		while (i18nChapter.containsProperty(key2.charAt(0) == I18N.PREFIX ? key2.substring(1) : key2)) {
+			i++;
+			key2 = key + i;
+		}
+
+		return key2;
+	}
+
+	public String getNotDuplicateKeyWorld(String key) {
+		// first delete all numbers at the end to avoid always growing keys
+		String key2 = key.replaceAll("\\d*$", "");
+
+		if (key2.isEmpty())
+			key2 = key;
+
+		int i = 0;
+
+		while (i18nWorld.containsProperty(key2.charAt(0) == I18N.PREFIX ? key2.substring(1) : key2)) {
+			i++;
+			key2 = key + i;
+		}
+
+		return key2;
+	}
+
+	public void cleanI18N() {
+		Map<String, Scene> scenes = Ctx.project.getWorld().getScenes();
+		for (Scene scn : scenes.values()) {
+			Ctx.project.getI18N().putTranslationsInElement(scn);
+		}
+
+		// i18nChapter = new
+		// OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrdering().build();
+		deleteUnusedKeys();
+
+		for (Scene scn : scenes.values()) {
+			Ctx.project.getI18N().extractStrings(scn);
+		}
+
+		Ctx.project.setModified();
+	}
+
+	private void deleteUnusedKeys() {
+		ArrayList<String> usedKeys = new ArrayList<>();
+
+		// SCENES
+		for (Scene s : Ctx.project.getWorld().getScenes().values())
+			getUsedKeys(s, usedKeys);
+
+		Enumeration<String> keys = i18nChapter.propertyNames();
+
+		while (keys.hasMoreElements()) {
+			String key = keys.nextElement();
+
+			// Doesn't remove ui and ink keys
+			if (!usedKeys.contains(key) && !key.startsWith("ui.") && !key.startsWith("ink.")) {
+				EditorLogger.debug("Removing translation key: " + key);
+				i18nChapter.removeProperty(key);
+			}
+		}
+
+		usedKeys.clear();
+		// WORLD VERBS
+		for (Verb v : Ctx.project.getWorld().getVerbManager().getVerbs().values())
+			getUsedKeys(v, usedKeys);
+
+		keys = i18nWorld.propertyNames();
+
+		while (keys.hasMoreElements()) {
+			String key = keys.nextElement();
+
+			// Doesn't remove ui keys
+			if (!usedKeys.contains(key) && !key.startsWith("ui.")) {
+				EditorLogger.debug("Removing translation key: " + key);
+				i18nWorld.removeProperty(key);
+			}
+		}
+
+	}
+
+	private void getUsedKeys(Scene s, ArrayList<String> usedKeys) {
+		for (Verb v : s.getVerbManager().getVerbs().values())
+			getUsedKeys(v, usedKeys);
+
+		for (BaseActor a : s.getActors().values()) {
+			if (a instanceof InteractiveActor) {
+				InteractiveActor ia = (InteractiveActor) a;
+
+				if (ia.getDesc() != null && !ia.getDesc().isEmpty() && ia.getDesc().charAt(0) == I18N.PREFIX)
+					usedKeys.add(ia.getDesc().substring(1));
+
+				for (Verb v : ia.getVerbManager().getVerbs().values())
+					getUsedKeys(v, usedKeys);
+
+				if (a instanceof CharacterActor) {
+					CharacterActor ca = (CharacterActor) a;
+
+					if (ca.getDialogs() != null) {
+						for (Dialog d : ca.getDialogs().values()) {
+							for (DialogOption o : d.getOptions()) {
+								if (o.getText() != null && !o.getText().isEmpty()
+										&& o.getText().charAt(0) == I18N.PREFIX)
+									usedKeys.add(o.getText().substring(1));
+
+								if (o.getResponseText() != null && !o.getResponseText().isEmpty()
+										&& o.getResponseText().charAt(0) == I18N.PREFIX)
+									usedKeys.add(o.getResponseText().substring(1));
+							}
+						}
+					}
+				}
+
+				if (a instanceof SpriteActor && ((SpriteActor) a).getRenderer() instanceof TextRenderer) {
+
+					TextRenderer r = (TextRenderer) ((SpriteActor) a).getRenderer();
+
+					String k = r.getText();
+
+					if (k != null && !k.isEmpty() && k.charAt(0) == I18N.PREFIX)
+						usedKeys.add(k.substring(1));
+				}
+			}
+		}
+	}
+
+	private void getUsedKeys(Verb v, ArrayList<String> usedKeys) {
+		for (Action a : v.getActions()) {
+
+			if (a instanceof DisableActionAction)
+				a = ((DisableActionAction) a).getAction();
+
+			String[] fieldNames = ActionUtils.getFieldNames(a);
+
+			for (String name : fieldNames) {
+				if (name.toLowerCase().endsWith("text")) {
+					String value = null;
+
+					try {
+						value = ActionUtils.getStringValue(a, name);
+					} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+						EditorLogger.error(e.getMessage());
+					}
+
+					if (value != null && !value.isEmpty() && value.charAt(0) == I18N.PREFIX) {
+						usedKeys.add(value.substring(1));
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/Project.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/Project.java
new file mode 100644
index 000000000..62fa778e1
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/Project.java
@@ -0,0 +1,567 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.model;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Graphics;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Window;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.utils.SerializationException;
+import com.bladecoder.engine.actions.ActionFactory;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.Config;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.FolderClassLoader;
+import com.bladecoder.engineeditor.common.OrderedProperties;
+import com.bladecoder.engineeditor.common.OrderedProperties.OrderedPropertiesBuilder;
+import com.bladecoder.engineeditor.common.RunProccess;
+import com.bladecoder.engineeditor.common.Versions;
+import com.bladecoder.engineeditor.setup.BladeEngineSetup;
+import com.bladecoder.engineeditor.undo.UndoStack;
+
+import java.beans.PropertyChangeEvent;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+
+public class Project extends PropertyChange {
+    public static final String NOTIFY_SCENE_SELECTED = "SCENE_SELECTED";
+    public static final String NOTIFY_ACTOR_SELECTED = "ACTOR_SELECTED";
+    public static final String NOTIFY_ANIM_SELECTED = "ANIM_SELECTED";
+    public static final String NOTIFY_PROJECT_LOADED = "PROJECT_LOADED";
+    public static final String NOTIFY_PROJECT_SAVED = "PROJECT_SAVED";
+    public static final String NOTIFY_CHAPTER_LOADED = "CHAPTER_LOADED";
+
+    public static final String NOTIFY_ELEMENT_DELETED = "ELEMENT_DELETED";
+    public static final String NOTIFY_ELEMENT_CREATED = "ELEMENT_CREATED";
+    public static final String NOTIFY_MODEL_MODIFIED = "MODEL_MODIFIED";
+    public static final String POSITION_PROPERTY = "pos";
+    public static final String WIDTH_PROPERTY = "width";
+    public static final String HEIGHT_PROPERTY = "height";
+    public static final String CHAPTER_PROPERTY = "chapter";
+
+    public static final String SPINE_RENDERER_STRING = "spine";
+    public static final String ATLAS_RENDERER_STRING = "atlas";
+    public static final String IMAGE_RENDERER_STRING = "image";
+    public static final String PARTICLE_RENDERER_STRING = "particle";
+    public static final String TEXT_RENDERER_STRING = "text";
+
+    public static final String ASSETS_PATH = "/assets";
+    public static final String MODEL_PATH = "/model";
+    public static final String ATLASES_PATH = "/atlases";
+    public static final String FONTS_PATH = "/fonts";
+    public static final String MUSIC_PATH = "/music";
+    public static final String SOUND_PATH = "/sounds";
+    public static final String IMAGE_PATH = "/images";
+    public static final String SPINE_PATH = "/spine";
+    public static final String PARTICLE_PATH = "/particles";
+    public static final String VOICE_PATH = "/voices";
+    public static final String UI_PATH = "/ui";
+    public static final String FONT_PATH = UI_PATH + "/fonts";
+
+    private static final String CONFIG_DIR = System.getProperty("user.home") + "/.AdventureEditor";
+    private static final String CONFIG_FILENAME = "config.properties";
+
+    public static final String LAST_PROJECT_PROP = "last_project";
+
+    private final Properties editorConfig = new Properties();
+
+    private File projectFile;
+
+    private final UndoStack undoStack = new UndoStack();
+    private OrderedProperties projectConfig;
+
+    private I18NHandler i18n;
+    private Chapter chapter;
+    private Scene selectedScene;
+    private BaseActor selectedActor;
+    private String selectedFA;
+    private boolean modified = false;
+    private final World world = new World();
+    private final HashSet<String> hiddenActors = new HashSet<>();
+
+    public Project() {
+        loadConfig();
+    }
+
+    public World getWorld() {
+        return world;
+    }
+
+    public String getAssetPath(String base) {
+        return base + ASSETS_PATH;
+    }
+
+    public String getAssetPath() {
+        return getAssetPath(getProjectPath());
+    }
+
+    public UndoStack getUndoStack() {
+        return undoStack;
+    }
+
+    private void loadConfig() {
+        File dir = new File(CONFIG_DIR);
+        File f = new File(CONFIG_DIR + "/" + CONFIG_FILENAME);
+
+        if (!dir.exists())
+            dir.mkdirs();
+
+        try {
+            if (!f.exists()) {
+                f.createNewFile();
+            } else {
+                editorConfig.load(new FileInputStream(f));
+            }
+        } catch (IOException e) {
+            EditorLogger.error(e.getMessage());
+        }
+    }
+
+    public void saveConfig() {
+        File f = new File(CONFIG_DIR + "/" + CONFIG_FILENAME);
+
+        try {
+            editorConfig.store(new FileOutputStream(f), null);
+        } catch (IOException e) {
+            EditorLogger.error(e.getMessage());
+        }
+    }
+
+    public Properties getEditorConfig() {
+        return editorConfig;
+    }
+
+    public OrderedProperties getProjectConfig() {
+        return projectConfig;
+    }
+
+    public I18NHandler getI18N() {
+        return i18n;
+    }
+
+    public String translate(String key) {
+        return i18n.getTranslation(key);
+    }
+
+    public void setModified(Object source, String property, Object oldValue, Object newValue) {
+        modified = true;
+        PropertyChangeEvent evt = new PropertyChangeEvent(source, property, oldValue, newValue);
+        firePropertyChange(evt);
+    }
+
+    public void notifyPropertyChange(String property) {
+        firePropertyChange(property);
+    }
+
+    public void setSelectedScene(Scene scn) {
+        selectedScene = scn;
+        selectedActor = null;
+        selectedFA = null;
+
+        if (scn != null)
+            getEditorConfig().setProperty("project.selectedScene", scn.getId());
+
+        firePropertyChange(NOTIFY_SCENE_SELECTED, null, selectedScene);
+    }
+
+    public void setSelectedActor(BaseActor a) {
+        BaseActor old = null;
+
+        old = selectedActor;
+
+        selectedActor = a;
+        selectedFA = null;
+
+        firePropertyChange(NOTIFY_ACTOR_SELECTED, old, selectedActor);
+    }
+
+    public Chapter getChapter() {
+        return chapter;
+    }
+
+    public Scene getSelectedScene() {
+        return selectedScene;
+    }
+
+    public BaseActor getSelectedActor() {
+        return selectedActor;
+    }
+
+    public String getSelectedFA() {
+        return selectedFA;
+    }
+
+    public void setSelectedFA(String id) {
+        String old = selectedFA;
+
+        selectedFA = id;
+
+        firePropertyChange(NOTIFY_ANIM_SELECTED, old, selectedFA);
+    }
+
+    public String getModelPath() {
+        return getAssetPath() + MODEL_PATH;
+    }
+
+    public String getProjectPath() {
+        return projectFile.getAbsolutePath();
+    }
+
+    public File getProjectDir() {
+        return projectFile;
+    }
+
+    public String getTitle() {
+        if (projectConfig == null)
+            return null;
+
+        return projectConfig.getProperty(Config.TITLE_PROP, getProjectDir().getName());
+    }
+
+    public boolean isLoaded() {
+        return Ctx.project.getProjectDir() != null;
+    }
+
+    public String getPackageTitle() {
+        return getTitle().replace(" ", "").replace("'", "");
+    }
+
+    public void createProject(String projectDir, String name, String pkg, String sdkLocation, boolean spinePlugin)
+            throws IOException {
+        closeProject();
+
+        createLibGdxProject(projectDir, name, pkg, "BladeEngine", sdkLocation, spinePlugin);
+
+        projectFile = new File(projectDir + "/" + name);
+
+        loadProject(projectFile);
+    }
+
+    private void createLibGdxProject(String projectDir, String name, String pkg, String mainClass, String sdkLocation,
+                                     boolean spinePlugin) throws IOException {
+        String sdk = null;
+
+        if (sdkLocation != null && !sdkLocation.isEmpty()) {
+            sdk = sdkLocation;
+        } else if (System.getenv("ANDROID_HOME") != null) {
+            sdk = System.getenv("ANDROID_HOME");
+        }
+
+        new BladeEngineSetup().build(projectDir + "/" + name, name, pkg, mainClass, sdk, spinePlugin);
+    }
+
+    public void saveProject() throws IOException {
+        if (projectFile != null && chapter.getId() != null && modified) {
+
+            EngineLogger.setDebug();
+
+            // 1.- SAVE world
+            world.saveWorldDesc(
+                    new FileHandle(new File(getAssetPath() + MODEL_PATH + "/" + EngineAssetManager.WORLD_FILENAME)));
+
+            // 2.- SAVE .chapter
+            chapter.save();
+
+            // 3.- SAVE BladeEngine.properties
+            List<String> resolutions = getResolutions();
+            StringBuilder sb = new StringBuilder();
+
+            for (int i = 0; i < resolutions.size(); i++) {
+                sb.append(resolutions.get(i));
+
+                if (i < resolutions.size() - 1)
+                    sb.append(',');
+            }
+
+            projectConfig.setProperty(Config.RESOLUTIONS, sb.toString());
+            projectConfig.store(new FileOutputStream(getAssetPath() + "/" + Config.PROPERTIES_FILENAME), null);
+
+            // 4.- SAVE I18N
+            i18n.save();
+
+            modified = false;
+            firePropertyChange(NOTIFY_PROJECT_SAVED);
+        }
+    }
+
+    public void closeProject() {
+        setSelectedScene(null);
+        this.projectFile = null;
+        this.projectConfig = null;
+        firePropertyChange(NOTIFY_PROJECT_LOADED);
+    }
+
+    public void loadProject(File projectToLoad) throws IOException {
+
+        projectToLoad = checkProjectStructure(projectToLoad);
+
+        if (projectToLoad != null) {
+            // dispose the current project
+            closeProject();
+
+            this.projectFile = projectToLoad;
+
+            // Use FolderClassLoader for loading CUSTOM actions.
+            // TODO Add 'core/bin' and '/core/out' folders???
+            FolderClassLoader folderClassLoader = null;
+
+            if (new File(projectFile, "/assets").exists()) {
+                folderClassLoader = new FolderClassLoader(
+                        projectFile.getAbsolutePath() + "/core/build/classes/java/main");
+            } else {
+                folderClassLoader = new FolderClassLoader(projectFile.getAbsolutePath() + "/core/build/classes/main");
+            }
+
+            ActionFactory.setActionClassLoader(folderClassLoader);
+            EngineAssetManager.createEditInstance(getAssetPath());
+
+            try {
+                // Clear last project to avoid reloading if the project fails.
+                getEditorConfig().remove(LAST_PROJECT_PROP);
+                saveConfig();
+
+                world.loadWorldDesc();
+            } catch (SerializationException ex) {
+                // check for not compiled custom actions
+                if (ex.getCause() != null && ex.getCause() instanceof ClassNotFoundException) {
+                    EditorLogger.msg("Custom action class not found. Trying to compile...");
+                    if (RunProccess.runGradle(getProjectDir(), "desktop:compileJava")) {
+                        folderClassLoader.reload();
+                        world.loadWorldDesc();
+                    } else {
+                        this.projectFile = null;
+                        throw new IOException("Failed to run Gradle.");
+                    }
+                } else {
+                    this.projectFile = null;
+                    throw ex;
+                }
+            }
+
+            chapter = new Chapter(getAssetPath() + Project.MODEL_PATH);
+            i18n = new I18NHandler(getAssetPath() + Project.MODEL_PATH);
+
+            // No need to load the chapter. It's loaded by the chapter combo.
+            // loadChapter(world.getInitChapter());
+
+            projectConfig = new OrderedPropertiesBuilder().withSuppressDateInComment(true).withOrderingCaseSensitive()
+                    .build();
+            projectConfig.load(new FileInputStream(getAssetPath() + "/" + Config.PROPERTIES_FILENAME));
+            modified = false;
+
+            Lwjgl3Window window = ((Lwjgl3Graphics) Gdx.graphics).getWindow();
+            window.setTitle("Adventure Editor v" + Versions.getVersion() + " - " + projectFile.getAbsolutePath());
+
+            firePropertyChange(NOTIFY_PROJECT_LOADED);
+        } else {
+            closeProject();
+            throw new IOException("Project not found.");
+        }
+    }
+
+    public boolean checkVersion(File projectPath) throws FileNotFoundException, IOException {
+        String editorVersion = getEditorBladeEngineVersion();
+        String projectVersion = getProjectBladeEngineVersion(projectPath);
+
+        if (editorVersion.equals(projectVersion) || editorVersion.indexOf('.') == -1)
+            return true;
+
+        if (parseVersion(editorVersion) <= parseVersion(projectVersion))
+            return true;
+
+        return false;
+    }
+
+    private int parseVersion(String v) {
+        int number = 1; // 1 -> release, 0 -> snapshot
+
+        if (v.endsWith("-SNAPSHOT")) {
+            number = 0;
+            v = v.substring(0, v.length() - "-SNAPSHOT".length());
+        }
+
+        String[] split = v.split("\\.");
+
+        try {
+            for (int i = 0; i < split.length; i++) {
+                number += Math.pow(10, (split.length - i) * 2) * Integer.parseInt(split[i]);
+            }
+        } catch (NumberFormatException e) {
+        }
+
+        return number;
+    }
+
+    public String getProjectBladeEngineVersion(File projectPath) throws FileNotFoundException, IOException {
+        OrderedProperties properties = getGradleProperties(projectPath);
+
+        return properties.getProperty(Config.BLADE_ENGINE_VERSION_PROP, "default");
+    }
+
+    public String getEditorBladeEngineVersion() {
+        return Versions.getVersion();
+    }
+
+    public void updateEngineVersion(File projectPath) throws FileNotFoundException, IOException {
+        OrderedProperties prop = getGradleProperties(projectPath);
+
+        prop.setProperty(Config.BLADE_ENGINE_VERSION_PROP, Versions.getVersion());
+        prop.setProperty("gdxVersion", Versions.getLibgdxVersion());
+        prop.setProperty("roboVMVersion", Versions.getRoboVMVersion());
+
+        prop.setProperty("androidGradlePluginVersion", Versions.getAndroidGradlePluginVersion());
+        prop.setProperty("bladeInkVersion", Versions.getBladeInkVersion());
+
+        saveGradleProperties(prop, projectPath);
+    }
+
+    /**
+     * Checks if the model folder exists in the passed folder or in his parent.
+     *
+     * @return The correct project folder or null if the model folder is not found.
+     */
+    private File checkProjectStructure(File folder) {
+        File projectFolder = folder;
+
+        if (!new File(getAssetPath(projectFolder.getAbsolutePath()) + MODEL_PATH).exists()) {
+            projectFolder = projectFolder.getParentFile();
+
+            if (!new File(getAssetPath(projectFolder.getAbsolutePath()) + MODEL_PATH).exists())
+                return null;
+        }
+
+        return projectFolder;
+    }
+
+    public BaseActor getActor(String id) {
+        return selectedScene.getActor(id, false);
+    }
+
+    public List<String> getResolutions() {
+        File atlasesPath = new File(getAssetPath() + UI_PATH);
+        ArrayList<String> l = new ArrayList<>();
+
+        File[] list = atlasesPath.listFiles();
+
+        if (list == null)
+            return l;
+
+        for (int i = 0; i < list.length; i++) {
+            String name = list[i].getName();
+
+            if (list[i].isDirectory()) {
+                try {
+                    Float.parseFloat(name);
+
+                    l.add(name);
+                } catch (Exception e) {
+
+                }
+            }
+        }
+
+        return l;
+    }
+
+    public String getResDir() {
+        return "1";
+    }
+
+    public void loadChapter(String selChapter) throws IOException {
+        undoStack.clear();
+
+        setSelectedScene(null);
+
+        try {
+            chapter.load(selChapter);
+            firePropertyChange(NOTIFY_CHAPTER_LOADED);
+            getEditorConfig().setProperty(LAST_PROJECT_PROP, projectFile.getAbsolutePath());
+            getEditorConfig().setProperty("project.selectedChapter", selChapter);
+        } catch (SerializationException ex) {
+            // check for not compiled custom actions
+            if (ex.getCause() != null && ex.getCause() instanceof ClassNotFoundException) {
+                EditorLogger.msg("Custom action class not found. Trying to compile...");
+                if (RunProccess.runGradle(getProjectDir(), "desktop:compileJava")) {
+                    ((FolderClassLoader) ActionFactory.getActionClassLoader()).reload();
+                    try {
+                        chapter.load(selChapter);
+                    } catch (SerializationException e) {
+                        throw new IOException("Couldn't load project.");
+                    }
+                } else {
+                    throw new IOException("Failed to run Gradle.");
+                }
+            } else {
+                throw new IOException(ex.getMessage());
+            }
+        }
+
+        i18n.load(selChapter);
+    }
+
+    public boolean isModified() {
+        return modified;
+    }
+
+    public void setModified() {
+        modified = true;
+        firePropertyChange(NOTIFY_MODEL_MODIFIED);
+    }
+
+    public OrderedProperties getGradleProperties(File projectPath) throws FileNotFoundException, IOException {
+        OrderedProperties prop = new OrderedPropertiesBuilder().withSuppressDateInComment(true)
+                .withOrderingCaseSensitive().build();
+
+        prop.load(new FileReader(projectPath.getAbsolutePath() + "/gradle.properties"));
+
+        return prop;
+    }
+
+    public void saveGradleProperties(OrderedProperties prop, File projectPath) throws IOException {
+        FileOutputStream os = new FileOutputStream(projectPath.getAbsolutePath() + "/gradle.properties");
+
+        prop.store(os, null);
+    }
+
+    public void toggleEditorVisibility(BaseActor a) {
+        String name = a.getInitScene() + "." + a.getId();
+
+        if (hiddenActors.contains(name)) {
+            hiddenActors.remove(name);
+        } else {
+            hiddenActors.add(name);
+        }
+    }
+
+    public boolean isEditorVisible(BaseActor a) {
+        String name = a.getInitScene() + "." + a.getId();
+
+        return !hiddenActors.contains(name);
+    }
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/PropertyChange.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/PropertyChange.java
similarity index 95%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/model/PropertyChange.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/model/PropertyChange.java
index 4de281bf8..49da18a2d 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/model/PropertyChange.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/model/PropertyChange.java
@@ -19,7 +19,7 @@
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 
-import com.bladecoder.engineeditor.utils.EditorLogger;
+import com.bladecoder.engineeditor.common.EditorLogger;
 
 
 public class PropertyChange {
@@ -55,7 +55,7 @@ protected void firePropertyChange(String propertyName, Object oldValue,
 	
 	protected void firePropertyChange(PropertyChangeEvent evt) {
 		
-		//EngineLogger.debug(propertyName + "-> NEW: "+ newValue + " OLD:" + oldValue);
+		//EditorLogger.debug(propertyName + "-> NEW: "+ newValue + " OLD:" + oldValue);
 		propertyChangeSupport.firePropertyChange(evt);
 	}
 	
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/ActionVisitor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/ActionVisitor.java
new file mode 100644
index 000000000..b923da9da
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/ActionVisitor.java
@@ -0,0 +1,10 @@
+package com.bladecoder.engineeditor.qa;
+
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.Verb;
+
+public interface ActionVisitor extends Visitor {
+	public void visit(Scene scn, InteractiveActor a, Verb v, Action act);
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/ActorVisitor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/ActorVisitor.java
new file mode 100644
index 000000000..a84e652e0
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/ActorVisitor.java
@@ -0,0 +1,7 @@
+package com.bladecoder.engineeditor.qa;
+
+import com.bladecoder.engine.model.BaseActor;
+
+public interface ActorVisitor extends Visitor {
+	public void visit(BaseActor a);
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/DialogOptionVisitor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/DialogOptionVisitor.java
new file mode 100644
index 000000000..7f346be31
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/DialogOptionVisitor.java
@@ -0,0 +1,9 @@
+package com.bladecoder.engineeditor.qa;
+
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.DialogOption;
+
+public interface DialogOptionVisitor extends Visitor {
+	public void visit(CharacterActor a, Dialog d, DialogOption o);
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/DialogVisitor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/DialogVisitor.java
new file mode 100644
index 000000000..5879035c8
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/DialogVisitor.java
@@ -0,0 +1,8 @@
+package com.bladecoder.engineeditor.qa;
+
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+
+public interface DialogVisitor extends Visitor {
+	public void visit(CharacterActor a, Dialog d);
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/EndVisitor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/EndVisitor.java
new file mode 100644
index 000000000..1b09fb490
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/EndVisitor.java
@@ -0,0 +1,7 @@
+package com.bladecoder.engineeditor.qa;
+
+import com.bladecoder.engine.model.World;
+
+public interface EndVisitor extends Visitor {
+	public void end(World w);
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/ModelWalker.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/ModelWalker.java
new file mode 100644
index 000000000..4e2127f12
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/ModelWalker.java
@@ -0,0 +1,132 @@
+package com.bladecoder.engineeditor.qa;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.DialogOption;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engineeditor.Ctx;
+
+public class ModelWalker {
+
+	private final ArrayList<SceneVisitor> sceneVisitors = new ArrayList<SceneVisitor>();
+	private final ArrayList<EndVisitor> endVisitors = new ArrayList<EndVisitor>();
+	private final ArrayList<StartVisitor> startVisitors = new ArrayList<StartVisitor>();
+	private final ArrayList<ActionVisitor> actionVisitors = new ArrayList<ActionVisitor>();
+	private final ArrayList<VerbVisitor> verbVisitors = new ArrayList<VerbVisitor>();
+	private final ArrayList<ActorVisitor> actorVisitors = new ArrayList<ActorVisitor>();
+	private final ArrayList<DialogVisitor> dialogVisitors = new ArrayList<DialogVisitor>();
+	private final ArrayList<DialogOptionVisitor> optionVisitors = new ArrayList<DialogOptionVisitor>();
+
+	public void addVisitor(Visitor v) {
+		if (v instanceof SceneVisitor)
+			sceneVisitors.add((SceneVisitor) v);
+
+		if (v instanceof EndVisitor)
+			endVisitors.add((EndVisitor) v);
+
+		if (v instanceof StartVisitor)
+			startVisitors.add((StartVisitor) v);
+
+		if (v instanceof ActionVisitor)
+			actionVisitors.add((ActionVisitor) v);
+
+		if (v instanceof VerbVisitor)
+			verbVisitors.add((VerbVisitor) v);
+
+		if (v instanceof ActorVisitor)
+			actorVisitors.add((ActorVisitor) v);
+		
+		if (v instanceof DialogVisitor)
+			dialogVisitors.add((DialogVisitor) v);
+		
+		if (v instanceof DialogOptionVisitor)
+			optionVisitors.add((DialogOptionVisitor) v);
+	}
+
+	public void walk(World w) {
+		Map<String, Scene> scenes = Ctx.project.getWorld().getScenes();
+
+		for (StartVisitor sv : startVisitors)
+			sv.start(w);
+
+		for (Scene scn : scenes.values()) {
+			for (SceneVisitor sv : sceneVisitors)
+				sv.visit(scn);
+
+			Map<String, BaseActor> actors = scn.getActors();
+
+			// SCENE VERBS
+			HashMap<String, Verb> verbs = scn.getVerbManager().getVerbs();
+
+			for (Verb v : verbs.values()) {
+
+				for (VerbVisitor vv : verbVisitors)
+					vv.visit(scn, null, v);
+
+				ArrayList<Action> actions = v.getActions();
+
+				for (Action act : actions) {
+					for (ActionVisitor av : actionVisitors)
+						av.visit(scn, null, v, act);
+				}
+			}
+
+			for (BaseActor a : actors.values()) {
+				for (ActorVisitor av : actorVisitors)
+					av.visit(a);
+
+				if (a instanceof InteractiveActor) {
+					InteractiveActor ia = (InteractiveActor) a;
+
+					// ACTOR VERBS
+					verbs = ia.getVerbManager().getVerbs();
+
+					for (Verb v : verbs.values()) {
+
+						for (VerbVisitor vv : verbVisitors)
+							vv.visit(scn, ia, v);
+
+						ArrayList<Action> actions = v.getActions();
+
+						for (Action act : actions) {
+							for (ActionVisitor av : actionVisitors)
+								av.visit(scn, ia, v, act);
+						}
+					}
+				}
+
+				// DIALOGS
+				if (a instanceof CharacterActor) {
+					HashMap<String, Dialog> dialogs = ((CharacterActor) a).getDialogs();
+
+					if (dialogs != null) {
+						for (Dialog d : dialogs.values()) {
+							
+							for (DialogVisitor dv : dialogVisitors)
+								dv.visit((CharacterActor) a, d);
+							
+							ArrayList<DialogOption> options = d.getOptions();
+
+							for (DialogOption o : options) {
+								for (DialogOptionVisitor ov : optionVisitors)
+									ov.visit((CharacterActor) a, d, o);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		for (EndVisitor ev : endVisitors)
+			ev.end(w);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/QA.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/QA.java
new file mode 100644
index 000000000..4108de16e
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/QA.java
@@ -0,0 +1,20 @@
+package com.bladecoder.engineeditor.qa;
+
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engineeditor.qa.rules.CheckCutmodeEnd;
+import com.bladecoder.engineeditor.qa.rules.CheckDesc;
+import com.bladecoder.engineeditor.qa.rules.CheckInteractionVerbs;
+import com.bladecoder.engineeditor.qa.rules.Stats;
+
+public class QA {
+	public void run(World w) {
+		ModelWalker mw = new ModelWalker();
+		
+		mw.addVisitor(new Stats());
+		mw.addVisitor(new CheckInteractionVerbs());
+		mw.addVisitor(new CheckDesc());
+		mw.addVisitor(new CheckCutmodeEnd());
+		
+		mw.walk(w);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/SceneVisitor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/SceneVisitor.java
new file mode 100644
index 000000000..d650ac87a
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/SceneVisitor.java
@@ -0,0 +1,7 @@
+package com.bladecoder.engineeditor.qa;
+
+import com.bladecoder.engine.model.Scene;
+
+public interface SceneVisitor extends Visitor {
+	public void visit(Scene s);
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/StartVisitor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/StartVisitor.java
new file mode 100644
index 000000000..0650dd8bc
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/StartVisitor.java
@@ -0,0 +1,7 @@
+package com.bladecoder.engineeditor.qa;
+
+import com.bladecoder.engine.model.World;
+
+public interface StartVisitor extends Visitor {
+	public void start(World w);
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/VerbVisitor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/VerbVisitor.java
new file mode 100644
index 000000000..2618aac87
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/VerbVisitor.java
@@ -0,0 +1,9 @@
+package com.bladecoder.engineeditor.qa;
+
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.Verb;
+
+public interface VerbVisitor extends Visitor {
+	public void visit(Scene s, InteractiveActor a, Verb v);
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/Visitor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/Visitor.java
new file mode 100644
index 000000000..546b5686e
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/Visitor.java
@@ -0,0 +1,4 @@
+package com.bladecoder.engineeditor.qa;
+
+public interface Visitor {
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckCutmodeEnd.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckCutmodeEnd.java
new file mode 100644
index 000000000..b472fba5e
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckCutmodeEnd.java
@@ -0,0 +1,56 @@
+package com.bladecoder.engineeditor.qa.rules;
+
+import java.util.ArrayList;
+
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.SetCutmodeAction;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.qa.VerbVisitor;
+
+/**
+ * Checks that cutmode is set to false before ending the verb if it was previously set to true.
+ * @author rgarcia
+ */
+public class CheckCutmodeEnd implements VerbVisitor {
+
+
+	@Override
+	public void visit(Scene s, InteractiveActor a, Verb v) {
+		ArrayList<Action> actions = v.getActions();
+		
+		if(actions.size() > 0) {
+			Action action = actions.get(actions.size() - 1);
+			
+			if (action instanceof SetCutmodeAction) {
+				try {
+					String val = ActionUtils.getStringValue(action, "value");
+					
+					if("true".equals(val)) {	
+						StringBuilder sb = new StringBuilder("CheckCutmodeEnd: Cutmode ends with value=true! - ");
+						
+						if(s != null) {
+							sb.append(s.getId());
+							sb.append(".");
+						}
+						
+						if(a != null) {
+							sb.append(a.getId());
+							sb.append(".");
+						}
+						
+						sb.append(v.getId());						
+						
+						EditorLogger.error(sb.toString());
+					}
+				} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+					
+				}
+			}
+		}
+	}
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckDesc.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckDesc.java
new file mode 100644
index 000000000..8c1bf5e5b
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckDesc.java
@@ -0,0 +1,57 @@
+package com.bladecoder.engineeditor.qa.rules;
+
+import java.util.HashMap;
+
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.qa.ActorVisitor;
+
+/**
+ * Checks that all interactive actors have description.
+ * @author rgarcia
+ *
+ */
+public class CheckDesc implements ActorVisitor {
+
+	private InteractiveActor ia;
+
+	private boolean hasLeave;
+	private boolean hasEnterExit;
+
+	@Override
+	public void visit(BaseActor a) {
+		if (a instanceof InteractiveActor) {
+			ia = (InteractiveActor) a;
+
+			hasLeave = false;
+			hasEnterExit = false;
+
+			if (ia.getInteraction()) {
+				
+				HashMap<String, Verb> verbs = ia.getVerbManager().getVerbs();
+				
+				for(Verb v:verbs.values())
+					checkVerb(v);
+				
+				// TODO: check states and verbs for states.
+
+				if (hasLeave || hasEnterExit)
+					return;
+				
+				if(ia.getDesc() == null || ia.getDesc().trim().isEmpty()) {
+					EditorLogger.error("CheckDesc: " + a.getScene().getId() + "." + a.getId());
+				}
+			}
+		}
+	}
+
+	public void checkVerb(Verb v) {
+		if (v.getId().equals("leave"))
+			hasLeave = true;
+		else if (v.getId().equals("enter") || v.getId().equals("exit"))
+			hasEnterExit = true;
+	}
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckInteractionVerbs.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckInteractionVerbs.java
new file mode 100644
index 000000000..94fcf1421
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/CheckInteractionVerbs.java
@@ -0,0 +1,106 @@
+package com.bladecoder.engineeditor.qa.rules;
+
+import java.util.HashMap;
+
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.model.AtlasRenderer;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.qa.ActorVisitor;
+
+/**
+ * Checks:
+ *   - That inventory actors has the use verb.
+ *   - Interactive actors have lookat and pickup/talkto verbs.
+ *   - SpriteActors have at least one animation.
+ * 
+ * @author rgarcia
+ *
+ */
+public class CheckInteractionVerbs implements ActorVisitor {
+
+	private InteractiveActor ia;
+	private boolean hasLookat;
+	private boolean hasPickup;
+	private boolean hasTalkto;
+	private boolean hasLeave;
+	private boolean hasEnterExit;
+	private boolean hasUse;
+
+	@Override
+	public void visit(BaseActor a) {
+		if (a instanceof InteractiveActor) {
+			ia = (InteractiveActor) a;
+			hasLookat = false;
+			hasPickup = false;
+			hasTalkto = false;
+			hasLeave = false;
+			hasEnterExit = false;
+			hasUse = false;
+
+			if (ia.getInteraction()) {
+				
+				HashMap<String, Verb> verbs = ia.getVerbManager().getVerbs();
+				
+				for(Verb v:verbs.values())
+					checkVerb(v);
+				
+				// TODO: check states and verbs for states.
+
+				if (hasLeave || hasEnterExit)
+					return;
+				
+				// discard inventory actors
+				if(hasLookat) {
+					if(ia instanceof SpriteActor) {
+						SpriteActor sa = (SpriteActor)ia;
+						if(sa.getRenderer() instanceof AtlasRenderer) {
+							AtlasRenderer r = (AtlasRenderer)sa.getRenderer();
+							HashMap<String, AnimationDesc> animations = r.getAnimations();
+							
+							if(animations.size() == 0) {
+								EditorLogger.error("CheckInteractionVerbs: Actor with no animations! - "  + sa.getScene().getId() + "." + sa.getId());
+							}
+														
+							if(animations.get(r.getInitAnimation()).source.contains("inventory")) {
+								if(!hasUse)
+									EditorLogger.msg("CheckInteractionVerbs: Inventory item should has default 'use' - "  + sa.getScene().getId() + "." + sa.getId());
+
+								return;
+							}
+						}
+					}
+				}
+
+				// check for lookat and pickup/talk verbs
+				if (!hasLookat || (!hasPickup && !hasTalkto)) {
+					String msg = "CheckInteractionVerbs: " + a.getScene().getId() + "." + a.getId(); 
+					
+					if(!hasLookat)
+						EditorLogger.error(msg);
+					else
+						EditorLogger.msg(msg);
+				}
+			}
+		}
+	}
+
+	public void checkVerb(Verb v) {
+		if (v.getId().equals("lookat"))
+			hasLookat = true;
+		else if (v.getId().equals("pickup"))
+			hasPickup = true;
+		else if (v.getId().equals("talkto"))
+			hasTalkto = true;
+		else if (v.getId().equals("leave"))
+			hasLeave = true;
+		else if (v.getId().equals("use"))
+			hasUse = true;
+		else if (v.getId().equals("enter") || v.getId().equals("exit"))
+			hasEnterExit = true;
+	}
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/Stats.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/Stats.java
new file mode 100644
index 000000000..bdfc5f091
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/qa/rules/Stats.java
@@ -0,0 +1,23 @@
+package com.bladecoder.engineeditor.qa.rules;
+
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.qa.EndVisitor;
+import com.bladecoder.engineeditor.qa.SceneVisitor;
+
+public class Stats implements SceneVisitor, EndVisitor {
+	
+	int numScenes = 0;
+
+	@Override
+	public void visit(Scene s) {
+		numScenes++;
+	}
+
+	@Override
+	public void end(World w) {
+		EditorLogger.msg("Num Scenes: " + numScenes);
+	}
+	
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/AnimationDrawer.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/AnimationDrawer.java
new file mode 100644
index 000000000..c138b983b
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/AnimationDrawer.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.scneditor;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.utils.Align;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.model.*;
+import com.bladecoder.engine.spine.SpineRenderer;
+import com.bladecoder.engine.util.RectangleRenderer;
+
+/**
+ * Frame Animation renderer.
+ *
+ * @author rgarcia
+ */
+public class AnimationDrawer {
+
+    public static final Color BG_COLOR = Color.MAGENTA;
+    private static final float HEIGHT = 200;
+
+    AnimationDesc currentAnimation;
+    private AnimationRenderer renderer;
+    private float viewportW, viewportH;
+
+    public void setViewport(float w, float h) {
+        viewportW = w;
+        viewportH = h;
+    }
+
+    public void setActor(BaseActor a) {
+        if (renderer != null) {
+            renderer.dispose();
+            renderer = null;
+        }
+
+        if (a instanceof SpriteActor && ((SpriteActor) a).getRenderer() instanceof AnimationRenderer) {
+            ActorRenderer r = ((SpriteActor) a).getRenderer();
+
+            if (r instanceof SpineRenderer) {
+                renderer = new SpineRenderer();
+                ((SpineRenderer) renderer).enableEvents(false);
+                ((SpineRenderer) renderer).setSkin(((SpineRenderer) r).getSkin());
+            } else if (r instanceof ImageRenderer) {
+                renderer = new ImageRenderer();
+            } else if (r instanceof AtlasRenderer) {
+                renderer = new AtlasRenderer();
+            }
+
+            renderer.setOrgAlign(Align.bottom);
+        }
+    }
+
+    public void setAnimation(AnimationDesc fa) {
+        currentAnimation = fa;
+
+        if (renderer != null) {
+
+            renderer.getAnimations().clear();
+
+            if (fa != null) {
+
+                renderer.addAnimation(fa);
+
+                renderer.retrieveAssets();
+
+                renderer.startAnimation(fa.id, Tween.Type.REPEAT, Tween.INFINITY, null);
+            }
+        }
+    }
+
+    public void draw(SpriteBatch batch) {
+        if (renderer != null && currentAnimation != null) {
+
+            float width = HEIGHT / renderer.getHeight() * renderer.getWidth();
+            float height = HEIGHT;
+            float scaleh = width / renderer.getWidth();
+
+            if (renderer.getWidth() > renderer.getHeight()) {
+                scaleh = HEIGHT / renderer.getWidth();
+                width = HEIGHT;
+                height = renderer.getHeight() * scaleh;
+            }
+
+            RectangleRenderer.draw(batch, viewportW - width - 5, viewportH
+                    - height - 55, width + 10, height + 10, Color.BLACK);
+            RectangleRenderer.draw(batch, viewportW - width, viewportH - height
+                    - 50, width, height, BG_COLOR);
+
+            renderer.draw(batch, viewportW - width / 2,
+                    viewportH - height - 50, scaleh, scaleh, 0f, null);
+
+        }
+    }
+
+    public void update(float delta) {
+        if (renderer != null && currentAnimation != null) {
+            try {
+                renderer.update(delta);
+            } catch (Exception e) {
+
+            }
+        }
+    }
+
+    public void dispose() {
+        if (renderer != null)
+            renderer.dispose();
+    }
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/AnimationWidget.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/AnimationWidget.java
new file mode 100644
index 000000000..27bfa4874
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/AnimationWidget.java
@@ -0,0 +1,146 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.scneditor;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.scenes.scene2d.ui.Widget;
+import com.badlogic.gdx.utils.Align;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.anim.AtlasAnimationDesc;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.ActorRenderer;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.AtlasRenderer;
+import com.bladecoder.engine.model.ImageRenderer;
+import com.bladecoder.engine.spine.SpineRenderer;
+import com.bladecoder.engine.util.RectangleRenderer;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.EditAnimationDialog;
+
+public class AnimationWidget extends Widget {
+    private AnimationDesc fa;
+    private ActorRenderer renderer;
+    EditAnimationDialog editFADialog;
+
+    public AnimationWidget(EditAnimationDialog createEditFADialog) {
+        this.editFADialog = createEditFADialog;
+    }
+
+    public void setSource(String type, AnimationDesc anim) {
+        fa = anim;
+
+        if (renderer != null) {
+            renderer.dispose();
+            renderer = null;
+        }
+
+        if (type.equals(Project.SPINE_RENDERER_STRING)) {
+            renderer = new SpineRenderer();
+            ((SpineRenderer) renderer).enableEvents(false);
+        } else if (type.equals(Project.IMAGE_RENDERER_STRING)) {
+            renderer = new ImageRenderer();
+        } else {
+            renderer = new AtlasRenderer();
+        }
+
+        renderer.setOrgAlign(Align.bottom);
+
+        try {
+            renderer.loadAssets();
+            EngineAssetManager.getInstance().finishLoading();
+            renderer.retrieveAssets();
+        } catch (Exception e) {
+            EditorLogger.error("Error loading asset: " + e.getMessage());
+        }
+    }
+
+    public String[] getAnimations() {
+        try {
+            return ((AnimationRenderer) renderer).getInternalAnimations(fa);
+        } catch (Exception e) {
+            // Message.show(getStage(),
+            // "Error loading animations from selected source", 4);
+            EditorLogger.error("Error loading animations from selected source:" + fa.source + ": " + e.getMessage());
+            return new String[0];
+        }
+
+    }
+
+    public void setAnimation(String id, String speedStr, Tween.Type t) {
+
+        if (fa != null && id != null && !id.isEmpty()) {
+
+            if (fa instanceof AtlasAnimationDesc)
+                ((AtlasAnimationDesc) fa).regions = null;
+
+            Tween.Type type = Tween.Type.REPEAT;
+            float speed = 2.0f;
+
+            if (speedStr != null && !speedStr.isEmpty()) {
+                try {
+                    speed = Float.parseFloat(speedStr);
+                } catch (NumberFormatException e) {
+                    speed = 0;
+                }
+            }
+
+            if (t == Tween.Type.YOYO)
+                type = Tween.Type.YOYO;
+            else if (t == Tween.Type.REVERSE)
+                type = Tween.Type.REVERSE_REPEAT;
+
+            fa.id = id;
+            fa.duration = speed;
+            fa.animationType = type;
+            fa.count = -1;
+
+            ((AnimationRenderer) renderer).getAnimations().clear();
+
+            ((AnimationRenderer) renderer).addAnimation(fa);
+            ((AnimationRenderer) renderer).startAnimation(fa.id, Tween.Type.SPRITE_DEFINED, 1, null);
+        }
+    }
+
+    @Override
+    public void draw(Batch batch, float parentAlpha) {
+        super.draw(batch, parentAlpha);
+
+        if (renderer == null || ((AnimationRenderer) renderer).getCurrentAnimation() == null)
+            return;
+
+        float tmp = batch.getPackedColor();
+        batch.setColor(Color.WHITE);
+
+        renderer.update(Gdx.graphics.getDeltaTime());
+
+        RectangleRenderer.draw(batch, getX(), getY(), getWidth(), getHeight(), Color.MAGENTA);
+
+        float scalew = getWidth() / renderer.getWidth();
+        float scaleh = getHeight() / renderer.getHeight();
+        float scale = scalew > scaleh ? scaleh : scalew;
+        renderer.draw((SpriteBatch) batch, getX() + renderer.getWidth() * scale / 2, getY(), scale, scale, 0f, null);
+        batch.setPackedColor(tmp);
+    }
+
+    public void dispose() {
+        renderer.dispose();
+    }
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/CanvasDrawer.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/CanvasDrawer.java
similarity index 51%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/CanvasDrawer.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/CanvasDrawer.java
index 86d365c35..32e7ddb26 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/scneditor/CanvasDrawer.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/CanvasDrawer.java
@@ -20,54 +20,83 @@
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
 import com.badlogic.gdx.math.Matrix4;
 import com.badlogic.gdx.math.Polygon;
 import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.model.AnchorActor;
 import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.ObstacleActor;
 import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.model.SceneCamera;
 import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.pathfinder.NavNode;
+import com.bladecoder.engine.model.WalkZoneActor;
 import com.bladecoder.engine.polygonalpathfinder.NavNodePolygonal;
-import com.bladecoder.engine.util.EngineLogger;
 import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
 
 public class CanvasDrawer {
 	public static final float CORNER_DIST = 20;
 
-	private static final Color MOUSESELECTION_FILL_COLOR = new Color(0.2f,
-			0.2f, 0.8f, 0.4f);
-	private static final Color MOUSESELECTION_STROKE_COLOR = new Color(0.2f,
-			0.2f, 0.8f, 1f);
+	private static final Color MOUSESELECTION_FILL_COLOR = new Color(0.2f, 0.2f, 0.8f, 0.4f);
+	private static final Color MOUSESELECTION_STROKE_COLOR = new Color(0.2f, 0.2f, 0.8f, 1f);
 
 	private final ShapeRenderer drawer = new ShapeRenderer();
-	private SceneCamera camera;
+	private OrthographicCamera camera;
 
 	public CanvasDrawer() {
 	}
 
-	public void setCamera(SceneCamera camera) {
+	public void setCamera(OrthographicCamera camera) {
 		this.camera = camera;
 	}
 
-	public void drawBBoxActors(Scene scn) {
+	public void drawBBoxActors(Scene scn, boolean showSpriteBounds) {
 		drawer.setProjectionMatrix(camera.combined);
 		drawer.setTransformMatrix(new Matrix4());
 		drawer.begin(ShapeType.Line);
-		drawer.setColor(Scene.ACTOR_BBOX_COLOR);
 
 		for (BaseActor a : scn.getActors().values()) {
+
+			if (!Ctx.project.isEditorVisible(a))
+				continue;
+
 			Polygon p = a.getBBox();
 
 			if (p == null) {
-				EngineLogger.error("ERROR DRAWING BBOX FOR: " + a.getId());
+				EditorLogger.error("ERROR DRAWING BBOX FOR: " + a.getId());
 			}
 
 			// Rectangle r = a.getBBox().getBoundingRectangle();
 
-			drawer.polygon(p.getTransformedVertices());
+			if (a instanceof ObstacleActor) {
+				drawer.setColor(Scene.OBSTACLE_COLOR);
+				drawer.polygon(p.getTransformedVertices());
+			} else if (a instanceof InteractiveActor) {
+				InteractiveActor iActor = (InteractiveActor) a;
+
+				if (a instanceof SpriteActor && !showSpriteBounds)
+					continue;
+
+				if (!scn.getLayer(iActor.getLayer()).isVisible())
+					continue;
+
+				drawer.setColor(Scene.ACTOR_BBOX_COLOR);
+				if (p.getTransformedVertices().length > 2)
+					drawer.polygon(p.getTransformedVertices());
+			} else if (a instanceof WalkZoneActor) {
+				drawer.setColor(Scene.WALKZONE_COLOR);
+				if (p.getTransformedVertices().length > 2)
+					drawer.polygon(p.getTransformedVertices());
+			} else if (a instanceof AnchorActor) {
+				drawer.setColor(Scene.ANCHOR_COLOR);
+				drawer.line(p.getX() - Scene.ANCHOR_RADIUS, p.getY(), p.getX() + Scene.ANCHOR_RADIUS, p.getY());
+				drawer.line(p.getX(), p.getY() - Scene.ANCHOR_RADIUS, p.getX(), p.getY() + Scene.ANCHOR_RADIUS);
+			}
+
 			// drawer.rect(r.getX(), r.getY(), r.getWidth(), r.getHeight());
 		}
 
@@ -80,28 +109,17 @@ public void drawBBoxWalkZone(Scene scn, boolean lineOfSight) {
 			drawer.setProjectionMatrix(camera.combined);
 			drawer.setTransformMatrix(new Matrix4());
 			drawer.begin(ShapeType.Line);
-			
-			drawer.setColor(Scene.WALKZONE_COLOR);
-			drawer.polygon(scn.getPolygonalNavGraph().getWalkZone()
-					.getTransformedVertices());
-
-			ArrayList<Polygon> obstacles = scn.getPolygonalNavGraph()
-					.getObstacles();
 
-			drawer.setColor(Scene.OBSTACLE_COLOR);
-			for (Polygon p : obstacles) {
-				drawer.polygon(p.getTransformedVertices());
-			}
+			drawer.setColor(Scene.WALKZONE_COLOR);
+			drawer.polygon(scn.getPolygonalNavGraph().getWalkZone().getTransformedVertices());
 
 			// DRAW LINEs OF SIGHT
 			if (lineOfSight) {
 				drawer.setColor(Color.WHITE);
-				ArrayList<NavNodePolygonal> nodes = scn.getPolygonalNavGraph()
-						.getGraphNodes();
+				ArrayList<NavNodePolygonal> nodes = scn.getPolygonalNavGraph().getGraphNodes();
 				for (NavNodePolygonal n : nodes) {
-					for (NavNode n2 : n.neighbors) {
-						drawer.line(n.x, n.y, ((NavNodePolygonal) n2).x,
-								((NavNodePolygonal) n2).y);
+					for (NavNodePolygonal n2 : n.neighbors) {
+						drawer.line(n.x, n.y, n2.x, n2.y);
 					}
 				}
 			}
@@ -114,29 +132,50 @@ public void drawSelectedActor(BaseActor selectedActor) {
 		Gdx.gl20.glEnable(GL20.GL_BLEND);
 		// Gdx.gl20.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA);
 
-		Rectangle rect = selectedActor.getBBox().getBoundingRectangle();
 		drawer.setProjectionMatrix(camera.combined);
-		drawer.setTransformMatrix(new Matrix4());
+		// drawer.setTransformMatrix(new Matrix4());
 
-		drawer.begin(ShapeRenderer.ShapeType.Filled);
-		drawer.setColor(MOUSESELECTION_FILL_COLOR);
-		drawer.rect(rect.x, rect.y, rect.width, rect.height);
-		drawer.end();
+		if (selectedActor instanceof AnchorActor) {
+			drawer.begin(ShapeRenderer.ShapeType.Line);
+			drawer.setColor(MOUSESELECTION_STROKE_COLOR);
+			drawer.rect(selectedActor.getX() - Scene.ANCHOR_RADIUS, selectedActor.getY() - Scene.ANCHOR_RADIUS,
+					Scene.ANCHOR_RADIUS * 2, Scene.ANCHOR_RADIUS * 2);
+			drawer.end();
+		} else {
 
-		drawer.begin(ShapeRenderer.ShapeType.Line);
-		drawer.setColor(MOUSESELECTION_STROKE_COLOR);
-		drawer.rect(rect.x, rect.y, rect.width, rect.height);
-
-		// DRAW SELECTION BOUNDS
-		if (!(selectedActor instanceof SpriteActor)
-				|| !((SpriteActor) selectedActor).isBboxFromRenderer()) {
-			float verts[] = selectedActor.getBBox().getTransformedVertices();
-			for (int i = 0; i < verts.length; i += 2)
-				drawer.rect(verts[i] - CORNER_DIST / 2, verts[i + 1]
-						- CORNER_DIST / 2, CORNER_DIST, CORNER_DIST);
+			Polygon p = selectedActor.getBBox();
+
+			Rectangle rect = p.getBoundingRectangle();
+
+			drawer.begin(ShapeRenderer.ShapeType.Filled);
+			drawer.setColor(MOUSESELECTION_FILL_COLOR);
+			drawer.rect(rect.x, rect.y, rect.width, rect.height);
+			drawer.end();
+
+			drawer.begin(ShapeRenderer.ShapeType.Line);
+			drawer.setColor(MOUSESELECTION_STROKE_COLOR);
+			drawer.rect(rect.x, rect.y, rect.width, rect.height);
+
+			// DRAW SELECTION BOUNDS
+			if ((!(selectedActor instanceof SpriteActor) || !((SpriteActor) selectedActor).isBboxFromRenderer())
+					&& !(selectedActor instanceof AnchorActor)) {
+				float verts[] = selectedActor.getBBox().getTransformedVertices();
+				for (int i = 0; i < verts.length; i += 2)
+					drawer.rect(verts[i] - CORNER_DIST / 2, verts[i + 1] - CORNER_DIST / 2, CORNER_DIST, CORNER_DIST);
+			}
+
+			// DRAW REFPOINT
+			if (selectedActor instanceof InteractiveActor) {
+				Vector2 refPoint = ((InteractiveActor) selectedActor).getRefPoint();
+				float orgX = selectedActor.getX() + refPoint.x;
+				float orgY = selectedActor.getY() + refPoint.y;
+				drawer.line(orgX - Scene.ANCHOR_RADIUS, orgY, orgX + Scene.ANCHOR_RADIUS, orgY);
+				drawer.line(orgX, orgY - Scene.ANCHOR_RADIUS, orgX, orgY + Scene.ANCHOR_RADIUS);
+			}
+
+			drawer.end();
 		}
 
-		drawer.end();
 	}
 
 	public void drawBGBounds() {
@@ -148,8 +187,7 @@ public void drawBGBounds() {
 
 		drawer.begin(ShapeRenderer.ShapeType.Line);
 		drawer.setColor(Color.MAGENTA);
-		drawer.rect(0, 0, Ctx.project.getWorld().getWidth(), Ctx.project
-				.getWorld().getHeight());
+		drawer.rect(0, 0, Ctx.project.getWorld().getWidth(), Ctx.project.getWorld().getHeight());
 		drawer.end();
 	}
 
@@ -163,8 +201,7 @@ public void drawPolygonVertices(Polygon p, Color c) {
 		drawer.setColor(c);
 
 		for (int i = 0; i < verts.length; i += 2)
-			drawer.rect(verts[i] - CORNER_DIST / 2, verts[i + 1] - CORNER_DIST
-					/ 2, CORNER_DIST, CORNER_DIST);
+			drawer.rect(verts[i] - CORNER_DIST / 2, verts[i + 1] - CORNER_DIST / 2, CORNER_DIST, CORNER_DIST);
 
 		drawer.end();
 	}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ScnEditor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ScnEditor.java
new file mode 100644
index 000000000..724e75cfe
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ScnEditor.java
@@ -0,0 +1,180 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.scneditor;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.ButtonGroup;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.bladecoder.engine.util.Config;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.common.RunProccess;
+import com.bladecoder.engineeditor.model.Project;
+
+public class ScnEditor extends Table {
+
+	private ScnWidget scnWidget;
+	private TextButton testButton;
+
+	private ButtonGroup<Button> buttonGroup;
+
+	private TextButton toolsButton;
+	private TextButton viewButton;
+
+	private ToolsWindow toolsWindow;
+	private ViewWindow viewWindow;
+
+	public ScnEditor(Skin skin) {
+		super(skin);
+
+		scnWidget = new ScnWidget(skin);
+		testButton = new TextButton("Test", skin, "no-toggled");
+
+		buttonGroup = new ButtonGroup<Button>();
+		buttonGroup.setMaxCheckCount(1);
+		buttonGroup.setMinCheckCount(0);
+		buttonGroup.setUncheckLast(true);
+
+		toolsButton = new TextButton("Tools", skin);
+		viewButton = new TextButton("View", skin);
+
+		buttonGroup.add(toolsButton);
+		buttonGroup.add(viewButton);
+
+		viewWindow = new ViewWindow(skin, scnWidget);
+		toolsWindow = new ToolsWindow(skin, scnWidget);
+
+		add(scnWidget).expand().fill();
+		row();
+
+		Table bottomTable = new Table(skin);
+
+		Drawable drawable = skin.getDrawable("background");
+		bottomTable.setBackground(drawable);
+
+		bottomTable.left();
+		add(bottomTable).fill();
+
+		bottomTable.add(viewButton);
+		bottomTable.add(toolsButton);
+		bottomTable.add(testButton);
+
+		toolsButton.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
+				if (toolsButton.isChecked()) {
+					scnWidget.getParent().addActor(toolsWindow);
+					toolsWindow.setPosition(getScnWidget().getX() + 5, getScnWidget().getY() + 5);
+					toolsWindow.invalidate();
+				} else {
+					scnWidget.getParent().removeActor(toolsWindow);
+				}
+			}
+		});
+
+		viewButton.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
+				if (viewButton.isChecked()) {
+					scnWidget.getParent().addActor(viewWindow);
+					viewWindow.setPosition(getScnWidget().getX() + 5, getScnWidget().getY() + 5);
+					viewWindow.invalidate();
+				} else {
+					scnWidget.getParent().removeActor(viewWindow);
+				}
+			}
+		});
+
+		testButton.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
+				test();
+			}
+		});
+
+		Ctx.project.addPropertyChangeListener(new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent e) {
+				EditorLogger.debug("ScnWidget Listener: " + e.getPropertyName());
+
+				if (e.getPropertyName().equals(Project.NOTIFY_SCENE_SELECTED)) {
+					if (Ctx.project.getSelectedScene() == null)
+						return;
+				}
+			}
+		});
+	}
+
+	public ScnWidget getScnWidget() {
+		return scnWidget;
+	}
+
+	private void test() {
+
+		if (Ctx.project.getSelectedScene() == null) {
+			String msg = "There are no scenes in this chapter.";
+			Message.showMsg(getStage(), msg, 3);
+			return;
+		}
+
+		Ctx.project.getProjectConfig().removeProperty(Config.CHAPTER_PROP);
+		Ctx.project.getProjectConfig().removeProperty(Config.TEST_SCENE_PROP);
+
+		try {
+			Ctx.project.saveProject();
+		} catch (Exception ex) {
+			String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName() + " - "
+					+ ex.getMessage();
+			Message.showMsgDialog(getStage(), "Error", msg);
+			return;
+		}
+
+		new Thread(new Runnable() {
+			Stage stage = getStage();
+
+			@Override
+			public void run() {
+				Message.showMsg(stage, "Running scene...", 5);
+
+				try {
+					if (!RunProccess.runBladeEngine(Ctx.project.getProjectDir(), Ctx.project.getChapter().getId(),
+							Ctx.project.getSelectedScene().getId(), Boolean.parseBoolean(
+									Ctx.project.getEditorConfig().getProperty("view.fullscreenPlay", "false"))))
+						Message.showMsg(stage, "There was a problem running the scene", 4);
+				} catch (IOException e) {
+					Message.showMsgDialog(stage, "Error", "There was a problem running the scene: " + e.getMessage());
+				}
+
+			}
+		}).start();
+
+	}
+
+	public void dispose() {
+		scnWidget.dispose();
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidget.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidget.java
new file mode 100644
index 000000000..b9d5b7a92
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidget.java
@@ -0,0 +1,787 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.scneditor;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.text.MessageFormat;
+import java.util.List;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.graphics.glutils.HdpiUtils;
+import com.badlogic.gdx.math.Polygon;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Widget;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack;
+import com.badlogic.gdx.scenes.scene2d.utils.TiledDrawable;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.AnchorActor;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SceneLayer;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.spine.SpineRenderer;
+import com.bladecoder.engine.util.RectangleRenderer;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.scneditor.ScnWidgetInputListener.DraggingModes;
+
+public class ScnWidget extends Widget {
+	private static final Color BLACK_TRANSPARENT = new Color(0f, 0f, 0f, 0.5f);
+
+	// TMPs to avoid GC calls
+	private final Vector3 tmpV3 = new Vector3();
+	private final Vector2 tmpV2 = new Vector2();
+	private final Vector2 tmp2V2 = new Vector2();
+	private final Vector3 tmpV3Draw = new Vector3();
+	private final Vector2 tmpV2Transform = new Vector2();
+
+	private final SpriteBatch sceneBatch = new SpriteBatch();
+	private final CanvasDrawer drawer = new CanvasDrawer();
+	private final AnimationDrawer faRenderer = new AnimationDrawer();
+	private final ScnWidgetInputListener inputListner = new ScnWidgetInputListener(this);
+
+	private final Rectangle bounds = new Rectangle();
+	private final Rectangle scissors = new Rectangle();
+
+	private Scene scn;
+	private BaseActor selectedActor = null;
+	private boolean inScene = false;
+	private boolean animation = true;
+
+	private static final int[] zoomLevels = { 5, 10, 16, 25, 33, 50, 66, 100, 150, 200, 300, 400, 600, 800, 1000 };
+	private int zoomLevel = 100;
+
+	private BitmapFont bigFont;
+	private BitmapFont defaultFont;
+	private TiledDrawable tile;
+	private Drawable background;
+
+	private boolean loading = false;
+	private boolean loadingError = false;
+
+	private boolean showSpriteBounds = true;
+
+	private final GlyphLayout textLayout = new GlyphLayout();
+
+	private final OrthographicCamera camera = new OrthographicCamera();
+
+	private final TextureRegion scnMoveIcon;
+	private final TextureRegion scnRotateIcon;
+	private final TextureRegion scnScaleLockIcon;
+	private final TextureRegion scnScaleIcon;
+
+	/**
+	 * The NOTIFY_PROJECT_LOADED listener is called from other thread. This flag is
+	 * to recreate the scene in the OpenGL thread.
+	 */
+	private boolean projectLoadedFlag = false;
+
+	public ScnWidget(Skin skin) {
+		bigFont = skin.get("big-font", BitmapFont.class);
+		defaultFont = skin.get("default-font", BitmapFont.class);
+
+		setSize(150, 150);
+
+		tile = new TiledDrawable(Ctx.assetManager.getIcon("transparent-light"));
+		background = skin.getDrawable("background");
+
+		faRenderer.setViewport(getWidth(), getHeight());
+
+		setLayoutEnabled(true);
+
+		addListener(inputListner);
+
+		Ctx.project.addPropertyChangeListener(new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent e) {
+				EditorLogger.debug("ScnWidget Listener: " + e.getPropertyName());
+
+				if (e.getPropertyName().equals(Project.NOTIFY_SCENE_SELECTED)) {
+					if (!projectLoadedFlag)
+						setSelectedScene(Ctx.project.getSelectedScene());
+				} else if (e.getPropertyName().equals(Project.NOTIFY_ACTOR_SELECTED)) {
+					if (!projectLoadedFlag)
+						setSelectedActor(Ctx.project.getSelectedActor());
+				} else if (e.getPropertyName().equals(Project.NOTIFY_ANIM_SELECTED)) {
+					if (!projectLoadedFlag && Ctx.project.getSelectedFA() != null)
+						setSelectedFA(Ctx.project.getSelectedFA());
+				} else if (e.getPropertyName().equals(Project.NOTIFY_PROJECT_LOADED)) {
+					projectLoadedFlag = true;
+				} else if (e.getPropertyName().equals("scene")) {
+					setSelectedScene(Ctx.project.getSelectedScene());
+					setSelectedActor(Ctx.project.getSelectedActor());
+				} else if (e.getPropertyName().equals("init_animation")) {
+					if (!inScene)
+						setSelectedFA(null);
+				}
+			}
+		});
+
+		showSpriteBounds = Boolean
+				.parseBoolean(Ctx.project.getEditorConfig().getProperty("view.showSpriteBounds", "true"));
+		inScene = Boolean.parseBoolean(Ctx.project.getEditorConfig().getProperty("view.inScene", "false"));
+		animation = Boolean.parseBoolean(Ctx.project.getEditorConfig().getProperty("view.animation", "true"));
+
+		scnMoveIcon = Ctx.assetManager.getIcon("scn_move");
+		scnRotateIcon = Ctx.assetManager.getIcon("scn_rotate");
+		scnScaleLockIcon = Ctx.assetManager.getIcon("scn_scale_lock");
+		scnScaleIcon = Ctx.assetManager.getIcon("scn_scale");
+	}
+
+	public OrthographicCamera getCamera() {
+		return camera;
+	}
+
+	@Override
+	public void act(float delta) {
+		if (projectLoadedFlag) {
+			projectLoadedFlag = false;
+
+			if (scn != null) {
+				scn.dispose();
+				scn = null;
+			}
+
+			setSelectedScene(Ctx.project.getSelectedScene());
+			setSelectedActor(Ctx.project.getSelectedActor());
+			setSelectedFA(Ctx.project.getSelectedFA());
+		}
+
+		if (scn != null && !loading && !loadingError) {
+			if (!inScene)
+				faRenderer.update(delta);
+			// scn.update(delta);
+
+			for (SceneLayer layer : scn.getLayers())
+				layer.update();
+
+			if (animation) {
+				for (BaseActor a : scn.getActors().values()) {
+					boolean v = a.isVisible();
+					a.setVisible(true);
+					a.update(delta);
+					a.setVisible(v);
+				}
+			}
+
+			handleKeyPositioning();
+		}
+	}
+
+	private void handleKeyPositioning() {
+
+		if (getStage() == null || getStage().getKeyboardFocus() != this)
+			return;
+
+		if (Gdx.input.isKeyPressed(Keys.UP) || Gdx.input.isKeyPressed(Keys.DOWN) || Gdx.input.isKeyPressed(Keys.LEFT)
+				|| Gdx.input.isKeyPressed(Keys.RIGHT)) {
+
+			BaseActor selActor = getSelectedActor();
+
+			if (selActor == null)
+				return;
+
+			if (Gdx.input.isKeyPressed(Keys.UP))
+				// p.translate(0, 1);
+				selActor.setPosition(selActor.getX(), selActor.getY() + 1);
+			else if (Gdx.input.isKeyPressed(Keys.DOWN))
+				// p.translate(0, -1);
+				selActor.setPosition(selActor.getX(), selActor.getY() - 1);
+			else if (Gdx.input.isKeyPressed(Keys.LEFT))
+				// p.translate(-1, 0);
+				selActor.setPosition(selActor.getX() - 1, selActor.getY());
+			else if (Gdx.input.isKeyPressed(Keys.RIGHT))
+				// p.translate(1, 0);
+				selActor.setPosition(selActor.getX() + 1, selActor.getY());
+		}
+	}
+
+	@Override
+	public void draw(Batch batch, float parentAlpha) {
+		validate();
+
+		float tmp = batch.getPackedColor();
+		batch.setColor(Color.WHITE);
+
+		if (scn != null && !loading && !loadingError) {
+			// BACKGROUND
+			batch.disableBlending();
+			tile.draw(batch, getX(), getY(), getWidth(), getHeight());
+			batch.enableBlending();
+
+			Vector3 v = tmpV3Draw.set(getX(), getY(), 0);
+			v = v.prj(batch.getTransformMatrix());
+
+			if(batch.isDrawing())
+				batch.end();
+
+			HdpiUtils.glViewport((int) v.x, (int) v.y, (int) getWidth(), (int) (getHeight()));
+
+			getStage().calculateScissors(bounds, scissors);
+
+			if (ScissorStack.pushScissors(scissors)) {
+				// WORLD CAMERA
+				sceneBatch.setProjectionMatrix(camera.combined);
+				sceneBatch.begin();
+
+				Array<AtlasRegion> scnBackground = scn.getBackground();
+
+				if (scnBackground != null) {
+					sceneBatch.disableBlending();
+
+					float x = 0;
+
+					for (AtlasRegion tile : scnBackground) {
+						sceneBatch.draw(tile, x, 0f);
+						x += tile.getRegionWidth();
+					}
+
+					sceneBatch.enableBlending();
+				}
+
+				// draw layers from bottom to top
+				List<SceneLayer> layers = scn.getLayers();
+				for (int i = layers.size() - 1; i >= 0; i--) {
+					SceneLayer layer = layers.get(i);
+
+					if (!layer.isVisible())
+						continue;
+
+					List<InteractiveActor> actors = layer.getActors();
+
+					for (InteractiveActor a : actors) {
+						if (a instanceof SpriteActor && Ctx.project.isEditorVisible(a)) {
+							boolean visibility = a.isVisible();
+							a.setVisible(true);
+							((SpriteActor) a).draw(sceneBatch);
+							a.setVisible(visibility);
+						}
+					}
+				}
+
+				sceneBatch.end();
+				ScissorStack.popScissors();
+			}
+
+			drawer.drawBGBounds();
+			drawer.drawBBoxActors(scn, showSpriteBounds);
+
+			if (selectedActor != null) {
+				drawer.drawSelectedActor(selectedActor);
+			}
+
+			getStage().getViewport().apply();
+
+			// SCREEN CAMERA
+			batch.begin();
+
+			drawFakeDepthMarkers((SpriteBatch) batch);
+
+			if (!inScene) {
+				faRenderer.draw((SpriteBatch) batch);
+			}
+
+			// DRAW selected actor ICONS
+			if (selectedActor != null) {
+				drawTransformIcons((SpriteBatch) batch, selectedActor);
+			}
+
+			// DRAW COORDS
+			Vector2 coords = tmpV2Transform.set(Gdx.input.getX(), Gdx.input.getY());
+			screenToWorldCoords(coords);
+			String str = MessageFormat.format("({0}, {1})", (int) coords.x, (int) coords.y);
+
+			textLayout.setText(defaultFont, str);
+
+			RectangleRenderer.draw(batch, 0f, getY() + getHeight() - textLayout.height - 15, textLayout.width + 10,
+					textLayout.height + 10, BLACK_TRANSPARENT);
+			defaultFont.draw(batch, textLayout, 5, getHeight() + getY() - 10);
+
+			batch.setPackedColor(tmp);
+
+		} else {
+			background.draw(batch, getX(), getY(), getWidth(), getHeight());
+
+			String s;
+
+			if (loading) {
+				s = "LOADING...";
+
+				Timer.post(new Task() {
+					@Override
+					public void run() {
+						loading = false;
+
+						try {
+
+							EngineAssetManager.getInstance().finishLoading();
+
+							scn.retrieveAssets();
+
+							// disable Spine events
+							for (BaseActor a : scn.getActors().values()) {
+								if (a instanceof SpriteActor
+										&& ((SpriteActor) a).getRenderer() instanceof SpineRenderer) {
+									((SpineRenderer) ((SpriteActor) a).getRenderer()).enableEvents(false);
+								}
+							}
+
+							drawer.setCamera(camera);
+
+							invalidate();
+						} catch (Exception e) {
+							Message.showMsg(getStage(), "Could not load assets for scene", 4);
+							EditorLogger.printStackTrace(e);
+							loadingError = true;
+							loading = false;
+						}
+					}
+				});
+
+			} else if (loadingError) {
+				s = "ERROR IN SCENE DATA. CANNOT DISPLAY SCENE";
+			} else if (!Ctx.project.isLoaded()) {
+				s = "CREATE OR LOAD A PROJECT";
+			} else {
+				s = "THERE ARE NO SCENES IN THIS CHAPTER YET";
+			}
+
+			textLayout.setText(bigFont, s);
+
+			bigFont.draw(batch, textLayout, (getWidth() - textLayout.width) / 2,
+					getHeight() / 2 + bigFont.getLineHeight() * 3);
+
+		}
+
+	}
+
+	private void drawTransformIcons(SpriteBatch batch, BaseActor a) {
+		Polygon p = a.getBBox();
+
+		if (!(a instanceof AnchorActor)) {
+
+			if (a instanceof InteractiveActor) {
+				InteractiveActor ia = (InteractiveActor) a;
+
+				if (!scn.getLayer(ia.getLayer()).isVisible())
+					return;
+			}
+
+			Rectangle r = p.getBoundingRectangle();
+
+			worldToScreenCoords(tmpV2Transform.set(r.x, r.y));
+
+			float x = tmpV2Transform.x;
+			float y = tmpV2Transform.y;
+
+			worldToScreenCoords(tmpV2Transform.set(r.x + r.width, r.y + r.height));
+
+			float x2 = tmpV2Transform.x;
+			float y2 = tmpV2Transform.y;
+
+			batch.draw(scnMoveIcon, x + (x2 - x - scnMoveIcon.getRegionWidth()) / 2, y2);
+
+			if (a instanceof SpriteActor) {
+				batch.draw(scnRotateIcon, x2 - scnRotateIcon.getRegionWidth() / 3,
+						y2 - scnRotateIcon.getRegionHeight() / 3);
+
+				if (!((SpriteActor) a).getFakeDepth()) {
+					batch.draw(scnScaleLockIcon, x - scnScaleLockIcon.getRegionWidth(), y2);
+					batch.draw(scnScaleIcon, x - scnScaleIcon.getRegionWidth(), y - scnScaleIcon.getRegionHeight());
+				}
+			}
+		}
+	}
+
+	public boolean inTransformIcon(float px, float py, DraggingModes dm) {
+		Polygon p = selectedActor.getBBox();
+
+		Rectangle r = p.getBoundingRectangle();
+
+		worldToScreenCoords(tmpV2Transform.set(r.x, r.y));
+
+		float x = tmpV2Transform.x;
+		float y = tmpV2Transform.y;
+
+		worldToScreenCoords(tmpV2Transform.set(r.x + r.width, r.y + r.height));
+
+		float x2 = tmpV2Transform.x;
+		float y2 = tmpV2Transform.y;
+
+		Rectangle r2 = null;
+
+		if (dm == DraggingModes.ROTATE_ACTOR) {
+			r2 = new Rectangle(x2 - scnRotateIcon.getRegionWidth() / 3, y2 - scnRotateIcon.getRegionHeight() / 3,
+					scnRotateIcon.getRegionWidth(), scnRotateIcon.getRegionHeight());
+		} else if (dm == DraggingModes.SCALE_ACTOR) {
+			r2 = new Rectangle(x - scnScaleIcon.getRegionWidth(), y - scnScaleIcon.getRegionHeight(),
+					scnScaleIcon.getRegionWidth(), scnScaleIcon.getRegionHeight());
+		} else if (dm == DraggingModes.SCALE_LOCK_ACTOR) {
+			r2 = new Rectangle(x - scnScaleLockIcon.getRegionWidth(), y2, scnScaleLockIcon.getRegionWidth(),
+					scnScaleLockIcon.getRegionHeight());
+		} else if (dm == DraggingModes.DRAGGING_ACTOR) {
+			r2 = new Rectangle(x + (x2 - x - scnMoveIcon.getRegionWidth()) / 2, y2, scnMoveIcon.getRegionWidth(),
+					scnMoveIcon.getRegionHeight());
+		}
+
+		worldToScreenCoords(tmpV2Transform.set(px, py));
+
+		return r2.contains(tmpV2Transform.x, tmpV2Transform.y);
+	}
+
+	private void drawFakeDepthMarkers(SpriteBatch batch) {
+		int margin = 5;
+
+		Vector2 d = scn.getDepthVector();
+
+		if (d == null)
+			return;
+
+		tmp2V2.x = 0;
+		tmp2V2.y = d.y;
+		worldToScreenCoords(tmp2V2);
+
+		String s = "100%";
+
+		textLayout.setText(defaultFont, s);
+
+		float posx = tmp2V2.x - textLayout.width - 20;
+
+		RectangleRenderer.draw(batch, posx, tmp2V2.y, textLayout.width + margin * 2, textLayout.height + margin * 2,
+				Color.BLACK);
+		RectangleRenderer.draw(batch, tmp2V2.x - 20, tmp2V2.y, 20, 2, Color.BLACK);
+
+		defaultFont.draw(batch, textLayout, posx + margin, tmp2V2.y + textLayout.height + margin);
+
+		tmp2V2.x = 0;
+		tmp2V2.y = d.x;
+		worldToScreenCoords(tmp2V2);
+		s = "0%";
+
+		textLayout.setText(defaultFont, s);
+
+		posx = tmp2V2.x - textLayout.width - 20;
+
+		RectangleRenderer.draw(batch, posx, tmp2V2.y, textLayout.width + margin * 2, textLayout.height + margin * 2,
+				Color.BLACK);
+		RectangleRenderer.draw(batch, tmp2V2.x - 20, tmp2V2.y, 20, 2, Color.BLACK);
+
+		defaultFont.draw(batch, textLayout, posx + margin, tmp2V2.y + textLayout.height + margin);
+
+	}
+
+	public void setInSceneSprites(boolean v) {
+		inScene = v;
+		Ctx.project.getEditorConfig().setProperty("view.inScene", Boolean.toString(inScene));
+
+		if (!inScene)
+			setSelectedFA(null);
+	}
+
+	public boolean getInSceneSprites() {
+		return inScene;
+	}
+
+	public void setAnimation(boolean v) {
+		animation = v;
+		Ctx.project.getEditorConfig().setProperty("view.animation", Boolean.toString(animation));
+	}
+
+	public boolean getAnimation() {
+		return animation;
+	}
+
+	public void setAnimationRenderer(BaseActor a, AnimationDesc fa) {
+		try {
+			faRenderer.setActor(a);
+			faRenderer.setAnimation(fa);
+		} catch (Exception e) {
+			Message.showMsg(getStage(), "Could not retrieve assets for sprite: " + fa.id, 4);
+			EditorLogger.printStackTrace(e);
+
+			faRenderer.setAnimation(null);
+		}
+	}
+
+	public boolean getShowSpriteBounds() {
+		return showSpriteBounds;
+	}
+
+	public void setShowSpriteBounds(boolean v) {
+		showSpriteBounds = v;
+		Ctx.project.getEditorConfig().setProperty("view.showSpriteBounds", Boolean.toString(showSpriteBounds));
+	}
+
+	@Override
+	public void layout() {
+		// EditorLogger.debug("LAYOUT SIZE CHANGED - X: " + getX() + " Y: "
+		// + getY() + " Width: " + getWidth() + " Height: " + getHeight());
+		// EditorLogger.debug("Last Point coords - X: " + (getX() + getWidth())
+		// + " Y: " + (getY() + getHeight()));
+		localToScreenCoords(tmpV2.set(getX() + getWidth(), getY() + getHeight()));
+		// EditorLogger.debug("Screen Last Point coords: " + tmpV2);
+
+		faRenderer.setViewport(getWidth(), getHeight());
+		bounds.set(getX(), getY(), getWidth(), getHeight());
+
+		// SETS WORLD CAMERA
+		if (scn != null) {
+
+			float aspect = getWidth() / getHeight();
+
+			float wWidth = Ctx.project.getWorld().getWidth();
+			float wHeight = Ctx.project.getWorld().getHeight();
+			float aspectWorld = wWidth / wHeight;
+
+			if (aspectWorld > aspect) {
+				wHeight = wWidth / aspect;
+			} else {
+				wWidth = wHeight * aspect;
+			}
+
+			zoomLevel = 100;
+
+			camera.setToOrtho(false, wWidth, wHeight);
+			camera.zoom = 1f;
+			camera.position.set(Ctx.project.getWorld().getWidth() / 2, Ctx.project.getWorld().getHeight() / 2, 0);
+			camera.update();
+			zoom(+1);
+		}
+	}
+
+	public void zoom(int amount) {
+		if (zoomLevel == zoomLevels[0] && amount < 0) {
+			zoomLevel = zoomLevels[1];
+		} else if (zoomLevel == zoomLevels[zoomLevels.length - 1] && amount > 0) {
+			zoomLevel = zoomLevels[zoomLevels.length - 2];
+		} else {
+			for (int i = 1; i < zoomLevels.length - 1; i++) {
+				if (zoomLevels[i] == zoomLevel) {
+					zoomLevel = amount > 0 ? zoomLevels[i - 1] : zoomLevels[i + 1];
+					break;
+				}
+			}
+		}
+
+		if (scn != null) {
+			camera.zoom = 100f / zoomLevel;
+			camera.update();
+		}
+	}
+
+	public void translate(Vector2 delta) {
+		// EditorLogger.debug("TRANSLATING - X: " + delta.x + " Y: " + delta.y);
+		if (scn != null) {
+			camera.translate(-delta.x, -delta.y, 0);
+			camera.update();
+		}
+	}
+
+	public void localToScreenCoords(Vector2 coords) {
+		localToStageCoordinates(coords);
+		getStage().stageToScreenCoordinates(coords);
+	}
+
+	public void localToWorldCoords(Vector2 coords) {
+		localToStageCoordinates(coords);
+		getStage().stageToScreenCoordinates(coords);
+
+		tmpV3.set(coords.x, coords.y, 0);
+		camera.unproject(tmpV3, getX(), getY(), getWidth(), getHeight());
+		coords.set(tmpV3.x, tmpV3.y);
+	}
+
+	public void screenToWorldCoords(Vector2 coords) {
+		tmpV2.set(0, 0);
+		localToStageCoordinates(tmpV2);
+		// getStage().stageToScreenCoordinates(tmpV2);
+		tmpV3.set(coords.x, coords.y, 0);
+		camera.unproject(tmpV3, tmpV2.x, tmpV2.y, getWidth(), getHeight());
+		coords.set(tmpV3.x, tmpV3.y);
+	}
+
+	public void worldToScreenCoords(Vector2 coords) {
+		tmpV2.set(getX(), getY());
+		localToStageCoordinates(tmpV2);
+		tmpV3.set(coords.x, coords.y, 0);
+		camera.project(tmpV3, tmpV2.x, tmpV2.y, getWidth(), getHeight());
+		coords.set(tmpV3.x, tmpV3.y);
+		stageToLocalCoordinates(coords);
+	}
+
+	public boolean inScaleIcon(float px, float py) {
+		Polygon p = selectedActor.getBBox();
+
+		if (selectedActor instanceof SpriteActor) {
+
+			InteractiveActor ia = (InteractiveActor) selectedActor;
+
+			if (!scn.getLayer(ia.getLayer()).isVisible())
+				return false;
+
+			Rectangle r = p.getBoundingRectangle();
+
+			worldToScreenCoords(tmpV2Transform.set(r.x + r.width, r.y + r.height));
+
+			float x = tmpV2Transform.x;
+			float y = tmpV2Transform.y;
+
+			Rectangle r2 = new Rectangle(x - scnMoveIcon.getRegionWidth() / 2, y, scnMoveIcon.getRegionWidth(),
+					scnMoveIcon.getRegionHeight());
+
+			worldToScreenCoords(tmpV2Transform.set(px, py));
+
+			return r2.contains(tmpV2Transform.x, tmpV2Transform.y);
+		}
+
+		return false;
+	}
+
+	public Scene getScene() {
+		return scn;
+	}
+
+	public BaseActor getSelectedActor() {
+		return selectedActor;
+	}
+
+	public void setSelectedScene(Scene s) {
+		if (scn != null) {
+			scn.dispose();
+			faRenderer.dispose();
+			scn = null;
+
+			EngineAssetManager.getInstance().clear();
+		}
+
+		loadingError = false;
+
+		setSelectedActor(null);
+
+		if (s != null) {
+			scn = s;
+
+			scn.loadAssets();
+			loading = true;
+		}
+
+		// SETS WORLD CAMERA
+		if (scn != null) {
+
+			float aspect = getWidth() / getHeight();
+
+			float wWidth = Ctx.project.getWorld().getWidth();
+			float wHeight = Ctx.project.getWorld().getHeight();
+			float aspectWorld = wWidth / wHeight;
+
+			if (aspectWorld > aspect) {
+				wHeight = wWidth / aspect;
+			} else {
+				wWidth = wHeight * aspect;
+			}
+
+			zoomLevel = 100;
+
+			camera.setToOrtho(false, wWidth, wHeight);
+			camera.zoom = 1f;
+			camera.update();
+
+			// translate(new Vector2((-getWidth() + wWidth ) / 2 *
+			// camera.zoom,
+			// (-getHeight() + wHeight) / 2 * camera.zoom));
+
+			translate(new Vector2(0, (-getHeight() + wHeight) / 2));
+		}
+	}
+
+	public void setSelectedActor(BaseActor actor) {
+		BaseActor a = null;
+
+		if (scn != null && actor != null) {
+			a = actor;
+		}
+
+		selectedActor = a;
+		// faRenderer.setActor(a);
+		setAnimationRenderer(null, null);
+	}
+
+	public void setSelectedFA(String selFA) {
+		if (selectedActor instanceof SpriteActor
+				&& ((SpriteActor) selectedActor).getRenderer() instanceof AnimationRenderer) {
+			AnimationRenderer s = (AnimationRenderer) ((SpriteActor) selectedActor).getRenderer();
+
+			if (selFA == null || (s.getAnimations().get(selFA) == null
+					&& s.getAnimations().get(AnimationRenderer.getFlipId(selFA)) == null)) {
+				selFA = s.getInitAnimation();
+			}
+
+			if (selFA != null && (s.getAnimations().get(selFA) != null
+					|| s.getAnimations().get(AnimationRenderer.getFlipId(selFA)) != null)) {
+
+				setAnimationRenderer(selectedActor, s.getAnimations().get(selFA));
+
+				String animInScene = selFA;
+				if (!inScene && s.getInitAnimation() != null)
+					animInScene = s.getInitAnimation();
+
+				try {
+					((SpriteActor) selectedActor).startAnimation(animInScene, Tween.Type.REPEAT, Tween.INFINITY, null);
+				} catch (Exception e) {
+					setAnimationRenderer(selectedActor, null);
+					s.getAnimations().remove(selFA);
+				}
+			} else {
+				setAnimationRenderer(selectedActor, null);
+			}
+		} else {
+			setAnimationRenderer(selectedActor, null);
+		}
+	}
+
+	public void dispose() {
+		if (scn != null) {
+			scn.dispose();
+			scn = null;
+		}
+
+		faRenderer.dispose();
+	}
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidgetInputListener.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidgetInputListener.java
new file mode 100644
index 000000000..bc82c27e0
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ScnWidgetInputListener.java
@@ -0,0 +1,521 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.scneditor;
+
+import java.io.IOException;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input.Buttons;
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.math.Polygon;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.scenes.scene2d.utils.UIUtils;
+import com.bladecoder.engine.model.AnchorActor;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.ObstacleActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SceneLayer;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.WalkZoneActor;
+import com.bladecoder.engine.util.PolygonUtils;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.undo.UndoBboxPointPos;
+import com.bladecoder.engineeditor.undo.UndoDeleteActor;
+import com.bladecoder.engineeditor.undo.UndoDepthVector;
+import com.bladecoder.engineeditor.undo.UndoPosition;
+import com.bladecoder.engineeditor.undo.UndoRefPosition;
+import com.bladecoder.engineeditor.undo.UndoRotation;
+import com.bladecoder.engineeditor.undo.UndoScale;
+
+public class ScnWidgetInputListener extends ClickListener {
+	private final ScnWidget scnWidget;
+
+	public static enum DraggingModes {
+		NONE, DRAGGING_ACTOR, DRAGGING_BBOX_POINT, DRAGGING_MARKER_0, DRAGGING_MARKER_100, DRAGGING_REFPOINT,
+		ROTATE_ACTOR, SCALE_LOCK_ACTOR, SCALE_ACTOR
+	};
+
+	private DraggingModes draggingMode = DraggingModes.NONE;
+	private BaseActor selActor = null;
+	private Vector2 org = new Vector2();
+	private Vector2 undoOrg = new Vector2();
+	private float undoRot = 0;
+	private int vertIndex;
+
+	public ScnWidgetInputListener(ScnWidget w) {
+		this.scnWidget = w;
+	}
+
+	@Override
+	public void clicked(InputEvent event, float x, float y) {
+		Scene scn = scnWidget.getScene();
+		if (scn == null)
+			return;
+
+		Vector2 p = new Vector2(Gdx.input.getX(), Gdx.input.getY());
+		scnWidget.screenToWorldCoords(p);
+
+		// DOUBLE CLICK TO CREATE OR DELETE POINTS
+		if (getTapCount() == 2 && scnWidget.getSelectedActor() != null) {
+
+			Polygon poly = scnWidget.getSelectedActor().getBBox();
+
+			if ((!(scnWidget.getSelectedActor() instanceof SpriteActor)
+					|| !((SpriteActor) scnWidget.getSelectedActor()).isBboxFromRenderer())
+					&& !(scnWidget.getSelectedActor() instanceof AnchorActor)) {
+				if (UIUtils.ctrl()) {
+
+					// Delete the point if selected
+					boolean deleted = PolygonUtils.deletePoint(poly, p.x, p.y, CanvasDrawer.CORNER_DIST);
+
+					if (deleted) {
+						Ctx.project.setModified();
+						return;
+					}
+				} else {
+					boolean created = PolygonUtils.addClampPointIfTolerance(poly, p.x, p.y, CanvasDrawer.CORNER_DIST);
+
+					if (created) {
+						Ctx.project.setModified();
+						return;
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
+
+		super.touchDown(event, x, y, pointer, button);
+		// EditorLogger.debug("Touch Down - X: " + x + " Y: " + y);
+
+		Scene scn = scnWidget.getScene();
+		if (scn == null)
+			return false;
+
+		Vector2 p = new Vector2(Gdx.input.getX(), Gdx.input.getY());
+		scnWidget.screenToWorldCoords(p);
+		org.set(p);
+
+		if (button == Buttons.LEFT) {
+			selActor = scnWidget.getSelectedActor();
+
+			if (selActor != null) {
+
+				// ORIGIN DRAGGING
+				if (selActor instanceof InteractiveActor) {
+					Vector2 refPoint = ((InteractiveActor) selActor).getRefPoint();
+
+					float orgX = selActor.getX() + refPoint.x;
+					float orgY = selActor.getY() + refPoint.y;
+
+					float dst = Vector2.dst(p.x, p.y, orgX, orgY);
+
+					if (dst < Scene.ANCHOR_RADIUS) {
+						draggingMode = DraggingModes.DRAGGING_REFPOINT;
+						undoOrg.set(refPoint.x, refPoint.y);
+						return true;
+					}
+				}
+
+				// VERTEXs DRAGGING
+				if ((!(selActor instanceof SpriteActor) || !((SpriteActor) selActor).isBboxFromRenderer())
+						&& !(scnWidget.getSelectedActor() instanceof AnchorActor)) {
+
+					Polygon bbox = selActor.getBBox();
+					float verts[] = bbox.getTransformedVertices();
+					for (int i = 0; i < verts.length; i += 2) {
+						if (p.dst(verts[i], verts[i + 1]) < CanvasDrawer.CORNER_DIST) {
+							draggingMode = DraggingModes.DRAGGING_BBOX_POINT;
+							vertIndex = i;
+
+							float v[] = bbox.getVertices();
+							undoOrg.set(v[i], v[i + 1]);
+							return true;
+						}
+					}
+				}
+
+				// CLICK IN MOVE ICON
+				if (!(selActor instanceof AnchorActor)
+						&& scnWidget.inTransformIcon(p.x, p.y, DraggingModes.DRAGGING_ACTOR)) {
+					draggingMode = DraggingModes.DRAGGING_ACTOR;
+					undoOrg.set(selActor.getX(), selActor.getY());
+					return true;
+				}
+
+				if (selActor instanceof AnchorActor) {
+					float orgX = selActor.getX();
+					float orgY = selActor.getY();
+
+					float dst = Vector2.dst(p.x, p.y, orgX, orgY);
+
+					if (dst < Scene.ANCHOR_RADIUS) {
+						draggingMode = DraggingModes.DRAGGING_ACTOR;
+						undoOrg.set(selActor.getX(), selActor.getY());
+						return true;
+					}
+				}
+
+				// CHECK CLICK IN TRANSFORM ICON
+				if (selActor instanceof SpriteActor) {
+					if (scnWidget.inTransformIcon(p.x, p.y, DraggingModes.ROTATE_ACTOR)) {
+						draggingMode = DraggingModes.ROTATE_ACTOR;
+						undoRot = ((SpriteActor) selActor).getRot();
+						return true;
+					}
+
+					if (!((SpriteActor) selActor).getFakeDepth()) {
+						if (scnWidget.inTransformIcon(p.x, p.y, DraggingModes.SCALE_ACTOR)) {
+							draggingMode = DraggingModes.SCALE_ACTOR;
+							undoOrg.set(((SpriteActor) selActor).getScaleX(), ((SpriteActor) selActor).getScaleY());
+							return true;
+						}
+
+						if (scnWidget.inTransformIcon(p.x, p.y, DraggingModes.SCALE_LOCK_ACTOR)) {
+							draggingMode = DraggingModes.SCALE_LOCK_ACTOR;
+							undoOrg.set(((SpriteActor) selActor).getScaleX(), ((SpriteActor) selActor).getScaleY());
+							return true;
+						}
+					}
+				}
+			}
+
+			// CHECK FOR CLICK INSIDE ACTOR TO CHANGE SELECTION
+			BaseActor a = getActorAt(scn, p.x, p.y);
+
+			if (a != null && a != selActor) {
+				selActor = a;
+				BaseActor da = Ctx.project.getActor(selActor.getId());
+				Ctx.project.setSelectedActor(da);
+
+				return true;
+			}
+
+			// if (a != null) {
+			// draggingMode = DraggingModes.DRAGGING_ACTOR;
+			// undoOrg.set(selActor.getX(), selActor.getY());
+			// return true;
+			// }
+
+			// CHECK FOR DRAGGING DEPTH MARKERS
+			Vector2 depthVector = scnWidget.getScene().getDepthVector();
+			if (depthVector != null) {
+				p.set(0, depthVector.x);
+				scnWidget.worldToScreenCoords(p);
+				if (Vector2.dst(p.x - 40, p.y, x, y) < 50) {
+					draggingMode = DraggingModes.DRAGGING_MARKER_0;
+
+					Vector2 dv = scnWidget.getScene().getDepthVector();
+					undoOrg.set(dv.x, dv.y);
+					return true;
+				}
+
+				p.set(0, depthVector.y);
+				scnWidget.worldToScreenCoords(p);
+				if (Vector2.dst(p.x - 40, p.y, x, y) < 50) {
+					draggingMode = DraggingModes.DRAGGING_MARKER_100;
+					Vector2 dv = scnWidget.getScene().getDepthVector();
+					undoOrg.set(dv.x, dv.y);
+					return true;
+				}
+			}
+
+		}
+
+		return true;
+	}
+
+	@Override
+	public void touchDragged(InputEvent event, float x, float y, int pointer) {
+		// EditorLogger.debug("Touch Dragged - X: " + Gdx.input.getX() + " Y: "
+		// + Gdx.input.getY());
+
+		super.touchDragged(event, x, y, pointer);
+
+		if (Gdx.input.isButtonPressed(Buttons.LEFT)) {
+			Scene scn = scnWidget.getScene();
+
+			if (scn == null)
+				return;
+
+			Vector2 d = new Vector2(Gdx.input.getX(), Gdx.input.getY());
+			scnWidget.screenToWorldCoords(d);
+
+			float angle = d.angle(org);
+
+			d.sub(org);
+			org.add(d);
+
+			if (draggingMode == DraggingModes.DRAGGING_ACTOR) {
+				selActor.setPosition(selActor.getX() + d.x, selActor.getY() + d.y);
+				Ctx.project.setModified(this, Project.POSITION_PROPERTY, null, selActor);
+			} else if (draggingMode == DraggingModes.ROTATE_ACTOR) {
+				if (selActor instanceof SpriteActor) {
+					SpriteActor sa = (SpriteActor) selActor;
+					sa.setRot(sa.getRot() - angle);
+					Ctx.project.setModified();
+				}
+			} else if (draggingMode == DraggingModes.SCALE_ACTOR) {
+				if (selActor instanceof SpriteActor) {
+					SpriteActor sa = (SpriteActor) selActor;
+
+					float sx = (org.x - d.x) / org.x - 1;
+					float sy = (org.y - d.y) / org.y - 1;
+
+					sa.setScale(sa.getScaleX() + sx, sa.getScaleY() + sy);
+					Ctx.project.setModified();
+				}
+			} else if (draggingMode == DraggingModes.SCALE_LOCK_ACTOR) {
+				if (selActor instanceof SpriteActor) {
+					SpriteActor sa = (SpriteActor) selActor;
+
+					float s = (org.x - d.x) / org.x - 1;
+
+					sa.setScale(sa.getScaleX() + s, sa.getScaleY() + s);
+					Ctx.project.setModified();
+				}
+			} else if (draggingMode == DraggingModes.DRAGGING_REFPOINT) {
+				Vector2 refPoint = ((InteractiveActor) selActor).getRefPoint();
+				refPoint.add(d.x, d.y);
+				Ctx.project.setModified();
+			} else if (draggingMode == DraggingModes.DRAGGING_BBOX_POINT) {
+				Polygon poly = selActor.getBBox();
+
+				float verts[] = poly.getVertices();
+				verts[vertIndex] += d.x;
+				verts[vertIndex + 1] += d.y;
+				poly.dirty();
+
+				Ctx.project.setModified();
+			} else if (draggingMode == DraggingModes.DRAGGING_MARKER_0) {
+				Vector2 depthVector = scnWidget.getScene().getDepthVector();
+
+				depthVector.x += d.y;
+				Ctx.project.setModified();
+				updateFakeDepth();
+			} else if (draggingMode == DraggingModes.DRAGGING_MARKER_100) {
+				Vector2 depthVector = scnWidget.getScene().getDepthVector();
+
+				depthVector.y += d.y;
+				Ctx.project.setModified();
+				updateFakeDepth();
+			}
+
+		} else if (Gdx.input.isButtonPressed(Buttons.RIGHT) || Gdx.input.isButtonPressed(Buttons.MIDDLE)) {
+
+			Vector2 p = new Vector2(Gdx.input.getX(), Gdx.input.getY());
+			scnWidget.screenToWorldCoords(p);
+			p.sub(org);
+
+			scnWidget.translate(p);
+		}
+	}
+
+	private void updateFakeDepth() {
+		Scene scn = scnWidget.getScene();
+		for (BaseActor a : scn.getActors().values()) {
+			if (a instanceof SpriteActor) {
+				a.setPosition(a.getX(), a.getY());
+			}
+		}
+	}
+
+	@Override
+	public boolean scrolled(InputEvent event, float x, float y, float amountX, float amountY) {
+		super.scrolled(event, x, y, amountX, amountY);
+		// EditorLogger.debug("SCROLLED - X: " + x + " Y: " + y);
+
+		if(Math.abs(amountY) < 1)
+			amountY *= 10;
+
+		scnWidget.zoom((int) amountY);
+		return true;
+	}
+
+	@Override
+	public void touchUp(InputEvent event, float x, float y, int pointer, int button) {
+
+		super.touchUp(event, x, y, pointer, button);
+		// EditorLogger.debug("Touch Up - X: " + x + " Y: " + y);
+
+		if (draggingMode == DraggingModes.DRAGGING_ACTOR) {
+			Ctx.project.getUndoStack().add(new UndoPosition(selActor, new Vector2(undoOrg)));
+		} else if (draggingMode == DraggingModes.ROTATE_ACTOR) {
+			Ctx.project.getUndoStack().add(new UndoRotation((SpriteActor) selActor, undoRot));
+		} else if (draggingMode == DraggingModes.SCALE_ACTOR || draggingMode == DraggingModes.SCALE_LOCK_ACTOR) {
+			Ctx.project.getUndoStack().add(new UndoScale((SpriteActor) selActor, new Vector2(undoOrg)));
+		} else if (draggingMode == DraggingModes.DRAGGING_REFPOINT) {
+			Ctx.project.getUndoStack().add(new UndoRefPosition((InteractiveActor) selActor, new Vector2(undoOrg)));
+		} else if (draggingMode == DraggingModes.DRAGGING_BBOX_POINT) {
+			Ctx.project.getUndoStack().add(new UndoBboxPointPos(selActor, vertIndex, new Vector2(undoOrg)));
+		} else if (draggingMode == DraggingModes.DRAGGING_MARKER_0
+				|| draggingMode == DraggingModes.DRAGGING_MARKER_100) {
+			Ctx.project.getUndoStack().add(new UndoDepthVector(scnWidget.getScene(), new Vector2(undoOrg)));
+		}
+
+		draggingMode = DraggingModes.NONE;
+
+		return;
+	}
+
+	@Override
+	public boolean keyUp(InputEvent event, int keycode) {
+		switch (keycode) {
+		case Keys.UP:
+		case Keys.DOWN:
+		case Keys.LEFT:
+		case Keys.RIGHT:
+			Ctx.project.getUndoStack().add(new UndoPosition(selActor, new Vector2(undoOrg)));
+		}
+
+		return false;
+	}
+
+	@Override
+	public boolean keyDown(InputEvent event, int keycode) {
+		super.keyDown(event, keycode);
+		Polygon p = null;
+
+		if (scnWidget.getStage() == null || scnWidget.getStage().getKeyboardFocus() != scnWidget)
+			return false;
+
+		switch (keycode) {
+
+		case Keys.ENTER:
+			break;
+		case Keys.BACKSPACE:
+			break;
+		case Keys.Z:
+			if (UIUtils.ctrl()) {
+				Ctx.project.getUndoStack().undo();
+			}
+			break;
+
+		case Keys.FORWARD_DEL:
+			BaseActor a = Ctx.project.getSelectedActor();
+			if (a == null)
+				return false;
+			Ctx.project.getUndoStack().add(new UndoDeleteActor(Ctx.project.getSelectedScene(), a));
+			Ctx.project.getSelectedScene().removeActor(a);
+			Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_DELETED, null, a);
+			break;
+
+		case Keys.S:
+			if (UIUtils.ctrl()) {
+				try {
+					Ctx.project.saveProject();
+				} catch (IOException e1) {
+					String msg = "Something went wrong while saving the actor.\n\n" + e1.getClass().getSimpleName()
+							+ " - " + e1.getMessage();
+					Message.showMsgDialog(scnWidget.getStage(), "Error", msg);
+
+					EditorLogger.printStackTrace(e1);
+				}
+			}
+			break;
+
+		case Keys.UP:
+		case Keys.DOWN:
+		case Keys.LEFT:
+		case Keys.RIGHT:
+			selActor = scnWidget.getSelectedActor();
+			p = selActor.getBBox();
+			undoOrg.set(p.getX(), p.getY());
+
+			Ctx.project.setModified(this, Project.POSITION_PROPERTY, null, selActor);
+			break;
+
+		case Keys.PLUS:
+			case 72: // '+'
+			scnWidget.zoom(-1);
+			break;
+
+		case Keys.MINUS:
+			case 76: // '-'
+			scnWidget.zoom(1);
+			break;
+
+		}
+
+		return false;
+	}
+
+	@Override
+	public void enter(InputEvent event, float x, float y, int pointer,
+			com.badlogic.gdx.scenes.scene2d.Actor fromActor) {
+		super.enter(event, x, y, pointer, fromActor);
+		// EditorLogger.debug("ENTER - X: " + x + " Y: " + y);
+		scnWidget.getStage().setScrollFocus(scnWidget);
+		scnWidget.getStage().setKeyboardFocus(scnWidget);
+	}
+
+	/**
+	 * Returns the actor at the position. Including not interactive actors.
+	 */
+	private BaseActor getActorAt(Scene s, float x, float y) {
+
+		// 1. Search for ANCHOR Actors
+		for (BaseActor a : s.getActors().values()) {
+			if (a instanceof AnchorActor && Ctx.project.isEditorVisible(a)) {
+				float dst = Vector2.dst(x, y, a.getX(), a.getY());
+
+				if (dst < Scene.ANCHOR_RADIUS)
+					return a;
+			}
+		}
+
+		// 2. Search for INTERACTIVE Actors
+		for (SceneLayer layer : s.getLayers()) {
+
+			if (!layer.isVisible())
+				continue;
+
+			// Obtain actors in reverse (close to camera)
+			for (int i = layer.getActors().size() - 1; i >= 0; i--) {
+				BaseActor a = layer.getActors().get(i);
+
+				if (a.hit(x, y) && Ctx.project.isEditorVisible(a)) {
+					return a;
+				}
+			}
+		}
+
+		// 3. Search for OBSTACLE actors
+		for (BaseActor a : s.getActors().values()) {
+			if (a instanceof ObstacleActor && a.hit(x, y) && Ctx.project.isEditorVisible(a)) {
+				return a;
+			}
+		}
+
+		// 4. Search for WALKZONE actors
+		for (BaseActor a : s.getActors().values()) {
+			if (a instanceof WalkZoneActor && a.hit(x, y) && Ctx.project.isEditorVisible(a)) {
+				return a;
+			}
+		}
+
+		return null;
+	}
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ToolsWindow.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ToolsWindow.java
new file mode 100644
index 000000000..b00054f82
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ToolsWindow.java
@@ -0,0 +1,599 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.scneditor;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.Texture.TextureFilter;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Container;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.utils.Array;
+import com.bladecoder.engine.util.Config;
+import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.I18NUtils;
+import com.bladecoder.engineeditor.common.ImageUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.common.ModelTools;
+import com.bladecoder.engineeditor.common.RunProccess;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.CompileInkDialog;
+import com.kotcrab.vis.ui.widget.file.FileChooser;
+import com.kotcrab.vis.ui.widget.file.FileChooser.Mode;
+import com.kotcrab.vis.ui.widget.file.FileChooser.SelectionMode;
+import com.kotcrab.vis.ui.widget.file.FileChooser.ViewMode;
+import com.kotcrab.vis.ui.widget.file.FileChooserListener;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ToolsWindow extends Container<Table> {
+
+    ScnWidget scnWidget;
+    com.bladecoder.engine.model.BaseActor actor;
+
+    public ToolsWindow(Skin skin, ScnWidget sw) {
+
+        scnWidget = sw;
+
+        Table table = new Table(skin);
+        TextButton tmpButton = new TextButton("Temporal tool", skin, "no-toggled");
+        TextButton testOnAndroidButton = new TextButton("Test on Android device", skin, "no-toggled");
+        TextButton testOnIphoneEmulatorButton = new TextButton("Test on Iphone emulator", skin, "no-toggled");
+        TextButton testOnIpadEmulatorButton = new TextButton("Test on Ipad emulator", skin, "no-toggled");
+        TextButton testOnIOSDeviceButton = new TextButton("Test on IOS device", skin, "no-toggled");
+        TextButton exportTSVButton = new TextButton("I18N - Export texts as .tsv", skin, "no-toggled");
+        TextButton importTSVButton = new TextButton("I18N - Import.tsv file", skin, "no-toggled");
+
+        TextButton exportUIImages = new TextButton("Export UI Images", skin, "no-toggled");
+        TextButton createUIAtlas = new TextButton("Create UI Atlas", skin, "no-toggled");
+        TextButton particleEditor = new TextButton("Particle Editor", skin, "no-toggled");
+        TextButton compileInk = new TextButton("Compile Ink Script", skin, "no-toggled");
+
+        table.defaults().left().expandX();
+        table.top().pad(DPIUtils.getSpacing() / 2);
+        table.add(new Label("Tools", skin, "big")).center();
+
+        Drawable drawable = skin.getDrawable("trans");
+        setBackground(drawable);
+
+        table.row();
+        table.add(testOnAndroidButton).expandX().fill();
+
+        table.row();
+        table.add(testOnIphoneEmulatorButton).expandX().fill();
+
+        table.row();
+        table.add(testOnIpadEmulatorButton).expandX().fill();
+
+        table.row();
+        table.add(testOnIOSDeviceButton).expandX().fill();
+
+        // disable if not mac
+        if (!System.getProperty("os.name").toLowerCase().contains("mac")) {
+            testOnIphoneEmulatorButton.setDisabled(true);
+            testOnIpadEmulatorButton.setDisabled(true);
+            testOnIOSDeviceButton.setDisabled(true);
+        }
+
+        table.row();
+        table.add(exportTSVButton).expandX().fill();
+
+        table.row();
+        table.add(importTSVButton).expandX().fill();
+
+        table.row();
+        table.add(exportUIImages).expandX().fill();
+
+        table.row();
+        table.add(createUIAtlas).expandX().fill();
+
+        table.row();
+        table.add(particleEditor).expandX().fill();
+
+        table.row();
+        table.add(compileInk).expandX().fill();
+
+        // table.row();
+        // table.add(tmpButton).expandX().fill();
+
+        // ADD CUTMODE FOR VERBS THAT ONLY HAVE A LOOKAT OR SAY ACTION
+        tmpButton.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                ModelTools.fixSaySubtitleActor();
+
+                Message.showMsg(getStage(), "TOOL PROCESSED", 4);
+            }
+
+        });
+
+        // TEST ON ANDROID DEVICE
+        testOnAndroidButton.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                testOnAndroid();
+            }
+
+        });
+
+        testOnIphoneEmulatorButton.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                testOnIphoneEmulator();
+            }
+
+        });
+
+        testOnIpadEmulatorButton.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                testOnIpadEmulator();
+            }
+
+        });
+
+        testOnIOSDeviceButton.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                testOnIOSDevice();
+            }
+
+        });
+
+        exportTSVButton.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                exportTSV();
+            }
+        });
+
+        importTSVButton.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                importTSV();
+            }
+        });
+
+        exportUIImages.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                exportUIImages();
+            }
+        });
+
+        createUIAtlas.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                createUIAtlas();
+            }
+        });
+
+        particleEditor.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                particleEditor();
+            }
+        });
+
+        compileInk.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                compileInk();
+            }
+        });
+
+        table.pack();
+        setActor(table);
+        prefSize(table.getWidth(), Math.max(200, table.getHeight()));
+        setSize(table.getWidth(), Math.max(200, table.getHeight()));
+    }
+
+    protected void compileInk() {
+        new CompileInkDialog(getActor().getSkin()).show(getStage());
+    }
+
+    protected void createUIAtlas() {
+        FileChooser fileChooser = new FileChooser(Mode.OPEN);
+        fileChooser.setSize(Gdx.graphics.getWidth() * 0.7f, Gdx.graphics.getHeight() * 0.7f);
+        fileChooser.setViewMode(ViewMode.LIST);
+
+        fileChooser.setSelectionMode(SelectionMode.DIRECTORIES);
+        getStage().addActor(fileChooser);
+
+        fileChooser.setListener(new FileChooserListener() {
+
+            @Override
+            public void selected(Array<FileHandle> files) {
+
+                List<String> res = Ctx.project.getResolutions();
+
+                for (String r : res) {
+                    float scale = Float.parseFloat(r);
+
+                    try {
+                        int maxWH = (int) (ImageUtils.getRecommendedAtlasSize() * scale);
+
+                        ImageUtils.createAtlas(files.get(0).file().getAbsolutePath(),
+                                Ctx.project.getAssetPath() + Project.UI_PATH + "/" + r, "ui" + ".atlas", scale, maxWH,
+                                maxWH, TextureFilter.Linear, TextureFilter.Nearest, "png", false);
+                    } catch (IOException e) {
+                        EditorLogger.error(e.getMessage());
+                        Message.showMsgDialog(getStage(), "Error creating atlas", e.getMessage());
+                        return;
+                    }
+                }
+
+                Message.showMsg(getStage(), "UI Atlas created sucessfully.", 4);
+            }
+
+            @Override
+            public void canceled() {
+
+            }
+        });
+
+    }
+
+    protected void exportUIImages() {
+        FileChooser fileChooser = new FileChooser(Mode.OPEN);
+        fileChooser.setSize(Gdx.graphics.getWidth() * 0.7f, Gdx.graphics.getHeight() * 0.7f);
+        fileChooser.setViewMode(ViewMode.LIST);
+
+        fileChooser.setSelectionMode(SelectionMode.DIRECTORIES);
+        getStage().addActor(fileChooser);
+
+        fileChooser.setListener(new FileChooserListener() {
+
+            @Override
+            public void selected(Array<FileHandle> files) {
+                try {
+                    // fileChooser.setTitle("Select the file to export the
+                    // project texts");
+
+                    ImageUtils.unpackAtlas(new File(Ctx.project.getAssetPath() + Project.UI_PATH + "/1/ui.atlas"),
+                            files.get(0).file());
+
+                    Message.showMsg(getStage(), "UI Atlas images exported sucessfully.", 4);
+                } catch (Exception e) {
+                    Message.showMsg(getStage(), "There was a problem exporting images from UI Atlas.", 4);
+                    EditorLogger.printStackTrace(e);
+                }
+            }
+
+            @Override
+            public void canceled() {
+
+            }
+        });
+
+    }
+
+    private void exportTSV() {
+
+        FileChooser fileChooser = new FileChooser(Mode.SAVE);
+        fileChooser.setSize(Gdx.graphics.getWidth() * 0.7f, Gdx.graphics.getHeight() * 0.7f);
+        fileChooser.setViewMode(ViewMode.LIST);
+
+        fileChooser.setSelectionMode(SelectionMode.FILES);
+        getStage().addActor(fileChooser);
+
+        fileChooser.setListener(new FileChooserListener() {
+
+            @Override
+            public void selected(Array<FileHandle> files) {
+                try {
+                    // fileChooser.setTitle("Select the file to export the
+                    // project texts");
+
+                    I18NUtils.exportTSV(Ctx.project.getAssetPath() + Project.MODEL_PATH,
+                            files.get(0).file().getAbsolutePath(), Ctx.project.getChapter().getId(), "default");
+
+                    Message.showMsg(getStage(), files.get(0).file().getName() + " exported sucessfully.", 4);
+                } catch (IOException e) {
+                    Message.showMsg(getStage(), "There was a problem generating the .tsv file.", 4);
+                    EditorLogger.printStackTrace(e);
+                }
+            }
+
+            @Override
+            public void canceled() {
+
+            }
+        });
+    }
+
+    private void importTSV() {
+
+        FileChooser fileChooser = new FileChooser(Mode.OPEN);
+        fileChooser.setSize(Gdx.graphics.getWidth() * 0.7f, Gdx.graphics.getHeight() * 0.7f);
+        fileChooser.setViewMode(ViewMode.LIST);
+
+        fileChooser.setSelectionMode(SelectionMode.FILES);
+        getStage().addActor(fileChooser);
+
+        fileChooser.setListener(new FileChooserListener() {
+
+            @Override
+            public void selected(Array<FileHandle> files) {
+                try {
+                    // chooser.setTitle("Select the .tsv file to import");
+
+                    I18NUtils.importTSV(Ctx.project.getAssetPath() + Project.MODEL_PATH,
+                            files.get(0).file().getAbsolutePath(), Ctx.project.getChapter().getId(), "default");
+
+                    // Reload texts
+                    Ctx.project.getI18N().load(Ctx.project.getChapter().getId());
+
+                    Message.showMsg(getStage(), files.get(0).file().getName() + " imported sucessfully.", 4);
+
+                } catch (IOException e) {
+                    Message.showMsg(getStage(), "There was a problem importing the .tsv file.", 4);
+                    EditorLogger.printStackTrace(e);
+                }
+            }
+
+            @Override
+            public void canceled() {
+
+            }
+        });
+    }
+
+    private void testOnAndroid() {
+        if (Ctx.project.getSelectedScene() == null) {
+            String msg = "There are no scenes in this chapter.";
+            Message.showMsg(getStage(), msg, 3);
+            return;
+        }
+
+        Ctx.project.getProjectConfig().setProperty(Config.CHAPTER_PROP, Ctx.project.getChapter().getId());
+        Ctx.project.getProjectConfig().setProperty(Config.TEST_SCENE_PROP, Ctx.project.getSelectedScene().getId());
+        Ctx.project.setModified();
+
+        try {
+            Ctx.project.saveProject();
+        } catch (Exception ex) {
+            String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName() + " - "
+                    + ex.getMessage();
+            Message.showMsgDialog(getStage(), "Error", msg);
+            return;
+        }
+
+        new Thread(new Runnable() {
+            Stage stage = getStage();
+
+            @Override
+            public void run() {
+                Message.showMsg(stage, "Running scene on Android device...", 5);
+
+                if (!RunProccess.runGradle(Ctx.project.getProjectDir(),
+                        "android:uninstallFullDebug android:installFullDebug android:run")) {
+                    Message.showMsg(stage, "There was a problem running the project", 4);
+                }
+
+                Ctx.project.getProjectConfig().removeProperty(Config.CHAPTER_PROP);
+                Ctx.project.getProjectConfig().removeProperty(Config.TEST_SCENE_PROP);
+                Ctx.project.setModified();
+
+                try {
+                    Ctx.project.saveProject();
+                } catch (Exception ex) {
+                    String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName()
+                            + " - " + ex.getMessage();
+                    EditorLogger.error(msg);
+                    return;
+                }
+
+            }
+        }).start();
+
+    }
+
+    private void testOnIphoneEmulator() {
+        if (Ctx.project.getSelectedScene() == null) {
+            String msg = "There are no scenes in this chapter.";
+            Message.showMsg(getStage(), msg, 3);
+            return;
+        }
+
+        Ctx.project.getProjectConfig().setProperty(Config.CHAPTER_PROP, Ctx.project.getChapter().getId());
+        Ctx.project.getProjectConfig().setProperty(Config.TEST_SCENE_PROP, Ctx.project.getSelectedScene().getId());
+        Ctx.project.setModified();
+
+        try {
+            Ctx.project.saveProject();
+        } catch (Exception ex) {
+            String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName() + " - "
+                    + ex.getMessage();
+            Message.showMsgDialog(getStage(), "Error", msg);
+            return;
+        }
+
+        new Thread(new Runnable() {
+            Stage stage = getStage();
+
+            @Override
+            public void run() {
+                Message.showMsg(stage, "Running scene on Iphone emulator...", 5);
+
+                if (!RunProccess.runGradle(Ctx.project.getProjectDir(), "ios:launchIPhoneSimulator")) {
+                    Message.showMsg(stage, "There was a problem running the project", 4);
+                }
+
+                Ctx.project.getProjectConfig().removeProperty(Config.CHAPTER_PROP);
+                Ctx.project.getProjectConfig().removeProperty(Config.TEST_SCENE_PROP);
+                Ctx.project.setModified();
+
+                try {
+                    Ctx.project.saveProject();
+                } catch (Exception ex) {
+                    String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName()
+                            + " - " + ex.getMessage();
+                    EditorLogger.error(msg);
+                    return;
+                }
+
+            }
+        }).start();
+
+    }
+
+    private void testOnIpadEmulator() {
+        if (Ctx.project.getSelectedScene() == null) {
+            String msg = "There are no scenes in this chapter.";
+            Message.showMsg(getStage(), msg, 3);
+            return;
+        }
+
+        Ctx.project.getProjectConfig().setProperty(Config.CHAPTER_PROP, Ctx.project.getChapter().getId());
+        Ctx.project.getProjectConfig().setProperty(Config.TEST_SCENE_PROP, Ctx.project.getSelectedScene().getId());
+        Ctx.project.setModified();
+
+        try {
+            Ctx.project.saveProject();
+        } catch (Exception ex) {
+            String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName() + " - "
+                    + ex.getMessage();
+            Message.showMsgDialog(getStage(), "Error", msg);
+            return;
+        }
+
+        new Thread(new Runnable() {
+            Stage stage = getStage();
+
+            @Override
+            public void run() {
+                Message.showMsg(stage, "Running scene on Ipad simulator...", 5);
+
+                if (!RunProccess.runGradle(Ctx.project.getProjectDir(), "ios:launchIPadSimulator")) {
+                    Message.showMsg(stage, "There was a problem running the project", 4);
+                }
+
+                Ctx.project.getProjectConfig().removeProperty(Config.CHAPTER_PROP);
+                Ctx.project.getProjectConfig().removeProperty(Config.TEST_SCENE_PROP);
+                Ctx.project.setModified();
+
+                try {
+                    Ctx.project.saveProject();
+                } catch (Exception ex) {
+                    String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName()
+                            + " - " + ex.getMessage();
+                    EditorLogger.error(msg);
+                    return;
+                }
+
+            }
+        }).start();
+
+    }
+
+    private void testOnIOSDevice() {
+        if (Ctx.project.getSelectedScene() == null) {
+            String msg = "There are no scenes in this chapter.";
+            Message.showMsg(getStage(), msg, 3);
+            return;
+        }
+
+        Ctx.project.getProjectConfig().setProperty(Config.CHAPTER_PROP, Ctx.project.getChapter().getId());
+        Ctx.project.getProjectConfig().setProperty(Config.TEST_SCENE_PROP, Ctx.project.getSelectedScene().getId());
+        Ctx.project.setModified();
+
+        try {
+            Ctx.project.saveProject();
+        } catch (Exception ex) {
+            String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName() + " - "
+                    + ex.getMessage();
+            Message.showMsgDialog(getStage(), "Error", msg);
+            return;
+        }
+
+        new Thread(new Runnable() {
+            Stage stage = getStage();
+
+            @Override
+            public void run() {
+                Message.showMsg(stage, "Running scene on IOS device...", 5);
+
+                if (!RunProccess.runGradle(Ctx.project.getProjectDir(), "ios:launchIOSDevice")) {
+                    Message.showMsg(stage, "There was a problem running the project", 4);
+                }
+
+                Ctx.project.getProjectConfig().removeProperty(Config.CHAPTER_PROP);
+                Ctx.project.getProjectConfig().removeProperty(Config.TEST_SCENE_PROP);
+                Ctx.project.setModified();
+
+                try {
+                    Ctx.project.saveProject();
+                } catch (Exception ex) {
+                    String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName()
+                            + " - " + ex.getMessage();
+                    EditorLogger.error(msg);
+                    return;
+                }
+
+            }
+        }).start();
+
+    }
+
+    private void particleEditor() {
+        // Open the particle editor
+        List<String> cp = new ArrayList<>();
+        // check that particle editor exists
+        String[] particleEditorPaths = {
+                "../thirdparty/gdx-particle-editor.jar",
+                "./adventure-editor/thirdparty/gdx-particle-editor.jar",
+                "./thirdparty/gdx-particle-editor.jar"
+        };
+
+        String particleEditorPath = null;
+
+        boolean found = false;
+
+        for (String path : particleEditorPaths) {
+            File f = new File(path);
+            if (f.exists()) {
+                particleEditorPath = path;
+                found = true;
+                break;
+            }
+        }
+
+        if (!found) {
+            Message.showMsgDialog(getStage(), "Error", "Particle Editor not found.");
+            return;
+        }
+
+        cp.add(particleEditorPath);
+        try {
+            RunProccess.runJavaProccess("com.ray3k.gdxparticleeditor.lwjgl3.Lwjgl3Launcher", cp, null);
+        } catch (IOException e) {
+            Message.showMsgDialog(getStage(), "Error", "Error launching Particle Editor.");
+            EditorLogger.printStackTrace(e);
+        }
+    }
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ViewWindow.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ViewWindow.java
new file mode 100644
index 000000000..a75db61c5
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/scneditor/ViewWindow.java
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.scneditor;
+
+import com.badlogic.gdx.scenes.scene2d.ui.CheckBox;
+import com.badlogic.gdx.scenes.scene2d.ui.Container;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+
+public class ViewWindow extends Container<Table> {
+	ScnWidget scnWidget;
+
+	CheckBox spriteBounds;
+
+	public ViewWindow(Skin skin, ScnWidget sw) {
+
+		scnWidget = sw;
+
+		Table table = new Table(skin);
+		table.defaults().left().expandX();
+		table.top().pad(DPIUtils.getSpacing() / 2);
+		table.top();
+		table.add(new Label("View", skin, "big")).center();
+
+		Drawable drawable = skin.getDrawable("trans");
+		setBackground(drawable);
+		table.row();
+
+		final CheckBox inSceneCb = new CheckBox("Animations in scene", skin);
+		inSceneCb.setChecked(scnWidget.getInSceneSprites());
+		table.add(inSceneCb);
+
+		table.row();
+		final CheckBox animCb = new CheckBox("Show Animations", skin);
+		animCb.setChecked(scnWidget.getAnimation());
+		table.add(animCb);
+
+		table.row();
+		spriteBounds = new CheckBox("Show Sprite Bounds", skin);
+		spriteBounds.setChecked(scnWidget.getShowSpriteBounds());
+		table.add(spriteBounds);
+
+		table.row();
+		final CheckBox console = new CheckBox("Show Debug Console", skin);
+		console.setChecked(EditorLogger.console.isVisible());
+		table.add(console);
+
+		table.row();
+		final CheckBox fullscreen = new CheckBox("Play in fullscreen", skin);
+		fullscreen.setChecked(
+				Boolean.parseBoolean(Ctx.project.getEditorConfig().getProperty("view.fullscreenPlay", "false")));
+		table.add(fullscreen);
+
+		inSceneCb.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
+				scnWidget.setInSceneSprites(inSceneCb.isChecked());
+			}
+		});
+
+		animCb.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
+				scnWidget.setAnimation(animCb.isChecked());
+			}
+		});
+
+		spriteBounds.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
+				scnWidget.setShowSpriteBounds(spriteBounds.isChecked());
+			}
+		});
+
+		console.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
+				EditorLogger.console.setVisible(console.isChecked());
+			}
+		});
+
+		fullscreen.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
+				Ctx.project.getEditorConfig().setProperty("view.fullscreenPlay",
+						Boolean.toString(fullscreen.isChecked()));
+			}
+		});
+
+		table.pack();
+		setActor(table);
+
+		prefSize(table.getWidth(), Math.max(200, table.getHeight()));
+		setSize(table.getWidth(), Math.max(200, table.getHeight()));
+	}
+
+	public void showWalkZone() {
+		scnWidget.setShowSpriteBounds(true);
+		spriteBounds.setChecked(true);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/BladeEngineSetup.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/BladeEngineSetup.java
new file mode 100644
index 000000000..d9c11fd35
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/BladeEngineSetup.java
@@ -0,0 +1,446 @@
+/*******************************************************************************
+ * Copyright 2011 See AUTHORS file.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+package com.bladecoder.engineeditor.setup;
+
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.RunProccess;
+import com.bladecoder.engineeditor.common.Versions;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Command line tool to generate libgdx projects
+ *
+ * @author rgarcia
+ */
+public class BladeEngineSetup {
+    public static boolean isSdkLocationValid(String sdkLocation) {
+        return new File(sdkLocation, "platforms").exists();
+    }
+
+    public static boolean isEmptyDirectory(String destination) {
+        if (new File(destination).exists()) {
+            return new File(destination).list().length == 0;
+        } else {
+            return true;
+        }
+    }
+
+    public static boolean isSdkUpToDate(String sdkLocation) {
+
+        File apis = new File(sdkLocation, "platforms");
+        if (!apis.exists()) {
+            EditorLogger.error("You have no Android APIs!\nUpdate your Android SDK with API level: "
+                    + Versions.getAndroidAPILevel());
+            return false;
+        }
+
+        int newestLocalApi = getLatestApi(apis);
+        if (newestLocalApi > Integer.parseInt(Versions.getAndroidAPILevel())) {
+
+            // ALWAYS USE THE CURRENT API
+            Versions.setAndroidAPILevel(Integer.toString(newestLocalApi));
+
+            EditorLogger.error("Using API level: " + Versions.getAndroidAPILevel());
+        } else {
+            if (!hasFileInDirectory(apis, "android-" + Versions.getAndroidAPILevel())) {
+                EditorLogger.error(
+                        "Please update your Android SDK, you need the Android API: " + Versions.getAndroidAPILevel());
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static boolean hasFileInDirectory(File file, String fileName) {
+        for (String name : file.list()) {
+            if (name.equals(fileName))
+                return true;
+        }
+        return false;
+    }
+
+    private static int getLatestApi(File apis) {
+        int apiLevel = 0;
+        for (File api : apis.listFiles()) {
+            int level = readAPIVersion(api);
+            if (level > apiLevel)
+                apiLevel = level;
+        }
+        return apiLevel;
+    }
+
+    private static int readAPIVersion(File parentFile) {
+        File properties = new File(parentFile, "source.properties");
+        FileReader reader;
+        BufferedReader buffer;
+        try {
+            reader = new FileReader(properties);
+            buffer = new BufferedReader(reader);
+
+            String line = null;
+
+            while ((line = buffer.readLine()) != null) {
+                if (line.contains("AndroidVersion.ApiLevel")) {
+
+                    String versionString = line.split("\\=")[1];
+                    int apiLevel = Integer.parseInt(versionString);
+
+                    buffer.close();
+                    reader.close();
+
+                    return apiLevel;
+                }
+            }
+        } catch (IOException | NumberFormatException e) {
+            EditorLogger.printStackTrace(e);
+        }
+
+        return 0;
+    }
+
+    public void build(String outputDir, String appName, String packageName, String mainClass, String sdkLocation,
+                      boolean spinePlugin) throws IOException {
+        ProjectSetup project = new ProjectSetup();
+
+        String packageDir = packageName.replace('.', '/');
+        String sdkPath = null;
+
+        if (sdkLocation != null && !sdkLocation.isEmpty())
+            sdkPath = sdkLocation.replace('\\', '/');
+
+        if (!isSdkLocationValid(sdkLocation)) {
+            EditorLogger.error("Android SDK location '" + sdkLocation + "' doesn't contain an SDK");
+        } else if (!isSdkUpToDate(sdkLocation)) {
+            // SHOW THE ANDROID SDK MANAGER??
+        }
+
+        // root dir/gradle files
+        project.files.add(new ProjectFile("gitignore", ".gitignore", false));
+        project.files.add(new ProjectFile("settings.gradle", false));
+        project.files.add(new ProjectFile("gradlew", false));
+        project.files.add(new ProjectFile("gradlew.bat", false));
+        project.files.add(new ProjectFile("gradle/wrapper/gradle-wrapper.jar", false));
+        project.files.add(new ProjectFile("gradle/wrapper/gradle-wrapper.properties", false));
+        project.files.add(new ProjectFile("gradle.properties"));
+        project.files.add(new ProjectFile("build.gradle", false));
+
+        // core project
+        project.files.add(new ProjectFile("core/build.gradle"));
+        new File(outputDir + "/core/src/main/java").mkdirs();
+
+        // DESKTOP project
+        project.files.add(new ProjectFile("desktop/build.gradle"));
+        project.files.add(new ProjectFile("desktop/src/DesktopLauncher",
+                "desktop/src/main/java/com/bladecoder/engine/DesktopLauncher.java", true));
+
+        project.files.add(
+                new ProjectFile("desktop/src/icons/icon16.png", "desktop/src/main/resources/icons/icon16.png", false));
+        project.files.add(
+                new ProjectFile("desktop/src/icons/icon32.png", "desktop/src/main/resources/icons/icon32.png", false));
+        project.files.add(new ProjectFile("desktop/src/icons/icon128.png",
+                "desktop/src/main/resources/icons/icon128.png", false));
+
+        // Assets
+        String assetPath = "assets";
+
+        // CREATE ASSETS EMPTY FOLDERS
+        new File(outputDir + "/" + assetPath + "/atlases/1").mkdirs();
+        new File(outputDir + "/" + assetPath + "/images/1").mkdirs();
+        new File(outputDir + "/" + assetPath + "/model").mkdirs();
+        new File(outputDir + "/" + assetPath + "/music").mkdirs();
+        new File(outputDir + "/" + assetPath + "/sounds").mkdirs();
+        new File(outputDir + "/" + assetPath + "/spine").mkdirs();
+        new File(outputDir + "/" + assetPath + "/voices").mkdirs();
+        new File(outputDir + "/" + assetPath + "/particles").mkdirs();
+        new File(outputDir + "/" + assetPath + "/tests").mkdirs();
+        new File(outputDir + "/" + assetPath + "/ui/1").mkdirs();
+        new File(outputDir + "/" + assetPath + "/ui/fonts").mkdirs();
+
+        project.files.add(new ProjectFile("assets/model/00.chapter.json", assetPath + "/model/00.chapter.json", false));
+        project.files.add(new ProjectFile("assets/model/00.properties", assetPath + "/model/00.properties", false));
+        project.files
+                .add(new ProjectFile("assets/model/world.properties", assetPath + "/model/world.properties", false));
+        project.files.add(new ProjectFile("assets/model/world", assetPath + "/model/world", false));
+        project.files.add(
+                new ProjectFile("assets/model/world_es.properties", assetPath + "/model/world_es.properties", false));
+
+        project.files.add(new ProjectFile("assets/ui/credits.txt", assetPath + "/ui/credits.txt", false));
+        project.files
+                .add(new ProjectFile("assets/ui/fonts/PaytoneOne.ttf", assetPath + "/ui/fonts/PaytoneOne.ttf", false));
+        project.files.add(new ProjectFile("assets/ui/fonts/ArchitectsDaughter.ttf",
+                assetPath + "/ui/fonts/ArchitectsDaughter.ttf", false));
+        project.files.add(
+                new ProjectFile("assets/ui/fonts/Roboto-Black.ttf", assetPath + "/ui/fonts/Roboto-Black.ttf", false));
+        project.files.add(new ProjectFile("assets/ui/fonts/Roboto-Regular.ttf",
+                assetPath + "/ui/fonts/Roboto-Regular.ttf", false));
+        project.files.add(
+                new ProjectFile("assets/ui/fonts/Roboto-Thin.ttf", assetPath + "/ui/fonts/Roboto-Thin.ttf", false));
+        project.files.add(new ProjectFile("assets/ui/fonts/Ubuntu-M.ttf", assetPath + "/ui/fonts/Ubuntu-M.ttf", false));
+        project.files.add(new ProjectFile("assets/ui/ui.json", assetPath + "/ui/ui.json", false));
+
+        project.files.add(new ProjectFile("assets/ui/1/blade_logo.png", assetPath + "/ui/1/blade_logo.png", false));
+        project.files.add(new ProjectFile("assets/ui/1/helpDesktop.png", assetPath + "/ui/1/helpDesktop.png", false));
+        project.files
+                .add(new ProjectFile("assets/ui/1/helpDesktop_es.png", assetPath + "/ui/1/helpDesktop_es.png", false));
+        project.files.add(new ProjectFile("assets/ui/1/helpPie.png", assetPath + "/ui/1/helpPie.png", false));
+        project.files.add(new ProjectFile("assets/ui/1/helpPie_es.png", assetPath + "/ui/1/helpPie_es.png", false));
+        project.files.add(new ProjectFile("assets/ui/1/libgdx_logo.png", assetPath + "/ui/1/libgdx_logo.png", false));
+        project.files.add(new ProjectFile("assets/ui/1/ui.atlas", assetPath + "/ui/1/ui.atlas", false));
+        project.files.add(new ProjectFile("assets/ui/1/ui.png", assetPath + "/ui/1/ui.png", false));
+
+        project.files
+                .add(new ProjectFile("assets/BladeEngine.properties", assetPath + "/BladeEngine.properties", false));
+
+        // ANDROID project
+        project.files.add(new ProjectFile("android/res/values/strings.xml"));
+        project.files.add(new ProjectFile("android/res/values/styles.xml", false));
+        project.files.add(new ProjectFile("android/res/drawable-hdpi/ic_launcher.png", false));
+        project.files.add(new ProjectFile("android/res/drawable-mdpi/ic_launcher.png", false));
+        project.files.add(new ProjectFile("android/res/drawable-xhdpi/ic_launcher.png", false));
+        project.files.add(new ProjectFile("android/res/drawable-xxhdpi/ic_launcher.png", false));
+        project.files.add(new ProjectFile("android/res/drawable-xxxhdpi/ic_launcher.png", false));
+        project.files.add(new ProjectFile("android/src/AndroidLauncher",
+                "android/src/main/java/com/bladecoder/engine/AndroidLauncher.java", true));
+        project.files.add(new ProjectFile("android/AndroidManifest.xml"));
+        project.files.add(new ProjectFile("android/src/expansion/AndroidManifest.xml"));
+        project.files.add(new ProjectFile("android/build.gradle", true));
+        project.files.add(new ProjectFile("android/ic_launcher-web.png", false));
+        project.files.add(new ProjectFile("android/proguard-rules.pro", false));
+
+        if (sdkLocation != null)
+            project.files.add(new ProjectFile("local.properties", true));
+
+        // IOS ROBOVM
+        project.files.add(new ProjectFile("ios/src/IOSLauncher",
+                "ios/src/main/java/com/bladecoder/engine/IOSLauncher.java", true));
+        project.files.add(new ProjectFile("ios/data/Default.png", false));
+        project.files.add(new ProjectFile("ios/data/Default@2x.png", false));
+        project.files.add(new ProjectFile("ios/data/Default@2x~ipad.png", false));
+        project.files.add(new ProjectFile("ios/data/Default-568h@2x.png", false));
+        project.files.add(new ProjectFile("ios/data/Default~ipad.png", false));
+        project.files.add(new ProjectFile("ios/data/Default-375w-667h@2x.png", false));
+        project.files.add(new ProjectFile("ios/data/Default-414w-736h@3x.png", false));
+        project.files.add(new ProjectFile("ios/data/Default-1024w-1366h@2x~ipad.png", false));
+        project.files.add(new ProjectFile("ios/data/Default-375w-812h@3x.png", false));
+
+        project.files.add(new ProjectFile("ios/data/Media.xcassets/Contents.json", false));
+        project.files
+                .add(new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/app-store-icon-1024@1x.png", false));
+        project.files.add(new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/Contents.json", false));
+        project.files.add(new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@1x.png", false));
+        project.files.add(new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@2x.png", false));
+        project.files.add(
+                new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@1x.png", false));
+        project.files.add(
+                new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@2x.png", false));
+        project.files.add(
+                new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/ipad-pro-app-icon-83.5@2x.png", false));
+        project.files
+                .add(new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@1x.png", false));
+        project.files
+                .add(new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@2x.png", false));
+        project.files.add(
+                new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@1x.png", false));
+        project.files.add(
+                new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@2x.png", false));
+        project.files
+                .add(new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@2x.png", false));
+        project.files
+                .add(new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@3x.png", false));
+        project.files.add(new ProjectFile(
+                "ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@2x.png", false));
+        project.files.add(new ProjectFile(
+                "ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@3x.png", false));
+        project.files.add(
+                new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@2x.png", false));
+        project.files.add(
+                new ProjectFile("ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@3x.png", false));
+        project.files.add(new ProjectFile(
+                "ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@2x.png", false));
+        project.files.add(new ProjectFile(
+                "ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@3x.png", false));
+
+        project.files.add(new ProjectFile("ios/build.gradle", true));
+        project.files.add(new ProjectFile("ios/Info.plist.xml", false));
+        project.files.add(new ProjectFile("ios/robovm.properties"));
+        project.files.add(new ProjectFile("ios/robovm.xml", true));
+
+        Map<String, String> values = new HashMap<>();
+        values.put("%APP_NAME%", appName);
+        values.put("%APP_NAME_ESCAPED%", appName.replace("'", "\\'"));
+        values.put("%PACKAGE%", packageName);
+        values.put("%PACKAGE_DIR%", packageDir);
+        values.put("%MAIN_CLASS%", mainClass);
+        values.put("%USE_SPINE%", Boolean.toString(spinePlugin));
+
+        if (sdkPath != null)
+            values.put("%ANDROID_SDK%", sdkPath);
+
+        values.put("%ASSET_PATH%", assetPath);
+        values.put("%API_LEVEL%", Versions.getAndroidAPILevel());
+
+        values.put("%BLADE_ENGINE_VERSION%", Versions.getVersion());
+        values.put("%LIBGDX_VERSION%", Versions.getLibgdxVersion());
+        values.put("%ROBOVM_VERSION%", Versions.getRoboVMVersion());
+
+        values.put("%ANDROID_GRADLE_PLUGIN_VERSION%", Versions.getAndroidGradlePluginVersion());
+
+        values.put("%BLADE_INK_VERSION%", Versions.getBladeInkVersion());
+
+        copyAndReplace(outputDir, project, values);
+
+        // HACK executable flag isn't preserved for whatever reason...
+        new File(outputDir, "gradlew").setExecutable(true);
+
+        RunProccess.runGradle(new File(outputDir), "desktop:clean");
+    }
+
+    private void copyAndReplace(String outputDir, ProjectSetup project, Map<String, String> values) throws IOException {
+        File out = new File(outputDir);
+        if (!out.exists() && !out.mkdirs()) {
+            throw new RuntimeException("Couldn't create output directory '" + out.getAbsolutePath() + "'");
+        }
+
+        for (ProjectFile file : project.files) {
+            copyFile(file, out, values);
+        }
+    }
+
+    private byte[] readResource(String resource, String path) {
+        InputStream in = null;
+        try {
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024 * 10];
+            in = BladeEngineSetup.class.getResourceAsStream(path + resource);
+            if (in == null)
+                throw new RuntimeException("Couldn't read resource '" + resource + "'");
+            int read = 0;
+            while ((read = in.read(buffer)) > 0) {
+                bytes.write(buffer, 0, read);
+            }
+            return bytes.toByteArray();
+        } catch (IOException e) {
+            throw new RuntimeException("Couldn't read resource '" + resource + "'", e);
+        } finally {
+            if (in != null)
+                try {
+                    in.close();
+                } catch (IOException e) {
+                }
+        }
+    }
+
+    private byte[] readResource(File file) throws IOException {
+        InputStream in = null;
+        try {
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024 * 10];
+            in = new FileInputStream(file);
+            int read = 0;
+            while ((read = in.read(buffer)) > 0) {
+                bytes.write(buffer, 0, read);
+            }
+            return bytes.toByteArray();
+        } catch (Exception e) {
+            throw new IOException("Couldn't read resource '" + file.getAbsoluteFile() + "'", e);
+        } finally {
+            if (in != null)
+                try {
+                    in.close();
+                } catch (IOException e) {
+                }
+        }
+    }
+
+    private String readResourceAsString(String resource, String path) {
+        try {
+            return new String(readResource(resource, path), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private String readResourceAsString(File file) throws IOException {
+        try {
+            return new String(readResource(file), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void writeFile(File outFile, byte[] bytes) {
+        OutputStream out = null;
+
+        try {
+            out = new BufferedOutputStream(new FileOutputStream(outFile));
+            out.write(bytes);
+        } catch (IOException e) {
+            throw new RuntimeException("Couldn't write file '" + outFile.getAbsolutePath() + "'", e);
+        } finally {
+            if (out != null)
+                try {
+                    out.close();
+                } catch (IOException e) {
+                }
+        }
+    }
+
+    private void writeFile(File outFile, String text) {
+        try {
+            writeFile(outFile, text.getBytes("UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void copyFile(ProjectFile file, File out, Map<String, String> values) throws IOException {
+        File outFile = new File(out, file.outputName);
+        if (!outFile.getParentFile().exists() && !outFile.getParentFile().mkdirs()) {
+            throw new RuntimeException("Couldn't create dir '" + outFile.getAbsolutePath() + "'");
+        }
+
+        boolean isTemp = file instanceof TemporaryProjectFile;
+
+        if (file.isTemplate) {
+            String txt;
+            if (isTemp) {
+                txt = readResourceAsString(((TemporaryProjectFile) file).file);
+            } else {
+                txt = readResourceAsString(file.resourceName, file.resourceLoc);
+            }
+            txt = replace(txt, values);
+            writeFile(outFile, txt);
+        } else {
+            if (isTemp) {
+                writeFile(outFile, readResource(((TemporaryProjectFile) file).file));
+            } else {
+                writeFile(outFile, readResource(file.resourceName, file.resourceLoc));
+            }
+        }
+    }
+
+    private String replace(String txt, Map<String, String> values) {
+        for (String key : values.keySet()) {
+            String value = values.get(key);
+            txt = txt.replace(key, value);
+        }
+        return txt;
+    }
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/ProjectFile.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/ProjectFile.java
similarity index 96%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/ProjectFile.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/ProjectFile.java
index 3fd6b1f1d..c19aea56e 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/ProjectFile.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/ProjectFile.java
@@ -17,7 +17,7 @@
 package com.bladecoder.engineeditor.setup;
 
 /**
- * A file in a {@link Project}, the resourceName specifies the location
+ * A file in a {@link ProjectSetup}, the resourceName specifies the location
  * of the template file, the outputName specifies the final name of the
  * file relative to its project, the isTemplate field specifies if 
  * values need to be replaced in this file or not.
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/Project.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/ProjectSetup.java
similarity index 97%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/Project.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/ProjectSetup.java
index feac73741..7143d09b4 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/Project.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/ProjectSetup.java
@@ -1,17 +1,17 @@
-/*******************************************************************************
- * Copyright 2011 See AUTHORS file.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*******************************************************************************
+ * Copyright 2011 See AUTHORS file.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  ******************************************************************************/
 
 package com.bladecoder.engineeditor.setup;
@@ -27,7 +27,7 @@
  * @author badlogic
  *
  */
-public class Project {
+public class ProjectSetup {
 	/** list of files, relative to project directory **/
 	public List<ProjectFile> files = new ArrayList<ProjectFile>();
 }
\ No newline at end of file
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/TemporaryProjectFile.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/TemporaryProjectFile.java
similarity index 98%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/TemporaryProjectFile.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/TemporaryProjectFile.java
index 62c10a25d..f4059cab7 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/setup/TemporaryProjectFile.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/setup/TemporaryProjectFile.java
@@ -19,7 +19,7 @@
 import java.io.File;
 
 /**
- * A temporary file that wraps {@link ProjectFile} for use in a {@link Project}
+ * A temporary file that wraps {@link ProjectFile} for use in a {@link ProjectSetup}
  * @author Tomski
  *
  */
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActionList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActionList.java
new file mode 100644
index 000000000..24b6ad217
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActionList.java
@@ -0,0 +1,755 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.lang.reflect.Field;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.utils.Array;
+import com.bladecoder.engine.actions.AbstractControlAction;
+import com.bladecoder.engine.actions.AbstractIfAction;
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.ActorAnimationRef;
+import com.bladecoder.engine.actions.CommentAction;
+import com.bladecoder.engine.actions.DisableActionAction;
+import com.bladecoder.engine.actions.EndAction;
+import com.bladecoder.engine.actions.SceneActorRef;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.ModelList;
+import com.bladecoder.engineeditor.ui.panels.ScopePanel;
+import com.bladecoder.engineeditor.undo.UndoDeleteAction;
+
+public class ActionList extends ModelList<Verb, Action> {
+	private static final String CONTROL_ACTION_ID_ATTR = "caID";
+
+	Skin skin;
+
+	private ImageButton upBtn;
+	private ImageButton downBtn;
+
+	private ImageButton disableBtn;
+
+	private String scope;
+
+	private final List<Action> multiClipboard = new ArrayList<Action>();
+
+	public ActionList(Skin skin) {
+		super(skin, false);
+		this.skin = skin;
+
+		setCellRenderer(listCellRenderer);
+
+		disableBtn = new ImageButton(skin);
+		toolbar.addToolBarButton(disableBtn, "ic_eye", "Enable/Disable", "Enable/Disable");
+
+		disableBtn.setDisabled(false);
+
+		disableBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				toggleEnabled();
+			}
+		});
+
+		upBtn = new ImageButton(skin);
+		downBtn = new ImageButton(skin);
+
+		toolbar.addToolBarButton(upBtn, "ic_up", "Move up", "Move up");
+		toolbar.addToolBarButton(downBtn, "ic_down", "Move down", "Move down");
+		toolbar.pack();
+
+		list.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				int pos = list.getSelectedIndex();
+
+				toolbar.disableEdit(pos == -1);
+				disableBtn.setDisabled(pos == -1);
+				upBtn.setDisabled(pos == -1 || pos == 0);
+				downBtn.setDisabled(pos == -1 || pos == list.getItems().size - 1);
+			}
+		});
+
+		list.getSelection().setMultiple(true);
+
+		upBtn.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				up();
+			}
+		});
+
+		downBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				down();
+			}
+		});
+
+		Ctx.project.addPropertyChangeListener(Project.NOTIFY_ELEMENT_CREATED, new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+				if (evt.getNewValue() instanceof Action && !(evt.getSource() instanceof EditActionDialog)) {
+					addElements(parent, parent.getActions());
+				}
+			}
+		});
+	}
+
+	private void toggleEnabled() {
+
+		if (list.getSelection().size() <= 0)
+			return;
+
+		Array<Action> sel = new Array<Action>();
+
+		for (Action a : list.getSelection().toArray()) {
+
+			// CONTROL ACTIONS CAN'T BE DISABLED
+			if (a == null || isControlAction(a))
+				continue;
+
+			Array<Action> items = list.getItems();
+			int pos = items.indexOf(a, true);
+
+			if (a instanceof DisableActionAction) {
+				Action a2 = ((DisableActionAction) a).getAction();
+				parent.getActions().set(pos, a2);
+				items.set(pos, a2);
+				sel.add(a2);
+			} else {
+				DisableActionAction a2 = new DisableActionAction();
+				a2.setAction(a);
+				parent.getActions().set(pos, a2);
+				items.set(pos, a2);
+				sel.add(a2);
+			}
+		}
+
+		Ctx.project.setModified();
+		list.getSelection().clear();
+		list.getSelection().addAll(sel);
+	}
+
+	@Override
+	protected EditModelDialog<Verb, Action> getEditElementDialogInstance(Action e) {
+		EditActionDialog editActionDialog = new EditActionDialog(skin, parent, e, scope, list.getSelectedIndex());
+
+		return editActionDialog;
+	}
+
+	public void setScope(String scope) {
+		this.scope = scope;
+	}
+
+	@Override
+	protected void create() {
+		EditModelDialog<Verb, Action> dialog = getEditElementDialogInstance(null);
+		dialog.show(getStage());
+		dialog.setListener(new ChangeListener() {
+			@SuppressWarnings("unchecked")
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				int pos = list.getSelectedIndex() + 1;
+
+				Action e = ((EditModelDialog<Verb, Action>) actor).getElement();
+				list.getItems().insert(pos, e);
+				parent.getActions().add(pos, e);
+
+				list.getSelection().choose(list.getItems().get(pos));
+
+				if (isControlAction(e)) {
+					insertEndAction(pos + 1, getOrCreateControlActionId((AbstractControlAction) e));
+
+					if (e instanceof AbstractIfAction)
+						insertEndAction(pos + 2, getOrCreateControlActionId((AbstractControlAction) e));
+				}
+
+				list.invalidateHierarchy();
+			}
+		});
+	}
+
+	private Action editedElement;
+
+	@Override
+	protected void edit() {
+
+		Action e = list.getSelected();
+
+		if (e == null || e instanceof EndAction || e instanceof DisableActionAction)
+			return;
+
+		editedElement = (Action) ElementUtils.cloneElement(e);
+
+		EditModelDialog<Verb, Action> dialog = getEditElementDialogInstance(e);
+		dialog.show(getStage());
+		dialog.setListener(new ChangeListener() {
+			@SuppressWarnings("unchecked")
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				Action e = ((EditModelDialog<Verb, Action>) actor).getElement();
+				int pos = list.getSelectedIndex();
+				list.getItems().set(pos, e);
+				parent.getActions().set(pos, e);
+
+				Ctx.project.setModified();
+
+				if (isControlAction(editedElement)) {
+					if (!editedElement.getClass().getName().equals(e.getClass().getName())) {
+
+						deleteControlAction(pos, (AbstractControlAction) editedElement);
+
+						if (isControlAction(e)) {
+							insertEndAction(pos + 1,
+									getOrCreateControlActionId((AbstractControlAction) e));
+
+							if (e instanceof AbstractIfAction)
+								insertEndAction(pos + 2,
+										getOrCreateControlActionId((AbstractControlAction) e));
+						}
+					} else {
+						// insert previous caId
+						try {
+							ActionUtils.setParam(e, CONTROL_ACTION_ID_ATTR,
+									getOrCreateControlActionId((AbstractControlAction) editedElement));
+						} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e1) {
+							EditorLogger.error(e1.getMessage());
+						}
+					}
+				}
+			}
+		});
+	}
+
+	private String getOrCreateControlActionId(AbstractControlAction a) {
+		String id = a.getControlActionID();
+
+		if (id == null || id.isEmpty()) {
+			id = Integer.toString(MathUtils.random(1, Integer.MAX_VALUE));
+			try {
+				ActionUtils.setParam(a, CONTROL_ACTION_ID_ATTR, id);
+			} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+				EditorLogger.error(e.getMessage());
+			}
+		}
+
+		return id;
+	}
+
+	private void insertEndAction(int pos, String id) {
+		final Action e = new EndAction();
+
+		try {
+			ActionUtils.setParam(e, CONTROL_ACTION_ID_ATTR, id);
+		} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e1) {
+			EditorLogger.error(e1.getMessage());
+		}
+
+		list.getItems().insert(pos, e);
+		parent.getActions().add(pos, e);
+	}
+
+	@Override
+	protected void copy() {
+		if (parent == null || list.getSelection().size() == 0)
+			return;
+
+		multiClipboard.clear();
+
+		for (Action e : getSortedSelection()) {
+
+			if (e == null || e instanceof EndAction)
+				return;
+
+			Action cloned = (Action) ElementUtils.cloneElement(e);
+			multiClipboard.add(cloned);
+			toolbar.disablePaste(false);
+
+			// TRANSLATIONS
+			if (scope.equals(ScopePanel.WORLD_SCOPE))
+				Ctx.project.getI18N().putTranslationsInElement(cloned, true);
+			else
+				Ctx.project.getI18N().putTranslationsInElement(cloned, false);
+		}
+	}
+
+	@Override
+	protected void paste() {
+
+		if (parent == null || multiClipboard.size() == 0)
+			return;
+
+		Array<Action> sel = new Array<Action>();
+
+		for (int i = multiClipboard.size() - 1; i >= 0; i--) {
+			Action newElement = (Action) ElementUtils.cloneElement(multiClipboard.get(i));
+
+			int pos = list.getSelectedIndex() + 1;
+
+			list.getItems().insert(pos, newElement);
+			parent.getActions().add(pos, newElement);
+
+			if (scope.equals(ScopePanel.WORLD_SCOPE))
+				Ctx.project.getI18N().extractStrings(null, null, parent.getHashKey(), pos, newElement);
+			else if (scope.equals(ScopePanel.SCENE_SCOPE))
+				Ctx.project.getI18N().extractStrings(Ctx.project.getSelectedScene().getId(), null, parent.getHashKey(),
+						pos, newElement);
+			else
+				Ctx.project.getI18N().extractStrings(Ctx.project.getSelectedScene().getId(),
+						Ctx.project.getSelectedActor().getId(), parent.getHashKey(), pos, newElement);
+
+			list.invalidateHierarchy();
+
+			if (isControlAction(newElement)) {
+				try {
+					ActionUtils.setParam(newElement, CONTROL_ACTION_ID_ATTR, null);
+				} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+					EditorLogger.error(e.getMessage());
+				}
+
+				insertEndAction(pos + 1, getOrCreateControlActionId((AbstractControlAction) newElement));
+
+				if (newElement instanceof AbstractIfAction)
+					insertEndAction(pos + 2, getOrCreateControlActionId((AbstractControlAction) newElement));
+			}
+
+			sel.add(newElement);
+		}
+
+		list.getSelection().clear();
+		list.getSelection().addAll(sel);
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void delete() {
+		if (list.getSelection().size() == 0)
+			return;
+
+		multiClipboard.clear();
+
+		int pos = list.getSelectedIndex();
+
+		for (Action e : getSortedSelection()) {
+
+			if (e instanceof EndAction)
+				continue;
+
+			int pos2 = list.getItems().indexOf(e, true);
+			list.getItems().removeValue(e, true);
+
+			int idx = parent.getActions().indexOf(e);
+
+			parent.getActions().remove(e);
+
+			multiClipboard.add(e);
+
+			// TRANSLATIONS
+			if (scope.equals(ScopePanel.WORLD_SCOPE))
+				Ctx.project.getI18N().putTranslationsInElement(e, true);
+			else
+				Ctx.project.getI18N().putTranslationsInElement(e, false);
+
+			// UNDO
+			Ctx.project.getUndoStack().add(new UndoDeleteAction(parent, e, idx));
+
+			if (isControlAction(e))
+				deleteControlAction(pos2, (AbstractControlAction) e);
+
+		}
+
+		if (list.getItems().size == 0) {
+			list.getSelection().clear();
+		} else if (pos >= list.getItems().size) {
+			list.getSelection().choose(list.getItems().get(list.getItems().size - 1));
+		} else {
+			list.getSelection().choose(list.getItems().get(pos));
+		}
+
+		toolbar.disablePaste(false);
+
+		Ctx.project.setModified();
+	}
+
+	private Array<Action> getSortedSelection() {
+		Array<Action> array = list.getSelection().toArray();
+
+		array.sort(new Comparator<Action>() {
+
+			@Override
+			public int compare(Action arg0, Action arg1) {
+				Integer i0 = list.getItems().indexOf(arg0, true);
+				Integer i1 = list.getItems().indexOf(arg1, true);
+
+				return i0.compareTo(i1);
+			}
+
+		});
+		
+		return array;
+	}
+
+	private boolean isControlAction(Action e) {
+		return e instanceof AbstractControlAction;
+	}
+
+	private void deleteControlAction(int pos, final AbstractControlAction e) {
+		final String id = getOrCreateControlActionId(e);
+
+		if (e instanceof AbstractIfAction) {
+			pos = deleteFirstActionNamed(pos, id);
+		}
+
+		deleteFirstActionNamed(pos, id);
+	}
+
+	private int deleteFirstActionNamed(int pos, String actionId) {
+		while (!(list.getItems().get(pos) instanceof AbstractControlAction
+				&& getOrCreateControlActionId((AbstractControlAction) list.getItems().get(pos)).equals(actionId)))
+			pos++;
+
+		Action e2 = list.getItems().removeIndex(pos);
+		parent.getActions().remove(e2);
+
+		return pos;
+	}
+
+	private void up() {
+		if (parent == null || list.getSelection().size() == 0)
+			return;
+
+		Array<Action> sel = new Array<Action>();
+
+		for (Action a : getSortedSelection()) {
+			
+			int pos = list.getItems().indexOf(a, true);
+
+			if (pos == -1 || pos == 0)
+				return;
+
+			Array<Action> items = list.getItems();
+			Action e = items.get(pos);
+			Action e2 = items.get(pos - 1);
+
+			sel.add(e);
+
+			if (isControlAction(e) && isControlAction(e2)) {
+				continue;
+			}
+
+			parent.getActions().set(pos - 1, e);
+			parent.getActions().set(pos, e2);
+
+			items.set(pos - 1, e);
+			items.set(pos, e2);
+		}
+
+		list.getSelection().clear();
+		list.getSelection().addAll(sel);
+		upBtn.setDisabled(list.getSelectedIndex() == 0);
+		downBtn.setDisabled(list.getSelectedIndex() == list.getItems().size - 1);
+
+		Ctx.project.setModified();
+	}
+
+	private void down() {
+		if (parent == null || list.getSelection().size() == 0)
+			return;
+
+		Array<Action> sel = new Array<Action>();
+
+		Array<Action> sortedSelection = getSortedSelection();
+
+		for (int i = sortedSelection.size - 1; i >= 0; i--) {
+
+			int pos = list.getItems().indexOf(sortedSelection.get(i), true);
+
+			Array<Action> items = list.getItems();
+
+			if (pos == -1 || pos == items.size - 1)
+				return;
+
+			Action e = items.get(pos);
+			Action e2 = items.get(pos + 1);
+
+			sel.add(e);
+
+			if (isControlAction(e) && isControlAction(e2)) {
+				continue;
+			}
+
+			parent.getActions().set(pos + 1, e);
+			parent.getActions().set(pos, e2);
+
+			items.set(pos + 1, e);
+			items.set(pos, e2);
+		}
+
+		list.getSelection().clear();
+		list.getSelection().addAll(sel);
+		upBtn.setDisabled(list.getSelectedIndex() == 0);
+		downBtn.setDisabled(list.getSelectedIndex() == list.getItems().size - 1);
+
+		Ctx.project.setModified();
+	}
+
+	// -------------------------------------------------------------------------
+	// ListCellRenderer
+	// -------------------------------------------------------------------------
+	private final CellRenderer<Action> listCellRenderer = new CellRenderer<Action>() {
+
+		@Override
+		protected String getCellTitle(Action a) {
+			boolean enabled = true;
+
+			if (a instanceof CommentAction) {
+				String comment = null;
+				
+				try {
+					comment = ActionUtils.getStringValue(a, "comment");
+				} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+					EditorLogger.error(e.getMessage());
+				}
+				
+				if(comment == null)
+					comment = "COMMENT";
+				else if(comment.indexOf('\n') != -1) {
+					comment = comment.substring(0, comment.indexOf('\n'));
+				}
+				
+				return "[YELLOW]" + comment + "[]";
+			}
+			
+			if (a instanceof DisableActionAction) {
+				a = ((DisableActionAction) a).getAction();
+				enabled = false;
+			}
+
+			String id = ActionUtils.getName(a.getClass());
+
+			if (id == null)
+				id = a.getClass().getCanonicalName();
+
+			Field field = ActionUtils.getField(a.getClass(), "actor");
+			String actor = null;
+
+			if (field != null) {
+				try {
+					field.setAccessible(true);
+					Object v = field.get(a);
+					if (v != null)
+						actor = v.toString();
+				} catch (IllegalArgumentException | IllegalAccessException e) {
+					EditorLogger.error(e.getMessage());
+				}
+			}
+
+			boolean animationAction = id.equals("Animation");
+			boolean controlAction = isControlAction(a);
+
+			if (!enabled && !controlAction) {
+				if (actor != null && !animationAction) {
+					SceneActorRef sa = new SceneActorRef(actor);
+
+					if (sa.getSceneId() != null)
+						id = MessageFormat.format("[GRAY]{0} {1}.{2}[]", sa.getSceneId(), sa.getActorId(), id);
+					else
+						id = MessageFormat.format("[GRAY]{0}.{1}[]", sa.getActorId(), id);
+				} else if (animationAction) {
+					field = ActionUtils.getField(a.getClass(), "animation");
+					String animation = null;
+
+					if (field != null) {
+						try {
+							field.setAccessible(true);
+							animation = field.get(a).toString();
+						} catch (IllegalArgumentException | IllegalAccessException e) {
+							EditorLogger.error(e.getMessage());
+						}
+					}
+
+					ActorAnimationRef aa = new ActorAnimationRef(animation);
+
+					if (aa.getActorId() != null)
+						id = MessageFormat.format("[GRAY]{0}.{1} {2}[]", aa.getActorId(), id, aa.getAnimationId());
+					else
+						id = MessageFormat.format("[GRAY]{0} {1}[]", id, aa.getAnimationId());
+				} else {
+					id = MessageFormat.format("[GRAY]{0}[]", id);
+				}
+
+			} else if (actor != null && !animationAction && !controlAction) {
+				SceneActorRef sa = new SceneActorRef(actor);
+
+				if (sa.getSceneId() != null)
+					id = MessageFormat.format("[GREEN]{0}[] {1}.{2}", sa.getSceneId(), sa.getActorId(), id);
+				else
+					id = MessageFormat.format("{0}.{1}", sa.getActorId(), id);
+			} else if (animationAction) {
+				field = ActionUtils.getField(a.getClass(), "animation");
+				String animation = null;
+
+				if (field != null) {
+					try {
+						field.setAccessible(true);
+						animation = field.get(a).toString();
+					} catch (IllegalArgumentException | IllegalAccessException e) {
+						EditorLogger.error(e.getMessage());
+					}
+				}
+
+				ActorAnimationRef aa = new ActorAnimationRef(animation);
+
+				if (aa.getActorId() != null)
+					id = MessageFormat.format("[GREEN]{0}.{1} {2}[]", aa.getActorId(), id, aa.getAnimationId());
+				else
+					id = MessageFormat.format("[GREEN]{0} {1}[]", id, aa.getAnimationId());
+			} else if (controlAction) {
+				if (a instanceof EndAction) {
+					Action parentAction = findParentAction((EndAction) a);
+
+					if (parentAction instanceof AbstractIfAction
+							&& isElse((AbstractIfAction) parentAction, (EndAction) a)) {
+						id = "Else";
+					} else {
+						id = "End" + ActionUtils.getName(parentAction.getClass());
+					}
+				}
+
+				if (actor != null) {
+					SceneActorRef sa = new SceneActorRef(actor);
+
+					if (sa.getSceneId() != null)
+						id = MessageFormat.format("[GREEN]{0}[] [BLUE]{1}.{2}[]", sa.getSceneId(), sa.getActorId(), id);
+					else
+						id = MessageFormat.format("[BLUE]{0}.{1}[BLUE]", sa.getActorId(), id);
+				} else
+					id = MessageFormat.format("[BLUE]{0}[]", id);
+			}
+
+			if(ActionUtils.isDeprecated(a.getClass()))
+				id = "[RED]D[] " + id;
+				
+			return id;
+		}
+
+		private boolean isElse(AbstractIfAction parentAction, EndAction ea) {
+			final String caID = ea.getControlActionID();
+			ArrayList<Action> actions = parent.getActions();
+
+			int idx = actions.indexOf(parentAction);
+
+			for (int i = idx + 1; i < actions.size(); i++) {
+				Action aa = actions.get(i);
+
+				if (isControlAction(aa) && ((AbstractControlAction) aa).getControlActionID().equals(caID)) {
+					if (aa == ea)
+						return true;
+
+					return false;
+				}
+			}
+
+			return false;
+		}
+
+		private Action findParentAction(EndAction a) {
+			final String caID = a.getControlActionID();
+			ArrayList<Action> actions = parent.getActions();
+
+			for (Action a2 : actions) {
+				if (isControlAction(a2) && ((AbstractControlAction) a2).getControlActionID().equals(caID)) {
+					return a2;
+				}
+			}
+
+			return null;
+		}
+
+		@Override
+		protected String getCellSubTitle(Action a) {
+			if (a instanceof CommentAction)
+				return "";
+			
+			if (a instanceof DisableActionAction)
+				a = ((DisableActionAction) a).getAction();
+
+			StringBuilder sb = new StringBuilder();
+
+			String[] params = ActionUtils.getFieldNames(a);
+			String actionName = ActionUtils.getName(a.getClass());
+
+			for (String p : params) {
+
+				if (p.equals("actor")
+						|| (actionName != null && actionName.equals("Animation") && p.equals("animation")))
+					continue;
+				
+				if(p.equals("caID"))
+					continue;
+
+				Field f = ActionUtils.getField(a.getClass(), p);
+
+				try {
+					final boolean accessible = f.isAccessible();
+					f.setAccessible(true);
+					Object o = f.get(a);
+					if (o == null)
+						continue;
+					String v = o.toString();
+
+					// Check world Scope for translations
+					if (scope.equals(ScopePanel.WORLD_SCOPE))
+						sb.append(p).append(": ")
+								.append(Ctx.project.getI18N().getWorldTranslation(v).replace("\n", "|")).append(' ');
+					else
+						sb.append(p).append(": ").append(Ctx.project.translate(v).replace("\n", "|")).append(' ');
+
+					f.setAccessible(accessible);
+				} catch (IllegalArgumentException | IllegalAccessException e) {
+					EditorLogger.error(e.getMessage());
+				}
+			}
+
+			return sb.toString();
+		}
+
+		@Override
+		protected boolean hasSubtitle() {
+			return true;
+		}
+	};
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActorList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActorList.java
new file mode 100644
index 000000000..813b556dd
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActorList.java
@@ -0,0 +1,385 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Event;
+import com.badlogic.gdx.scenes.scene2d.EventListener;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.*;
+import com.bladecoder.engine.spine.SpineRenderer;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.ModelList;
+import com.bladecoder.engineeditor.undo.UndoDeleteActor;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ActorList extends ModelList<Scene, BaseActor> {
+
+    private ImageButton playerBtn;
+    private ImageButton visibilityBtn;
+    private String filterText;
+
+    public ActorList(Skin skin) {
+        super(skin, true);
+
+        // Eye button
+        visibilityBtn = new ImageButton(skin);
+        toolbar.addToolBarButton(visibilityBtn, "ic_eye", "Toggle Visibility", "Toggle Visibility in editor");
+        visibilityBtn.setDisabled(false);
+        visibilityBtn.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                toggleVisibility();
+            }
+        });
+
+        // Player button
+        playerBtn = new ImageButton(skin);
+        toolbar.addToolBarButton(playerBtn, "ic_player_small", "Set player", "Set player");
+        playerBtn.setDisabled(true);
+        playerBtn.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                setPlayer();
+            }
+        });
+
+        TextField tf = toolbar.addFilterBox(new EventListener() {
+
+            @Override
+            public boolean handle(Event e) {
+                if (((TextField) e.getTarget()).getText() != filterText) {
+                    filterText = ((TextField) e.getTarget()).getText();
+
+                    addFilteredElements();
+                }
+
+                return false;
+            }
+
+        });
+
+        filterText = tf.getText();
+
+        list.addListener(new ChangeListener() {
+
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                // EditorLogger.debug("ACTOR LIST ELEMENT SELECTED");
+                int pos = list.getSelectedIndex();
+
+                if (pos == -1) {
+                    Ctx.project.setSelectedActor((BaseActor) null);
+                } else {
+                    BaseActor a = list.getItems().get(pos);
+                    Ctx.project.setSelectedActor(a);
+                }
+
+                toolbar.disableEdit(pos == -1);
+                playerBtn.setDisabled(pos == -1);
+            }
+        });
+
+        list.setCellRenderer(listCellRenderer);
+
+        Ctx.project.addPropertyChangeListener(Project.NOTIFY_ACTOR_SELECTED, new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent e) {
+                int pos = list.getSelectedIndex();
+
+                // Element newActor = (Element) e.getNewValue();
+                BaseActor newActor = Ctx.project.getSelectedActor();
+
+                if (newActor == null)
+                    return;
+
+                if (pos != -1) {
+                    BaseActor oldActor = list.getItems().get(pos);
+
+                    if (oldActor == newActor) {
+                        return;
+                    }
+                }
+
+                int i = list.getItems().indexOf(newActor, true);
+
+                if (i >= 0) {
+                    list.setSelectedIndex(i);
+
+                    container.getActor().setScrollPercentY(i / (float) list.getItems().size);
+                }
+            }
+        });
+
+        Ctx.project.addPropertyChangeListener(new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+
+                if (evt.getPropertyName().equals(Project.NOTIFY_ELEMENT_DELETED)) {
+                    if (evt.getNewValue() instanceof BaseActor) {
+                        addFilteredElements();
+                    }
+                } else if (evt.getPropertyName().equals(Project.NOTIFY_ELEMENT_CREATED)) {
+                    if (evt.getNewValue() instanceof BaseActor && !(evt.getSource() instanceof EditActorDialog)) {
+                        addFilteredElements();
+                    }
+                }
+            }
+        });
+    }
+
+    private void addFilteredElements() {
+
+        List<BaseActor> filtered = new ArrayList<>();
+
+        for (BaseActor a : Ctx.project.getSelectedScene().getActors().values()) {
+            if (filterText == null || filterText.isEmpty() || a.getId().contains(filterText)) {
+                filtered.add(a);
+            }
+        }
+
+        addElements(Ctx.project.getSelectedScene(), filtered);
+
+    }
+
+    private void toggleVisibility() {
+
+        BaseActor e = list.getSelected();
+
+        if (e == null)
+            return;
+
+        Ctx.project.toggleEditorVisibility(e);
+    }
+
+    @Override
+    protected void delete() {
+        BaseActor a = removeSelected();
+
+        parent.removeActor(a);
+
+        // delete player attr if the actor to delete is the player
+        if (parent.getPlayer() == a) {
+            parent.setPlayer(null);
+        }
+
+        if (a.getId().equals(parent.getWalkZone())) {
+            parent.setWalkZone(null);
+        }
+
+        // TRANSLATIONS
+        Ctx.project.getI18N().putTranslationsInElement(a);
+
+        // UNDO
+        Ctx.project.getUndoStack().add(new UndoDeleteActor(parent, a));
+
+        Ctx.project.setModified();
+    }
+
+    @Override
+    protected EditModelDialog<Scene, BaseActor> getEditElementDialogInstance(BaseActor a) {
+        return new EditActorDialog(skin, parent, a);
+    }
+
+    @Override
+    protected void edit() {
+        BaseActor e = list.getSelected();
+
+        if (e == null)
+            return;
+
+        EditModelDialog<Scene, BaseActor> dialog = getEditElementDialogInstance(e);
+        dialog.show(getStage());
+
+        dialog.setListener(new ChangeListener() {
+            @SuppressWarnings("unchecked")
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                BaseActor e = ((EditModelDialog<Scene, BaseActor>) actor).getElement();
+
+                // When the type is changed, a new element is created and it is needed to
+                // replace the previous element.
+                if (e != list.getSelected()) {
+                    int i = list.getSelectedIndex();
+                    getItems().set(i, e);
+                    list.setSelectedIndex(i);
+                    list.invalidateHierarchy();
+                }
+            }
+        });
+    }
+
+    private void setPlayer() {
+
+        int pos = list.getSelectedIndex();
+
+        if (pos == -1)
+            return;
+
+        BaseActor a = list.getItems().get(pos);
+
+        if (a instanceof CharacterActor) {
+            Ctx.project.getSelectedScene().setPlayer((CharacterActor) a);
+            Ctx.project.setModified();
+        }
+    }
+
+    @Override
+    protected void copy() {
+        BaseActor e = list.getSelected();
+
+        if (e == null)
+            return;
+
+        clipboard = (BaseActor) ElementUtils.cloneElement(e);
+        toolbar.disablePaste(false);
+
+        // TRANSLATIONS
+        Ctx.project.getI18N().putTranslationsInElement(clipboard);
+    }
+
+    @Override
+    protected void paste() {
+        BaseActor newElement = (BaseActor) ElementUtils.cloneElement(clipboard);
+
+        newElement.setId(
+                ElementUtils.getCheckedId(newElement.getId(), parent.getActors().keySet().toArray(new String[0])));
+
+        int pos = list.getSelectedIndex() + 1;
+
+        list.getItems().insert(pos, newElement);
+
+        parent.addActor(newElement);
+        Ctx.project.getI18N().extractStrings(parent.getId(), newElement);
+
+        if (newElement instanceof SpriteActor) {
+            SpriteActor ia = (SpriteActor) newElement;
+            ia.loadAssets();
+            EngineAssetManager.getInstance().finishLoading();
+            ia.retrieveAssets();
+        }
+
+        list.setSelectedIndex(pos);
+        list.invalidateHierarchy();
+
+        Ctx.project.setModified();
+    }
+
+    // -------------------------------------------------------------------------
+    // ListCellRenderer
+    // -------------------------------------------------------------------------
+    private final CellRenderer<BaseActor> listCellRenderer = new CellRenderer<BaseActor>() {
+
+        @Override
+        protected String getCellTitle(BaseActor e) {
+            boolean enabled = Ctx.project.isEditorVisible(e);
+
+            String text = e.getId();
+
+            if (!enabled) {
+                text = MessageFormat.format("[GRAY]{0}[]", text);
+            }
+
+            return text;
+        }
+
+        @Override
+        protected String getCellSubTitle(BaseActor e) {
+            boolean enabled = Ctx.project.isEditorVisible(e);
+
+            String text = "";
+
+            if (e instanceof SpriteActor && ((SpriteActor) e).getRenderer() instanceof TextRenderer
+                    && ((TextRenderer) ((SpriteActor) e).getRenderer()).getText() != null) {
+                text = Ctx.project.translate(((TextRenderer) ((SpriteActor) e).getRenderer()).getText()).replace("\n",
+                        "|");
+            }
+
+            if (e instanceof InteractiveActor) {
+                text = Ctx.project.translate(((InteractiveActor) e).getDesc());
+            }
+
+            if (!enabled && text != null && !text.isEmpty()) {
+                text = MessageFormat.format("[GRAY]{0}[]", text);
+            }
+
+            return text;
+        }
+
+        @Override
+        public TextureRegion getCellImage(BaseActor a) {
+
+            boolean isPlayer = (a.getScene().getPlayer() == a);
+            String u = null;
+
+            if (isPlayer) {
+                u = "ic_player";
+            } else if (a instanceof CharacterActor) {
+                u = "ic_character_actor";
+            } else if (a instanceof SpriteActor) {
+                ActorRenderer r = ((SpriteActor) a).getRenderer();
+
+                if (r instanceof ImageRenderer) {
+                    u = "ic_sprite_actor";
+                } else if (r instanceof AtlasRenderer) {
+                    u = "ic_sprite_actor";
+                } else if (r instanceof SpineRenderer) {
+                    u = "ic_spine";
+                } else if (r instanceof ParticleRenderer) {
+                    u = "ic_particles";
+                } else if (r instanceof TextRenderer) {
+                    u = "ic_text";
+                }
+            } else if (a instanceof InteractiveActor) {
+                u = "ic_base_actor";
+            } else if (a instanceof ObstacleActor) {
+                u = "ic_obstacle_actor";
+            } else if (a instanceof AnchorActor) {
+                u = "ic_anchor";
+            } else if (a instanceof WalkZoneActor) {
+                u = "ic_walkzone";
+            } else {
+                u = "ic_base_actor";
+            }
+
+            return Ctx.assetManager.getIcon(u);
+        }
+
+        @Override
+        protected boolean hasSubtitle() {
+            return true;
+        }
+
+        @Override
+        protected boolean hasImage() {
+            return true;
+        }
+    };
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActorPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActorPanel.java
new file mode 100644
index 000000000..4aa4c1d01
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActorPanel.java
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Arrays;
+import java.util.HashMap;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.HeaderPanel;
+import com.bladecoder.engineeditor.ui.panels.TabPanel;
+
+public class ActorPanel extends HeaderPanel {
+
+	private TabPanel tabPanel;
+	private VerbList verbList;
+	private DialogList dialogList;
+	private SpriteList faList;
+
+	public ActorPanel(Skin skin) {
+		super(skin, "ACTOR");
+		tabPanel = new TabPanel(skin);
+		verbList = new VerbList(skin);
+		dialogList = new DialogList(skin);
+		faList = new SpriteList(skin);
+//		props = new ActorProps(skin);
+
+		setContent(tabPanel);
+		tabPanel.addTab("Verbs", verbList);
+
+		Ctx.project.addPropertyChangeListener(Project.NOTIFY_ACTOR_SELECTED, new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent e) {
+				BaseActor a = (BaseActor) e.getNewValue();
+
+				String selTitle = tabPanel.getSelectedIndex() == -1 ? null
+						: tabPanel.getTitleAt(tabPanel.getSelectedIndex());
+				tabPanel.clear();
+
+				tabPanel.addTab("Verbs", verbList);
+
+				if (a != null) {
+
+					if (a instanceof SpriteActor && ((SpriteActor) a).getRenderer() instanceof AnimationRenderer)
+						tabPanel.addTab("Animations", faList);
+
+					if (a instanceof CharacterActor) {
+						tabPanel.addTab("Simple Dialogs", dialogList);
+					}
+
+//							tabPanel.addTab("Actor Props", props);
+					setTile("ACTOR " + a.getId());
+
+					// select previous selected tab
+					if (selTitle != null) {
+						for (int i = 0; i < tabPanel.getTabCount(); i++) {
+							if (tabPanel.getTitleAt(i).equals(selTitle)) {
+								tabPanel.setTab(i);
+							}
+						}
+					}
+				} else {
+					setTile("ACTOR");
+				}
+
+				if (a instanceof SpriteActor && ((SpriteActor) a).getRenderer() instanceof AnimationRenderer) {
+					HashMap<String, AnimationDesc> anims = ((AnimationRenderer) ((SpriteActor) a).getRenderer())
+							.getAnimations();
+					if (anims != null)
+						faList.addElements((SpriteActor) a,
+								Arrays.asList(anims.values().toArray(new AnimationDesc[0])));
+					else
+						faList.addElements((SpriteActor) a, null);
+				} else {
+					faList.addElements(null, null);
+				}
+
+				verbList.changeActor();
+
+				if (a instanceof CharacterActor) {
+
+					HashMap<String, Dialog> dialogs = ((CharacterActor) a).getDialogs();
+					if (dialogs != null)
+						dialogList.addElements((CharacterActor) a,
+								Arrays.asList(dialogs.values().toArray(new Dialog[0])));
+					else
+						dialogList.addElements((CharacterActor) a, null);
+				} else {
+					dialogList.addElements(null, null);
+				}
+
+//						props.setActorDocument(a);
+
+			}
+
+		});
+
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActorProps.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActorProps.java
new file mode 100644
index 000000000..9c3bb5cdf
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ActorProps.java
@@ -0,0 +1,161 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.PropertyTable;
+
+public class ActorProps extends PropertyTable {
+
+	public static final String DESC_PROP = "Description";
+	public static final String POS_X_PROP = "pos X";
+	public static final String POS_Y_PROP = "pos Y";
+	public static final String VISIBLE_PROP = "visible";
+	public static final String INTERACTION_PROP = "interaction";
+	public static final String STATE_PROP = "state";
+	public static final String BBOX_FROM_RENDERER_PROP = "Set BBOX from renderer";
+
+	private BaseActor actor;
+
+	// TableModelListener tableModelListener = new TableModelListener() {
+	// @Override
+	// public void tableChanged(TableModelEvent e) {
+	// if (e.getType() == TableModelEvent.UPDATE) {
+	// int row = e.getFirstRow();
+	// updateModel((String) propertyTable.getModel().getValueAt(row, 0),
+	// (String) propertyTable.getModel().getValueAt(row, 1));
+	// }
+	// }
+	// };
+
+	PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
+		@Override
+		public void propertyChange(PropertyChangeEvent evt) {
+			EditorLogger.debug("Actor Props Listener: " + evt.getPropertyName());
+
+			updateField(evt.getPropertyName());
+		}
+	};
+
+	public ActorProps(Skin skin) {
+		super(skin);
+	}
+
+	private void updateField(String modelProperty) {
+
+		if (actor == null)
+			return;
+
+		if (modelProperty.equals("desc")) {
+			setProperty(DESC_PROP, ((InteractiveActor) actor).getDesc());
+		} else if (modelProperty.equals(Project.POSITION_PROPERTY)) {
+			setProperty(POS_X_PROP, Float.toString(actor.getX()));
+			setProperty(POS_Y_PROP, Float.toString(actor.getY()));
+		} else if (modelProperty.equals("visible")) {
+			setProperty(VISIBLE_PROP, Boolean.toString(actor.isVisible()));
+		} else if (modelProperty.equals("interaction")) {
+			setProperty(INTERACTION_PROP, Boolean.toString(((InteractiveActor) actor).getInteraction()));
+		} else if (modelProperty.equals("state")) {
+			setProperty(STATE_PROP, ((InteractiveActor) actor).getState());
+		} else if (modelProperty.equals("bbox")) {
+
+			// TODO Conflict with scnwidget
+
+//			boolean v = value.isEmpty();
+
+//			setProperty(BBOX_FROM_RENDERER_PROP, Boolean.toString(v));
+		}
+	}
+
+	public void setActorDocument(BaseActor a) {
+		this.actor = a;
+		clearProps();
+
+		if (a != null) {
+			addProperty(POS_X_PROP, Float.toString(actor.getX()), Types.FLOAT);
+			addProperty(POS_Y_PROP, Float.toString(actor.getY()), Types.FLOAT);
+			addProperty(VISIBLE_PROP, Boolean.toString(actor.isVisible()), Types.BOOLEAN);
+
+			if (a instanceof InteractiveActor) {
+				addProperty(DESC_PROP, ((InteractiveActor) actor).getDesc());
+
+				addProperty(INTERACTION_PROP, Boolean.toString(((InteractiveActor) actor).getInteraction()),
+						Types.BOOLEAN);
+				addProperty(STATE_PROP, ((InteractiveActor) actor).getState());
+			}
+
+			if (a instanceof SpriteActor) {
+				boolean v = ((SpriteActor) a).isBboxFromRenderer();
+
+				addProperty(BBOX_FROM_RENDERER_PROP, Boolean.toString(v), Types.BOOLEAN);
+			}
+
+			Ctx.project.addPropertyChangeListener(propertyChangeListener);
+
+			invalidateHierarchy();
+		}
+	}
+
+	@Override
+	protected void updateModel(String property, String value) {
+		if (property.equals(DESC_PROP)) {
+			((InteractiveActor) actor).setDesc(value);
+		} else if (property.equals(POS_X_PROP)) {
+
+			// TODO UNDO
+//			UndoOp undoOp = new UndoSetAttr(Ctx.project.getSelectedChapter(), Ctx.project.getSelectedActor(), XMLConstants.POS_ATTR,
+//					Param.toStringParam(pos));
+//			Ctx.project.getUndoStack().add(undoOp);
+
+			try {
+				actor.setPosition(Float.parseFloat(value), actor.getY());
+			} catch (NumberFormatException e) {
+
+			}
+		} else if (property.equals(POS_Y_PROP)) {
+//			UndoOp undoOp = new UndoSetAttr(Ctx.project.getSelectedChapter(), Ctx.project.getSelectedActor(),XMLConstants.POS_ATTR,
+//					Param.toStringParam(pos));
+//			Ctx.project.getUndoStack().add(undoOp);
+			try {
+				actor.setPosition(actor.getX(), Float.parseFloat(value));
+			} catch (NumberFormatException e) {
+
+			}
+
+		} else if (property.equals(VISIBLE_PROP)) {
+			actor.setVisible(Boolean.parseBoolean(value));
+		} else if (property.equals(INTERACTION_PROP)) {
+			((InteractiveActor) actor).setInteraction(Boolean.parseBoolean(value));
+		} else if (property.equals(STATE_PROP)) {
+			((InteractiveActor) actor).setState(value);
+		} else if (property.equals(BBOX_FROM_RENDERER_PROP)) {
+			boolean v = true;
+			v = Boolean.parseBoolean(value);
+
+			((SpriteActor) actor).setBboxFromRenderer(v);
+		}
+
+	}
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/AssetPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/AssetPanel.java
similarity index 92%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/AssetPanel.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/AssetPanel.java
index f2015916a..f3a705440 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/AssetPanel.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/AssetPanel.java
@@ -21,8 +21,8 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.bladecoder.engineeditor.Ctx;
 import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.HeaderPanel;
-import com.bladecoder.engineeditor.ui.components.TabPanel;
+import com.bladecoder.engineeditor.ui.panels.HeaderPanel;
+import com.bladecoder.engineeditor.ui.panels.TabPanel;
 
 public class AssetPanel extends HeaderPanel {
 	private TabPanel tabPanel;
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/AssetsList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/AssetsList.java
new file mode 100644
index 000000000..5115bbac7
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/AssetsList.java
@@ -0,0 +1,376 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Container;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
+import com.badlogic.gdx.scenes.scene2d.ui.*;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.utils.Array;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.ImageUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.common.RunProccess;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.CustomList;
+import com.bladecoder.engineeditor.ui.panels.EditToolbar;
+import com.kotcrab.vis.ui.widget.file.FileChooser;
+import com.kotcrab.vis.ui.widget.file.FileChooser.Mode;
+import com.kotcrab.vis.ui.widget.file.FileChooser.SelectionMode;
+import com.kotcrab.vis.ui.widget.file.FileChooser.ViewMode;
+import com.kotcrab.vis.ui.widget.file.FileChooserListener;
+import com.kotcrab.vis.ui.widget.file.FileTypeFilter;
+
+import java.awt.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class AssetsList extends Table {
+    private static final String[] ASSET_TYPES = {"atlases", "music", "sounds", "images", "spine", "particles", "voices"};
+
+    private SelectBox<String> assetTypes;
+    protected EditToolbar toolbar;
+    protected CustomList<String> list;
+    protected Skin skin;
+    protected Container<ScrollPane> container;
+
+    private File lastDir;
+
+    public AssetsList(Skin skin) {
+        super(skin);
+
+        assetTypes = new SelectBox<>(skin);
+        assetTypes.setItems(ASSET_TYPES);
+
+        this.skin = skin;
+
+        list = new CustomList<>(skin);
+
+        Array<String> items = new Array<String>();
+        list.setItems(items);
+
+        ScrollPane scrollPane = new ScrollPane(list, skin);
+        container = new Container<>(scrollPane);
+        container.fill();
+        container.prefHeight(1000);
+
+        toolbar = new EditToolbar(skin);
+        // debug();
+        add(assetTypes).expandX().fillX();
+        row();
+        add(toolbar).expandX().fillX();
+        row();
+        add(container).expand().fill();
+
+        toolbar.addCreateListener(new ChangeListener() {
+
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                create();
+            }
+        });
+
+        toolbar.addEditListener(new ChangeListener() {
+
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                edit();
+            }
+        });
+
+        toolbar.addDeleteListener(new ChangeListener() {
+
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                delete();
+            }
+        });
+
+        list.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                toolbar.disableEdit(false);
+            }
+        });
+
+        Ctx.project.addPropertyChangeListener(Project.NOTIFY_PROJECT_LOADED, new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent arg0) {
+                toolbar.disableCreate(!Ctx.project.isLoaded());
+                addAssets();
+            }
+        });
+
+        assetTypes.addListener(new ChangeListener() {
+
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                addAssets();
+            }
+        });
+    }
+
+    private void addAssets() {
+        list.getItems().clear();
+
+        if (Ctx.project.isLoaded()) {
+            String type = assetTypes.getSelected();
+            String dir = getAssetDir(type);
+
+            if (type.equals("images") || type.equals("atlases"))
+                dir += "/1";
+
+            String[] files = new File(dir).list(new FilenameFilter() {
+                @Override
+                public boolean accept(File arg0, String arg1) {
+                    String type = assetTypes.getSelected();
+
+                    return !type.equals("atlases") || arg1.endsWith(".atlas");
+                }
+            });
+
+            if (files != null) {
+                Arrays.sort(files);
+
+                for (String f : files)
+                    list.getItems().add(f);
+            }
+
+            if (list.getItems().size > 0) {
+                list.setSelectedIndex(0);
+            }
+        }
+
+        toolbar.disableCreate(!Ctx.project.isLoaded());
+        list.invalidateHierarchy();
+    }
+
+    private String getAssetDir(String type) {
+        String dir;
+
+        if (type.equals("atlases")) {
+            dir = Ctx.project.getAssetPath() + Project.ATLASES_PATH;
+        } else if (type.equals("music")) {
+            dir = Ctx.project.getAssetPath() + Project.MUSIC_PATH;
+        } else if (type.equals("sounds")) {
+            dir = Ctx.project.getAssetPath() + Project.SOUND_PATH;
+        } else if (type.equals("images")) {
+            dir = Ctx.project.getAssetPath() + Project.IMAGE_PATH;
+            dir = Ctx.project.getAssetPath() + Project.IMAGE_PATH;
+        } else if (type.equals("spine")) {
+            dir = Ctx.project.getAssetPath() + Project.SPINE_PATH;
+        } else if (type.equals("particles")) {
+            dir = Ctx.project.getAssetPath() + Project.PARTICLE_PATH;
+        } else if (type.equals("voices")) {
+            dir = Ctx.project.getAssetPath() + Project.VOICE_PATH;
+        } else {
+            dir = Ctx.project.getAssetPath();
+        }
+
+        return dir;
+    }
+
+    private void create() {
+        final String type = assetTypes.getSelected();
+
+        if (type.equals("atlases")) {
+            new CreateAtlasDialog(skin).show(getStage());
+
+//			addAssets();
+
+        } else if (type.equals("particles")) {
+            //	Open the particle editor
+            List<String> cp = new ArrayList<String>();
+            cp.add(System.getProperty("java.class.path"));
+            try {
+                RunProccess.runJavaProccess("com.badlogic.gdx.tools.particleeditor.ParticleEditor", cp, null);
+            } catch (IOException e) {
+                Message.showMsgDialog(getStage(), "Error", "Error launching Particle Editor.");
+                EditorLogger.printStackTrace(e);
+            }
+        } else {
+
+            FileChooser fileChooser = new FileChooser(Mode.OPEN);
+
+            fileChooser.setSelectionMode(SelectionMode.FILES);
+            fileChooser.setMultiSelectionEnabled(true);
+
+            fileChooser.setSize(Gdx.graphics.getWidth() * 0.7f, Gdx.graphics.getHeight() * 0.7f);
+            fileChooser.setViewMode(ViewMode.LIST);
+
+            getStage().addActor(fileChooser);
+            if (lastDir != null)
+                fileChooser.setDirectory(lastDir);
+//			chooser.setTitle("Select the '" + type + "' asset files");
+
+
+            FileTypeFilter typeFilter = new FileTypeFilter(true); //allow "All Types" mode where all files are shown
+
+            switch (type) {
+                case "images":
+                    typeFilter.addRule("Images (*.png, *.jpg, *.etc1)", "jpg", "png", "etc1");
+                    break;
+                case "music":
+                case "sounds":
+                case "voices":
+                    typeFilter.addRule("Sound (*.mp3, *.wav, *.ogg)", "wav", "mp3", "ogg");
+                    break;
+                case "spine":
+                    typeFilter.addRule("Spine (*.skel, *.json)", "skel", "json");
+                    break;
+                default:
+                    typeFilter.addRule("All", "");
+                    break;
+            }
+
+            fileChooser.setFileTypeFilter(typeFilter);
+
+            fileChooser.setListener(new FileChooserListener() {
+
+                @Override
+                public void selected(Array<FileHandle> files) {
+
+                    try {
+                        String dirName = getAssetDir(type);
+                        lastDir = files.get(0).parent().file();
+
+                        // Si no existe la carpeta la creamos
+                        File dir = new File(dirName);
+                        if (!dir.exists())
+                            dir.mkdir();
+
+                        for (FileHandle f : files) {
+                            if (type.equals("images")) {
+                                List<String> res = Ctx.project.getResolutions();
+
+                                for (String r : res) {
+                                    File destFile = new File(dirName + "/" + r + "/" + f.file().getName());
+                                    float scale = Float.parseFloat(r);
+
+                                    if (scale != 1.0f) {
+
+                                        ImageUtils.scaleImageFile(f.file(), destFile, scale);
+                                    } else {
+                                        Files.copy(f.file().toPath(), destFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+                                    }
+                                }
+                            } else {
+                                File destFile = new File(dir, f.file().getName());
+                                Files.copy(f.file().toPath(), destFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+                            }
+
+                        }
+
+                        addAssets();
+                    } catch (Exception ex) {
+                        String msg = "Something went wrong while getting the assets.\n\n"
+                                + ex.getClass().getSimpleName() + " - " + ex.getMessage();
+                        Message.showMsgDialog(getStage(), "Error", msg);
+                        EditorLogger.printStackTrace(ex);
+                    }
+                }
+
+                @Override
+                public void canceled() {
+
+                }
+            });
+        }
+    }
+
+    private void edit() {
+        if (Desktop.isDesktopSupported()) {
+            String type = assetTypes.getSelected();
+            String dir = getAssetDir(type);
+
+            if (type.equals("images") || type.equals("atlases"))
+                dir += "/1";
+
+            try {
+                Desktop.getDesktop().open(new File(dir));
+            } catch (IOException e1) {
+                String msg = "Something went wrong while opening assets folder.\n\n" + e1.getClass().getSimpleName()
+                        + " - " + e1.getMessage();
+                Message.showMsgDialog(getStage(), "Error", msg);
+            }
+        }
+    }
+
+    private void delete() {
+        String type = assetTypes.getSelected();
+        String dir = getAssetDir(type);
+
+        String name = list.getSelected();
+        try {
+            if (type.equals("images") || type.equals("atlases")) {
+                List<String> res = Ctx.project.getResolutions();
+
+                for (String r : res) {
+                    File file = new File(dir + "/" + r + "/" + name);
+
+                    file.delete();
+
+                    // delete pages on atlases
+                    if (type.equals("atlases")) {
+                        File atlasDir = new File(dir + "/" + r);
+
+                        File[] files = atlasDir.listFiles();
+
+                        if (files != null)
+                            for (File f : files) {
+                                String destName = f.getName();
+                                String nameWithoutExt = name.substring(0, name.lastIndexOf('.'));
+                                String destNameWithoutExt = destName.substring(0, destName.lastIndexOf('.'));
+
+                                if (destNameWithoutExt.length() < nameWithoutExt.length())
+                                    continue;
+
+                                String suffix = destNameWithoutExt.substring(nameWithoutExt.length());
+
+                                if (!suffix.isEmpty() && !suffix.matches("[0-9]+"))
+                                    continue;
+
+                                if (destName.startsWith(nameWithoutExt) && destName.toLowerCase().endsWith(".png"))
+                                    Files.delete(f.toPath());
+                            }
+                    }
+                }
+            } else {
+                File file = new File(dir + "/" + name);
+                file.delete();
+            }
+
+            addAssets();
+        } catch (Exception ex) {
+            String msg = "Something went wrong while deleting the asset.\n\n" + ex.getClass().getSimpleName() + " - "
+                    + ex.getMessage();
+            Message.showMsgDialog(getStage(), "Error", msg);
+            EditorLogger.printStackTrace(ex);
+        }
+    }
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ChapterList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ChapterList.java
similarity index 66%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ChapterList.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ChapterList.java
index 8c1835618..41f60f20c 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ChapterList.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ChapterList.java
@@ -22,14 +22,14 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.WorldDocument;
-import com.bladecoder.engineeditor.ui.components.CellRenderer;
-import com.bladecoder.engineeditor.ui.components.EditList;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.EditList;
 
 public class ChapterList extends EditList<String> {
 
-	WorldDocument doc;
-
 	private ImageButton initBtn;
 
 	public ChapterList(Skin skin) {
@@ -38,8 +38,7 @@ public ChapterList(Skin skin) {
 		list.setCellRenderer(listCellRenderer);
 
 		initBtn = new ImageButton(skin);
-		toolbar.addToolBarButton(initBtn, "ic_check", "Set init chapter",
-				"Set init chapter");
+		toolbar.addToolBarButton(initBtn, "ic_check", "Set init chapter", "Set init chapter");
 
 		initBtn.setDisabled(false);
 		toolbar.hideCopyPaste();
@@ -54,14 +53,13 @@ public void changed(ChangeEvent event, Actor actor) {
 	}
 
 	private void setDefault() {
-		WorldDocument w = (WorldDocument) doc;
-
 		String e = list.getSelected();
 
 		if (e == null)
 			return;
 
-		w.setRootAttr(doc.getElement(), "init_chapter", e);
+		Ctx.project.getWorld().setInitChapter(e);
+		Ctx.project.setModified();
 	}
 
 	@Override
@@ -74,32 +72,35 @@ protected void delete() {
 
 		if (list.getItems().size < 2) {
 			String msg = "The chapter will not be deleted, at least one chapter must exists";
-			Ctx.msg.show(getStage(), msg, 3);
+			Message.showMsg(getStage(), msg, 4);
 
 			return;
 		}
 
 		String e = list.getItems().removeIndex(pos);
 
-		if (e.equals(Ctx.project.getWorld().getInitChapter())) {
+		if (e.equals(Ctx.project.getChapter().getInitChapter())) {
 			Ctx.project.getWorld().setInitChapter(list.getItems().get(0));
+			Ctx.project.setModified();
 		}
 
 		try {
-			((WorldDocument) doc).removeChapter(e);
-			Ctx.project.saveProject();
+			Ctx.project.getChapter().deleteChapter(e);
 		} catch (Exception ex) {
-			String msg = "Something went wrong while deleting the chapter.\n\n"
-					+ ex.getClass().getSimpleName() + " - " + ex.getMessage();
-			Ctx.msg.show(getStage(), msg, 3);
+			String msg = "Something went wrong.\n\n" + ex.getClass().getSimpleName() + " - " + ex.getMessage();
+			Message.showMsgDialog(getStage(), "Error deleting chapter", msg);
 
-			ex.printStackTrace();
+			EditorLogger.printStackTrace(ex);
 		}
+
+		list.setSelectedIndex(0);
+
+		Ctx.project.notifyPropertyChange(Project.CHAPTER_PROPERTY);
 	}
 
 	@Override
 	protected void create() {
-		EditChapterDialog dialog = new EditChapterDialog(skin, doc, null);
+		EditChapterDialog dialog = new EditChapterDialog(skin, Ctx.project.getChapter(), null);
 		dialog.show(getStage());
 		dialog.setListener(new ChangeListener() {
 			@Override
@@ -111,6 +112,8 @@ public void changed(ChangeEvent event, Actor actor) {
 					list.setSelectedIndex(i);
 
 				list.invalidateHierarchy();
+
+				Ctx.project.notifyPropertyChange(Project.CHAPTER_PROPERTY);
 			}
 		});
 	}
@@ -123,7 +126,7 @@ protected void edit() {
 		if (e == null)
 			return;
 
-		EditChapterDialog dialog = new EditChapterDialog(skin, doc, e);
+		EditChapterDialog dialog = new EditChapterDialog(skin, Ctx.project.getChapter(), e);
 		dialog.show(getStage());
 		dialog.setListener(new ChangeListener() {
 			@Override
@@ -132,6 +135,7 @@ public void changed(ChangeEvent event, Actor actor) {
 				list.getItems().removeIndex(list.getSelectedIndex());
 				list.getItems().add(e);
 				list.setSelectedIndex(list.getItems().indexOf(e, true));
+				Ctx.project.notifyPropertyChange(Project.CHAPTER_PROPERTY);
 			}
 		});
 	}
@@ -143,32 +147,36 @@ protected void copy() {
 	@Override
 	protected void paste() {
 	}
-	
 
-	public void addElements(WorldDocument w) {
-		this.doc = w;
+	public void addElements() {
 
 		list.getItems().clear();
 		list.getSelection().clear();
-		toolbar.disableCreate(false);
 
-		String nl[] = w.getChapters();
+		if (Ctx.project.isLoaded()) {
+			toolbar.disableCreate(false);
 
-		for (int i = 0; i < nl.length; i++) {
-			addItem(nl[i]);
-		}
+			String nl[] = Ctx.project.getChapter().getChapters();
 
-		if (getItems().size > 0)
-			list.setSelectedIndex(0);
+			for (int i = 0; i < nl.length; i++) {
+				addItem(nl[i]);
+			}
 
-		toolbar.disableEdit(list.getSelectedIndex() < 0);
+			if (getItems().size > 0)
+				list.setSelectedIndex(0);
 
-		list.getItems().sort(new Comparator<String>() {
-			@Override
-			public int compare(String o1, String o2) {
-				return o1.compareTo(o2);
-			}
-		});
+			toolbar.disableEdit(list.getSelectedIndex() < 0);
+
+			list.getItems().sort(new Comparator<String>() {
+				@Override
+				public int compare(String o1, String o2) {
+					return o1.compareTo(o2);
+				}
+			});
+
+		} else {
+			toolbar.disableCreate(true);
+		}
 
 		invalidateHierarchy();
 	}
@@ -182,7 +190,7 @@ public int compare(String o1, String o2) {
 		protected String getCellTitle(String e) {
 			String id = e;
 
-			String init = ((WorldDocument) doc).getInitChapter();
+			String init = Ctx.project.getWorld().getInitChapter();
 
 			if (init.equals(id))
 				id += " <init>";
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CompileInkDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CompileInkDialog.java
new file mode 100644
index 000000000..11051e352
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CompileInkDialog.java
@@ -0,0 +1,248 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.ui.Cell;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.SharedLibraryLoader;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.HttpUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.common.ModelTools;
+import com.bladecoder.engineeditor.common.RunProccess;
+import com.bladecoder.engineeditor.common.ZipUtils;
+import com.bladecoder.engineeditor.ui.panels.EditDialog;
+import com.bladecoder.engineeditor.ui.panels.FileInputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+import com.kotcrab.vis.ui.widget.file.FileChooser;
+import com.kotcrab.vis.ui.widget.file.FileChooserListener;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CompileInkDialog extends EditDialog {
+
+    private static final String FILE_PROP = "compileink.file";
+    private static final String INKLECATE_PROP = "compileink.inklecate";
+    private static final String LANG_PROP = "compileink.lang";
+    private static final String EXTRACT_TEXTS_PROP = "compileink.extractTexts";
+
+    private static final String INFO = "Compile the ink script using Inklecate.\n Inklecate must be installed in your computer.";
+
+    private InputPanel inklecatePath;
+    private InputPanel file;
+    private InputPanel extractTexts;
+    private InputPanel lang;
+
+    public CompileInkDialog(Skin skin) {
+        super("COMPILE INK SCRIPT", skin);
+
+        inklecatePath = new FileInputPanel(skin, "Select the inklecate folder",
+                "Select the folder where the inklecate is installed", FileInputPanel.DialogType.DIRECTORY);
+
+        file = new FileInputPanel(skin, "Select the Ink script", "Select the Ink source script for your chapter",
+                FileInputPanel.DialogType.OPEN_FILE);
+
+        extractTexts = InputPanelFactory.createInputPanel(skin, "Extract texts",
+                "Extracts all texts in a .properties for I18N.", Param.Type.BOOLEAN, true, "true");
+
+        lang = InputPanelFactory.createInputPanel(skin, "Lang code",
+                "The languaje code (ex. 'fr') where the texts are extracted. Empty for default.", false);
+
+        addInputPanel(inklecatePath);
+        addInputPanel(file);
+        addInputPanel(extractTexts);
+        addInputPanel(lang);
+
+        setInfo(INFO);
+
+        if (Ctx.project.getEditorConfig().getProperty(FILE_PROP) != null)
+            file.setText(Ctx.project.getEditorConfig().getProperty(FILE_PROP));
+
+        if (Ctx.project.getEditorConfig().getProperty(INKLECATE_PROP) != null)
+            inklecatePath.setText(Ctx.project.getEditorConfig().getProperty(INKLECATE_PROP));
+
+        lang.setText(Ctx.project.getEditorConfig().getProperty(LANG_PROP));
+
+        if (Ctx.project.getEditorConfig().getProperty(EXTRACT_TEXTS_PROP) != null)
+            extractTexts.setText(Ctx.project.getEditorConfig().getProperty(EXTRACT_TEXTS_PROP));
+
+        // Add the 'download' button to the Path field.
+        TextButton downloadButton = new TextButton("Download Inklecate", skin, "no-toggled");
+
+        downloadButton.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+
+                if (SharedLibraryLoader.isWindows) {
+                    download(
+                            "https://github.com/inkle/ink/releases/download/v1.1.1/inklecate_windows.zip",
+                            "inklecate.zip");
+                } else if (SharedLibraryLoader.isLinux) {
+                    download("https://github.com/inkle/ink/releases/download/v1.1.1/inklecate_linux.zip",
+                            "inklecate.zip");
+                } else if (SharedLibraryLoader.isMac) {
+                    download("https://github.com/inkle/ink/releases/download/v1.1.1/inklecate_mac.zip",
+                            "inklecate.zip");
+                }
+            }
+        });
+
+        Table t2 = new Table();
+        Actor a2 = inklecatePath.getField();
+        Cell<?> c2 = inklecatePath.getCell(a2);
+        t2.add(a2);
+        t2.add(downloadButton);
+        c2.setActor(t2);
+    }
+
+    @Override
+    protected void ok() {
+        compileInk();
+
+        Ctx.project.getEditorConfig().setProperty(FILE_PROP, file.getText());
+        Ctx.project.getEditorConfig().setProperty(INKLECATE_PROP, inklecatePath.getText());
+
+        if (lang.getText() != null)
+            Ctx.project.getEditorConfig().setProperty(LANG_PROP, lang.getText());
+
+        Ctx.project.getEditorConfig().setProperty(EXTRACT_TEXTS_PROP, extractTexts.getText());
+    }
+
+    @Override
+    protected boolean validateFields() {
+        boolean ok = true;
+
+        if (!inklecatePath.validateField())
+            ok = false;
+
+        if (!file.validateField())
+            ok = false;
+
+        return ok;
+    }
+
+    private void compileInk() {
+        String outfile = Ctx.project.getModelPath() + "/" + new File(file.getText()).getName() + ".json";
+        List<String> params = new ArrayList<>();
+        params.add("-o");
+        params.add(outfile);
+        params.add(file.getText());
+        boolean ok = RunProccess.runInklecate(new File(inklecatePath.getText()), params);
+
+        if (!ok) {
+            Message.showMsgDialog(getStage(), "Error", "Error compiling Ink script.");
+            return;
+        }
+
+        if (extractTexts.getText().equals("true")) {
+            try {
+                ModelTools.extractInkTexts(outfile, lang.getText());
+            } catch (IOException e) {
+                Message.showMsgDialog(getStage(), "Error extracting Ink texts.", e.getMessage());
+                return;
+            }
+        }
+
+        Message.showMsg(getStage(), "Ink script compiled successfully", 2);
+    }
+
+    private void download(String url, String fileName) {
+        FileChooser fileChooser = new FileChooser(FileChooser.Mode.OPEN);
+        fileChooser.setSize(Gdx.graphics.getWidth() * 0.7f, Gdx.graphics.getHeight() * 0.7f);
+        fileChooser.setViewMode(FileChooser.ViewMode.LIST);
+
+        fileChooser.setSelectionMode(FileChooser.SelectionMode.DIRECTORIES);
+        getStage().addActor(fileChooser);
+
+        fileChooser.setListener(new FileChooserListener() {
+
+            @Override
+            public void selected(Array<FileHandle> files) {
+                try {
+                    File zipFile = new File(files.get(0).file(), fileName);
+                    HttpUtils.downloadAsync(new URL(url), new FileOutputStream(zipFile), new HttpUtils.Callback() {
+                        @Override
+                        public void updated(int length, int totalLength) {
+                            final int progress = ((int) (((double) length / (double) totalLength) * 100));
+                            Message.showMsg(getStage(), "Downloading JDK... " + progress + "%", true);
+                        }
+
+                        @Override
+                        public void completed() {
+                            File outputFolder = new File(files.get(0).file(), "inklecate");
+                            try {
+                                // create output folder
+                                outputFolder.mkdirs();
+
+                                ZipUtils.unzip(zipFile, outputFolder.toPath());
+                                zipFile.delete();
+                                // add execution permission to the inklecate file
+                                if (SharedLibraryLoader.isLinux || SharedLibraryLoader.isMac) {
+                                    File inklecateFile = new File(outputFolder, "inklecate");
+                                    inklecateFile.setExecutable(true);
+                                }
+                            } catch (IOException e) {
+                                Message.showMsg(getStage(), "Error uncompressing .zip: " + e.getMessage(), true);
+                                return;
+                            }
+                            Gdx.app.postRunnable(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Message.hideMsg();
+                                    inklecatePath.setText(outputFolder.getAbsolutePath());
+                                }
+                            });
+                        }
+
+                        @Override
+                        public void canceled() {
+                            Message.showMsgDialog(getStage(), "Error", "Download cancelled.");
+                        }
+
+                        @Override
+                        public void error(IOException ex) {
+                            Message.showMsgDialog(getStage(), "Error", "Download error: " + ex.getMessage());
+                        }
+                    });
+                } catch (FileNotFoundException | MalformedURLException e) {
+                    Message.showMsgDialog(getStage(), "Error", "Download error: " + e.getMessage());
+                }
+            }
+
+            @Override
+            public void canceled() {
+
+            }
+        });
+    }
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateAndroidKeystoreDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateAndroidKeystoreDialog.java
new file mode 100644
index 000000000..fdc65c226
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateAndroidKeystoreDialog.java
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.util.Arrays;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.common.RunProccess;
+import com.bladecoder.engineeditor.ui.panels.EditDialog;
+import com.bladecoder.engineeditor.ui.panels.FileInputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+
+public class CreateAndroidKeystoreDialog extends EditDialog {
+
+	private static final String INFO = "Create the keystore needed to sign Android packages.";
+
+	private InputPanel keyStoreFile;
+	private InputPanel androidKeyAlias;
+	private InputPanel androidKeyStorePassword;
+	private InputPanel androidKeyAliasPassword;
+
+	protected ChangeListener listener;
+
+	public CreateAndroidKeystoreDialog(Skin skin) {
+		super("CREATE KEY STORE FOR ANDROID", skin);
+
+		keyStoreFile = new FileInputPanel(skin, "Select the key store", "Select the key store file name and location",
+				FileInputPanel.DialogType.SAVE_FILE);
+
+		androidKeyAlias = InputPanelFactory.createInputPanel(skin, "KeyAlias", "Select the Key ID/Alias", true);
+
+		androidKeyStorePassword = InputPanelFactory.createInputPanel(skin, "KeyStorePasswd", "Key Store Password",
+				true);
+		androidKeyAliasPassword = InputPanelFactory.createInputPanel(skin, "KeyAliasPasswd", "Key Alias Password",
+				true);
+
+		addInputPanel(keyStoreFile);
+		addInputPanel(androidKeyAlias);
+		addInputPanel(androidKeyStorePassword);
+		addInputPanel(androidKeyAliasPassword);
+
+		setInfo(INFO);
+	}
+
+	@Override
+	protected void ok() {
+		createKeyStore();
+	}
+
+	@Override
+	protected boolean validateFields() {
+		boolean ok = true;
+
+		if (!keyStoreFile.validateField())
+			ok = false;
+
+		if (!androidKeyAlias.validateField())
+			ok = false;
+
+		if (androidKeyStorePassword.getText() == null || androidKeyStorePassword.getText().length() < 6) {
+			Message.showMsgDialog(getStage(), "Error", "Keystore password must be at least 6 character long");
+			ok = false;
+
+			return false;
+		}
+
+		if (androidKeyAliasPassword.getText() == null || androidKeyAliasPassword.getText().length() < 6) {
+			Message.showMsgDialog(getStage(), "Error", "Key password must be at least 6 character long");
+			ok = false;
+		}
+
+		return ok;
+	}
+
+	private void createKeyStore() {
+		// keytool -genkey -v -keystore my-release-key.keystore -alias alias_name
+		// -keyalg RSA -keysize 2048 -validity 10000
+
+		String[] args = { "-genkey", "-noprompt", "-v", "-keystore", getKeyStorePath(), "-alias", getKeyAlias(),
+				"-keyalg", "RSA", "-keysize", "2048", "-validity", "10000", "-storepass", getKeyStorePassword(),
+				"-dname", "CN=bladeengine.com", "-keypass", getKeyAliasPassword() };
+
+		try {
+			Process p = RunProccess.runJavaHomeBin("keytool", Arrays.asList(args));
+			p.waitFor();
+
+			if (p.exitValue() == 0) {
+				if (listener != null)
+					listener.changed(new ChangeEvent(), this);
+			} else {
+				Message.showMsgDialog(getStage(), "Error", "Error generating key");
+				cancel();
+			}
+		} catch (Exception e) {
+			Message.showMsgDialog(getStage(), "Error", e.getMessage());
+			cancel();
+		}
+
+	}
+
+	public String getKeyStorePath() {
+		return keyStoreFile.getText();
+	}
+
+	public String getKeyAlias() {
+		return androidKeyAlias.getText();
+	}
+
+	public String getKeyStorePassword() {
+		return androidKeyStorePassword.getText();
+	}
+
+	public String getKeyAliasPassword() {
+		return androidKeyAliasPassword.getText();
+	}
+
+	public void setListener(ChangeListener l) {
+		listener = l;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateAtlasDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateAtlasDialog.java
new file mode 100644
index 000000000..d314bd325
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateAtlasDialog.java
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.badlogic.gdx.graphics.Texture.TextureFilter;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.ImageUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.EditDialog;
+import com.bladecoder.engineeditor.ui.panels.FileInputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+
+public class CreateAtlasDialog extends EditDialog {
+
+	private static final String INFO = "Package all the images in the selected dir to a new atlas";
+
+	private static final String[] FILTERS = { "Linear", "Nearest", "MipMap", "MipMapLinearLinear",
+			"MipMapLinearNearest", "MipMapNearestLinear", "MipMapNearestNearest" };
+
+	private static final String[] OUTPUT_FORMATS = { "png", "jpg" };
+
+	private InputPanel name;
+	private InputPanel dir;
+	private InputPanel filterMin;
+	private InputPanel filterMag;
+	private InputPanel maxWidth;
+	private InputPanel maxHeight;
+	private InputPanel outputFormat;
+
+	public CreateAtlasDialog(Skin skin) {
+		super("CREATE ATLAS", skin);
+
+		name = InputPanelFactory.createInputPanel(skin, "Atlas Name", "The name of the sprite atlas", true);
+		dir = new FileInputPanel(skin, "Input Image Directory",
+				"Select the output directory with the images to create the Atlas", FileInputPanel.DialogType.DIRECTORY);
+
+		filterMin = InputPanelFactory.createInputPanel(skin, "Min Filter", "The filter when the texture is scaled down",
+				FILTERS, true);
+		filterMag = InputPanelFactory.createInputPanel(skin, "Mag Filter", "The filter when the texture is scaled up",
+				FILTERS, true);
+		maxWidth = InputPanelFactory.createInputPanel(skin, "Max Width",
+				"The atlas max page width. Be careful, some devices has a 4096px limit.", Param.Type.INTEGER, true);
+		maxHeight = InputPanelFactory.createInputPanel(skin, "Max Height",
+				"The atlas max page height. Be careful, some devices has a 4096px limit.", Param.Type.INTEGER, true);
+
+		outputFormat = InputPanelFactory.createInputPanel(skin, "Output format",
+				"The output format of the image. Note that 'jpg' doesn't support transparency.", OUTPUT_FORMATS, true);
+
+		addInputPanel(name);
+		addInputPanel(dir);
+		addInputPanel(filterMin);
+		addInputPanel(filterMag);
+		addInputPanel(maxWidth);
+		addInputPanel(maxHeight);
+		addInputPanel(outputFormat);
+
+		String maxWH = Integer.toString(ImageUtils.getRecommendedAtlasSize());
+
+		maxWidth.setText(maxWH);
+		maxHeight.setText(maxWH);
+		filterMin.setText(FILTERS[0]);
+		filterMag.setText(FILTERS[0]);
+		outputFormat.setText(OUTPUT_FORMATS[0]);
+
+		setInfo(INFO);
+	}
+
+	@Override
+	protected void ok() {
+		Message.showMsg(getStage(), "Generating atlas...", true);
+
+		Timer.schedule(new Task() {
+			@Override
+			public void run() {
+				genAtlas();
+			}
+		}, 1);
+	}
+
+	@Override
+	protected boolean validateFields() {
+		boolean ok = true;
+
+		if (!dir.validateField())
+			ok = false;
+
+		if (!name.validateField())
+			ok = false;
+
+		return ok;
+	}
+
+	private void genAtlas() {
+		String outdir = Ctx.project.getAssetPath() + Project.ATLASES_PATH;
+		List<String> res = Ctx.project.getResolutions();
+		String name = this.name.getText();
+		String fMin = filterMin.getText();
+		String fMag = filterMag.getText();
+
+		TextureFilter filterMin = null, filterMag = null;
+
+		if (fMin.equals("Linear"))
+			filterMin = TextureFilter.Linear;
+		else if (fMin.equals("Nearest"))
+			filterMin = TextureFilter.Nearest;
+		else if (fMin.equals("MipMap"))
+			filterMin = TextureFilter.MipMap;
+		else if (fMin.equals("MipMapLinearLinear"))
+			filterMin = TextureFilter.MipMapLinearLinear;
+		else if (fMin.equals("MipMapLinearNearest"))
+			filterMin = TextureFilter.MipMapLinearNearest;
+		else if (fMin.equals("MipMapNearestLinear"))
+			filterMin = TextureFilter.MipMapNearestLinear;
+		else if (fMin.equals("MipMapNearestNearest"))
+			filterMin = TextureFilter.MipMapNearestNearest;
+
+		if (fMag.equals("Linear"))
+			filterMag = TextureFilter.Linear;
+		else if (fMag.equals("Nearest"))
+			filterMag = TextureFilter.Nearest;
+		else if (fMag.equals("MipMap"))
+			filterMag = TextureFilter.MipMap;
+		else if (fMag.equals("MipMapLinearLinear"))
+			filterMag = TextureFilter.MipMapLinearLinear;
+		else if (fMag.equals("MipMapLinearNearest"))
+			filterMag = TextureFilter.MipMapLinearNearest;
+		else if (fMag.equals("MipMapNearestLinear"))
+			filterMag = TextureFilter.MipMapNearestLinear;
+		else if (fMag.equals("MipMapNearestNearest"))
+			filterMag = TextureFilter.MipMapNearestNearest;
+
+		int maxW = Integer.parseInt(maxWidth.getText());
+		int maxH = Integer.parseInt(maxHeight.getText());
+
+		for (String r : res) {
+			float scale = Float.parseFloat(r);
+
+			try {
+				ImageUtils.createAtlas(dir.getText(), outdir + "/" + r, name + ".atlas", scale, (int) (maxW * scale),
+						(int) (maxH * scale), filterMin, filterMag, outputFormat.getText(), true);
+			} catch (IOException e) {
+				EditorLogger.error(e.getMessage());
+				Message.showMsgDialog(getStage(), "Error creating atlas", e.getMessage());
+				return;
+			}
+		}
+
+		Message.hideMsg();
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateProjectDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateProjectDialog.java
new file mode 100644
index 000000000..140d05e3d
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateProjectDialog.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.io.File;
+
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.ui.panels.EditDialog;
+import com.bladecoder.engineeditor.ui.panels.FileInputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+
+public class CreateProjectDialog extends EditDialog {
+
+	public static final String INFO = "A project folder with the proper structure will be created in the selected location.";
+
+	private static final String ANDROID_SDK_PROP = "package.SDK";
+
+	private InputPanel projectName;
+	private InputPanel pkg;
+	private InputPanel spinePlugin;
+	private FileInputPanel location;
+	private FileInputPanel androidSdk;
+
+	public CreateProjectDialog(Skin skin) {
+		super("CREATE PROJECT", skin);
+
+		setInfo(INFO);
+
+		projectName = InputPanelFactory.createInputPanel(skin, "Project Name", "Set the name of the project", true);
+
+		pkg = InputPanelFactory.createInputPanel(skin, "Package",
+				"The package will be used as package ID in Android and IOS. The launchers will be in this package too.",
+				Param.Type.STRING, true, "com.myadv.game");
+
+		spinePlugin = InputPanelFactory.createInputPanel(skin, "Spine animation support",
+				"The game can use Spine animations, require Spine License to distribute the game. See http://www.esotericsoftware.com for more info.",
+				Param.Type.BOOLEAN, true, "false");
+
+		location = new FileInputPanel(skin, "Location", "Select the folder location for the project",
+				FileInputPanel.DialogType.DIRECTORY);
+
+		androidSdk = new FileInputPanel(skin, "Android SDK",
+				"Select the Android SDK folder to create the Android package. If empty, the ANDROID_HOME variable will be used.",
+				FileInputPanel.DialogType.DIRECTORY, false);
+
+		addInputPanel(projectName);
+		addInputPanel(pkg);
+		addInputPanel(location);
+		addInputPanel(spinePlugin);
+		addInputPanel(androidSdk);
+
+		String sdkprop = Ctx.project.getEditorConfig().getProperty(ANDROID_SDK_PROP);
+
+		if (sdkprop != null && new File(sdkprop).exists()) {
+			androidSdk.setText(sdkprop);
+		}
+
+		// getStage().setKeyboardFocus(projectName.getField());
+	}
+
+	@Override
+	protected void ok() {
+		try {
+			Ctx.project.getEditorConfig().setProperty(ANDROID_SDK_PROP, androidSdk.getText());
+			Ctx.project.saveProject();
+		} catch (Exception ex) {
+			String msg = ex.getClass().getSimpleName()
+					+ " - " + ex.getMessage();
+			Message.showMsgDialog(getStage(), "Error saving project", msg);
+		}
+		
+		final Stage stage = getStage();
+
+		Message.showMsg(getStage(), "Creating project...", true);
+		Timer.schedule(new Task() {
+			@Override
+			public void run() {
+				createProject(stage);
+			}
+		},1);
+	}
+
+	private void createProject(Stage stage) {
+
+		try {
+			Ctx.project.createProject(location.getText(), projectName.getText(), pkg.getText(), androidSdk.getText(),
+					Boolean.parseBoolean(spinePlugin.getText()));
+
+			Message.showMsg(stage, "Project successfully created", 3);
+		} catch (Exception e) {
+			String msg = e.getClass().getSimpleName() + " - "
+					+ e.getMessage();
+			Message.showMsgDialog(stage, "Error creating project", msg);
+			EditorLogger.error(msg, e);
+			return;
+		}
+	}
+
+	@Override
+	protected boolean validateFields() {
+		boolean isOk = true;
+
+		if (!projectName.validateField()) {
+			isOk = false;
+		}
+
+		if (!pkg.validateField()) {
+			isOk = false;
+		}
+
+		if (location.getFile() != null) {
+			location.setError(false);
+		} else {
+			location.setError(true);
+			isOk = false;
+		}
+
+//		if (System.getenv("ANDROID_HOME") == null && androidSdk.getFile() == null) {
+//			androidSdk.setError(true);
+//			isOk = false;
+//		} else {
+//			androidSdk.setError(false);
+//		}
+
+		return isOk;
+	}
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/CreateResolutionDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateResolutionDialog.java
similarity index 60%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/CreateResolutionDialog.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateResolutionDialog.java
index 4d167f8af..4dfdd6b4a 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/CreateResolutionDialog.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/CreateResolutionDialog.java
@@ -22,87 +22,94 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
 import com.bladecoder.engine.actions.Param;
 import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ImageUtils;
+import com.bladecoder.engineeditor.common.Message;
 import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.EditDialog;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
-import com.bladecoder.engineeditor.utils.ImageUtils;
+import com.bladecoder.engineeditor.ui.panels.EditDialog;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
 
 public class CreateResolutionDialog extends EditDialog {
 
-	private static final String INFO = "Create a new resolution. Scale backgrounds and overlays from the world resolution.";
+	private static final String INFO = "Create a new resolution. Scale all atlases and images of the game.";
 
 	private InputPanel scale;
-	
+
 	protected ChangeListener listener;
-	
-	String atlasDir = Ctx.project.getProjectPath() + "/" + Project.ATLASES_PATH;
-	String bgDir = Ctx.project.getProjectPath() + "/" + Project.BACKGROUNDS_PATH;
-	String uiDir = Ctx.project.getProjectPath() + "/" + Project.UI_PATH;
-	String imageDir = Ctx.project.getProjectPath() + "/" + Project.IMAGE_PATH;
+
+	String atlasDir = Ctx.project.getAssetPath() + Project.ATLASES_PATH;
+	String uiDir = Ctx.project.getAssetPath() + Project.UI_PATH;
+	String imageDir = Ctx.project.getAssetPath() + Project.IMAGE_PATH;
 
 	public CreateResolutionDialog(Skin skin) {
 		super("CREATE RESOLUTION", skin);
-		
-		 scale = new InputPanel(skin, "Scale",
-					"Scale relative to the world resolution", Param.Type.FLOAT, true);
+
+		scale = InputPanelFactory.createInputPanel(skin, "Scale", "Scale relative to the world resolution",
+				Param.Type.FLOAT, true);
 
 		addInputPanel(scale);
-		
+
 		setInfo(INFO);
 	}
 
 	@Override
 	protected void ok() {
-		new Thread(new Runnable() {	
-			Stage stage = getStage();
-			
+
+		final Stage stage = getStage();
+
+		Message.showMsg(stage, "Creating resolution...", true);
+
+		Timer.schedule(new Task() {
 			@Override
 			public void run() {
-				Ctx.msg.show(stage, "Creating resolution...", true);
-				
 				createResolution();
 
-				String msg = scaleImages();				
-				
-				if(listener != null)
+				String msg = scaleImages();
+
+				if (listener != null)
 					listener.changed(new ChangeEvent(), CreateResolutionDialog.this);
-				
-				Ctx.msg.hide();
-				
-				if(msg != null)
-					Ctx.msg.show(stage, msg, 2);
+
+				Message.hideMsg();
+
+				if (msg != null)
+					Message.showMsgDialog(stage, "Error creating resolution", msg);
 			}
-		}).start();		
+		}, 1);
 	}
-	
+
 	private void createResolution() {
-		float s = Float.parseFloat(scale.getText());
-		String prefix = (int)(Ctx.project.getWorld().getWidth() * s) + "_" +  (int)(Ctx.project.getWorld().getHeight() * s);
-		
+//		float s = Float.parseFloat(scale.getText());
+//		String prefix = (int)(Ctx.project.getWorld().getWidth() * s) + "_" +  (int)(Ctx.project.getWorld().getHeight() * s);
+		String prefix = scale.getText().trim();
+
 		new File(atlasDir + "/" + prefix).mkdir();
-		new File(bgDir + "/" + prefix).mkdir();
 		new File(uiDir + "/" + prefix).mkdir();
-		new File(imageDir + "/" + prefix).mkdir();		
+		new File(imageDir + "/" + prefix).mkdir();
 	}
 
 	private String scaleImages() {
-		
+
 		float s = Float.parseFloat(scale.getText());
-		String prefix = (int)(Ctx.project.getWorld().getWidth() * s) + "_" +  (int)(Ctx.project.getWorld().getHeight() * s);	
-		
+//		String prefix = (int)(Ctx.project.getWorld().getWidth() * s) + "_" +  (int)(Ctx.project.getWorld().getHeight() * s);
+		String prefix = scale.getText().trim();
+
 		// COPY ASSETS FROM WORLD RESOLUTION SCALED
 		String wPrefix = Ctx.project.getResDir();
-		
+
 		try {
 			ImageUtils.scaleDirFiles(new File(uiDir + "/" + wPrefix), new File(uiDir + "/" + prefix), s);
-			ImageUtils.scaleDirFiles(new File(bgDir + "/" + wPrefix), new File(bgDir + "/" + prefix), s);
 			ImageUtils.scaleDirFiles(new File(imageDir + "/" + wPrefix), new File(imageDir + "/" + prefix), s);
+
+			ImageUtils.scaleDirAtlases(new File(atlasDir + "/" + wPrefix), new File(atlasDir + "/" + prefix), s);
+			ImageUtils.scaleDirAtlases(new File(uiDir + "/" + wPrefix), new File(uiDir + "/" + prefix), s);
 		} catch (IOException e) {
 			return e.getMessage();
 		}
-		
+
 		return null;
 	}
 
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/DialogList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/DialogList.java
new file mode 100644
index 000000000..0c6089c33
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/DialogList.java
@@ -0,0 +1,180 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Arrays;
+import java.util.List;
+
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.ModelList;
+import com.bladecoder.engineeditor.undo.UndoDeleteDialog;
+
+public class DialogList extends ModelList<CharacterActor, Dialog> {	
+	
+    private OptionList options;
+
+	@Override
+	protected EditModelDialog<CharacterActor, Dialog> getEditElementDialogInstance(Dialog e) {
+		return new EditDialogDialog(skin, parent, e);
+	}
+	
+    public DialogList(Skin skin) {
+    	super(skin, true);
+    	
+    	options = new OptionList(skin);
+    	row();
+    	add(options).expand().fill();
+
+		list.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				int pos = list.getSelectedIndex();
+				
+				addOptions();
+				
+				toolbar.disableEdit(pos == -1);
+			}
+		});
+		
+		list.setCellRenderer(listCellRenderer);
+		listCellRenderer.layout(list.getStyle());
+		container.minHeight(listCellRenderer.getItemHeight() * 5);
+		container.maxHeight(listCellRenderer.getItemHeight() * 5);
+		
+		Ctx.project.addPropertyChangeListener(Project.NOTIFY_ELEMENT_CREATED, new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+				if (evt.getNewValue() instanceof Dialog && !(evt.getSource() instanceof EditDialogDialog) && parent instanceof CharacterActor) {
+					addElements(parent, Arrays.asList(parent.getDialogs().values().toArray(new Dialog[0])));
+				}
+			}
+		});
+    }
+    
+    public void addOptions() {
+		int pos = list.getSelectedIndex();
+
+		Dialog d = null;
+
+		if (pos != -1) {
+			d = list.getItems().get(pos);
+			options.addElements(d, d.getOptions());
+		} else { 
+			options.addElements(null, null);
+		}    	
+    }
+    
+    
+	@Override
+	public void addElements(CharacterActor a, List<Dialog> elements) {
+		super.addElements(a, elements);
+		addOptions();
+    }	
+	
+	@Override
+	protected void delete() {
+			
+		Dialog d = removeSelected();
+			
+		parent.getDialogs().remove(d.getId());
+		
+		// TRANSLATIONS
+		Ctx.project.getI18N().putTranslationsInElement(d);
+			
+		// UNDO
+		Ctx.project.getUndoStack().add(new UndoDeleteDialog(parent, d));
+
+		// Clear options here because change event doesn't call when deleting
+		// the last element
+		if (list.getSelectedIndex() == -1)
+			addOptions();
+		
+		Ctx.project.setModified();
+	}
+	
+	@Override
+	protected void copy() {
+		Dialog e = list.getSelected();
+
+		if (e == null)
+			return;
+
+		clipboard = (Dialog)ElementUtils.cloneElement(e);
+		toolbar.disablePaste(false);
+
+		// TRANSLATIONS
+		Ctx.project.getI18N().putTranslationsInElement(clipboard);
+	}
+
+	@Override
+	protected void paste() {
+		Dialog newElement = (Dialog)ElementUtils.cloneElement(clipboard);
+		
+		newElement.setId(ElementUtils.getCheckedId(newElement.getId(), parent.getDialogs().keySet().toArray(new String[0])));
+		
+		int pos = list.getSelectedIndex() + 1;
+
+		list.getItems().insert(pos, newElement);
+
+		parent.addDialog(newElement);
+		Ctx.project.getI18N().extractStrings(Ctx.project.getSelectedScene().getId(),parent.getId(), newElement);
+
+		list.setSelectedIndex(pos);
+		list.invalidateHierarchy();
+		
+		Ctx.project.setModified();
+	}	
+
+
+	// -------------------------------------------------------------------------
+	// ListCellRenderer
+	// -------------------------------------------------------------------------
+	private final CellRenderer<Dialog> listCellRenderer = new CellRenderer<Dialog>() {
+
+		@Override
+		protected String getCellTitle(Dialog e) {
+			return e.getId();
+		}
+
+		@Override
+		public TextureRegion getCellImage(Dialog e) {
+			return Ctx.assetManager.getIcon("ic_talkto");
+		}
+		
+		@Override
+		protected boolean hasSubtitle() {
+			return false;
+		}
+		
+		@Override
+		protected boolean hasImage() {
+			return true;
+		}
+	};
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditActionDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditActionDialog.java
new file mode 100644
index 000000000..a4c5f48ab
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditActionDialog.java
@@ -0,0 +1,191 @@
+/*******************************************************************************
+
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.util.Arrays;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ActionDetector;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.FilteredSelectBox;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+import com.bladecoder.engineeditor.ui.panels.ScopePanel;
+
+public class EditActionDialog extends EditModelDialog<Verb, Action> {
+	private InputPanel actionPanel;
+	private String scope;
+	private int pos;
+
+	@SuppressWarnings("unchecked")
+	public EditActionDialog(Skin skin, Verb parent, Action e, String scope, int pos) {
+		super(skin);
+
+		this.scope = scope;
+		this.pos = e == null ? pos + 1 : pos;
+
+		String[] actions = ActionDetector.getActionNames();
+		Arrays.sort(actions);
+
+		actionPanel = InputPanelFactory.createInputPanel(skin, "Action", "Select the action to create.", actions, true);
+
+		((FilteredSelectBox<String>) actionPanel.getField()).addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				setAction();
+			}
+		});
+
+		if (e != null) {
+			String id = ActionUtils.getName(e.getClass());
+
+			if (id != null) {
+				actionPanel.setText(id);
+			}
+
+		}
+
+		init(parent, e, new InputPanel[0]);
+
+		setAction();
+
+		if (e != null)
+			modelToInputs();
+
+	}
+
+	private void setAction() {
+		String id = actionPanel.getText();
+
+		getCenterPanel().clear();
+		addInputPanel(actionPanel);
+
+		Action tmp = null;
+
+		tmp = ActionDetector.create(id, null);
+		
+		String info = ActionUtils.getInfo(tmp.getClass());
+		
+		if(ActionUtils.isDeprecated(tmp.getClass()))
+			info = "[RED]DEPRECATED[]\n" + info;
+		
+		setInfo(info);
+
+		if (e == null || tmp == null || !(e.getClass().getName().equals(tmp.getClass().getName())))
+			e = tmp;
+
+		if (e != null) {
+			Param[] params = ActionUtils.getParams(e);
+
+			i = new InputPanel[params.length];
+
+			for (int j = 0; j < params.length; j++) {
+				if (params[j].options instanceof Enum[]) {
+					i[j] = InputPanelFactory.createInputPanel(getSkin(), params[j].name, params[j].desc, params[j].type,
+							params[j].mandatory, params[j].defaultValue, (Enum[]) params[j].options);
+				} else {
+					i[j] = InputPanelFactory.createInputPanel(getSkin(), params[j].name, params[j].desc, params[j].type,
+							params[j].mandatory, params[j].defaultValue, (String[]) params[j].options);
+				}
+
+				addInputPanel(i[j]);
+
+				if ((i[j].getField() instanceof TextField && params[j].name.toLowerCase().endsWith("text"))
+						|| i[j].getField() instanceof ScrollPane) {
+					i[j].getCell(i[j].getField()).fillX();
+				}
+			}
+		} else {
+			i = new InputPanel[0];
+		}
+	}
+
+	@Override
+	protected void inputsToModel(boolean create) {
+		for (int j = 0; j < i.length; j++) {
+			String v = i[j].getText();
+			try {
+				if (i[j].getTitle().toLowerCase().endsWith("text")) {
+
+					String key = ActionUtils.getStringValue(e, i[j].getTitle());
+
+					if (scope.equals(ScopePanel.WORLD_SCOPE)) {
+						if (key == null || key.isEmpty() || key.charAt(0) != I18N.PREFIX)
+							key = Ctx.project.getI18N().genKey(null, null, parent.getHashKey(), pos, i[j].getTitle());
+
+						Ctx.project.getI18N().setWorldTranslation(key, v);
+					} else if (scope.equals(ScopePanel.SCENE_SCOPE)) {
+						if (key == null || key.isEmpty() || key.charAt(0) != I18N.PREFIX)
+							key = Ctx.project.getI18N().genKey(Ctx.project.getSelectedScene().getId(), null,
+									parent.getHashKey(), pos, i[j].getTitle());
+
+						Ctx.project.getI18N().setTranslation(key, v);
+					} else {
+						if (key == null || key.isEmpty() || key.charAt(0) != I18N.PREFIX)
+							key = Ctx.project.getI18N().genKey(Ctx.project.getSelectedScene().getId(),
+									Ctx.project.getSelectedActor().getId(), parent.getHashKey(), pos, i[j].getTitle());
+
+						Ctx.project.getI18N().setTranslation(key, v);
+					}
+
+					if (v != null && !v.isEmpty())
+						v = key;
+					else
+						v = null;
+				}
+
+				ActionUtils.setParam(e, i[j].getTitle(), v);
+
+			} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+				EditorLogger.error(e.getMessage());
+			}
+		}
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void modelToInputs() {
+		for (int j = 0; j < i.length; j++) {
+
+			try {
+				String v = ActionUtils.getStringValue(e, i[j].getTitle());
+
+				if (scope.equals(ScopePanel.WORLD_SCOPE))
+					v = Ctx.project.getI18N().getWorldTranslation(v);
+				else
+					v = Ctx.project.translate(v);
+
+				i[j].setText(v);
+			} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+				EditorLogger.error(e.getMessage());
+			}
+		}
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditActorDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditActorDialog.java
new file mode 100644
index 000000000..666f75720
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditActorDialog.java
@@ -0,0 +1,682 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.math.Polygon;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.*;
+import com.bladecoder.engine.spine.SpineRenderer;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.AlignUtils;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.FilteredSelectBox;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+import com.bladecoder.engineeditor.ui.panels.OptionsInputPanel;
+
+import java.util.HashMap;
+
+public class EditActorDialog extends EditModelDialog<Scene, BaseActor> {
+
+    private final static float DEFAULT_DIM = 200;
+
+    private final static String BACKGROUND_TYPE_STR = "background";
+    private final static String SPRITE_TYPE_STR = "sprite";
+    private final static String CHARACTER_TYPE_STR = "character";
+    private final static String OBSTACLE_TYPE_STR = "obstacle";
+    private final static String ANCHOR_TYPE_STR = "anchor";
+    private final static String WALKZONE_TYPE_STR = "walkzone";
+
+    private static final String ACTOR_TYPES[] = {BACKGROUND_TYPE_STR, SPRITE_TYPE_STR, CHARACTER_TYPE_STR,
+            ANCHOR_TYPE_STR, WALKZONE_TYPE_STR, OBSTACLE_TYPE_STR};
+
+    private static final String ACTOR_RENDERERS[] = {Project.ATLAS_RENDERER_STRING, Project.SPINE_RENDERER_STRING,
+            Project.IMAGE_RENDERER_STRING, Project.PARTICLE_RENDERER_STRING,
+            Project.TEXT_RENDERER_STRING};
+
+    private static final String TYPES_INFO[] = {
+            "Background actors don't have sprites or animations. They are used to interact with objects drawn in the " +
+                    "background",
+            "Sprite actors have one or several sprites or animations",
+            "Character actors have dialogs and stand, walk and talk animations",
+            "Anchor actors are used as reference for positioning other actors",
+            "Define the walkable area for characters", "Obstacle actors forbids zones for walking actors"};
+
+    private static final String TEXT_ALIGN[] = {"left", "center", "right"};
+    private static final String ORG_ALIGN[] = {"bottom", "center", "left", "right", "top", "bottom-right",
+            "bottom-left", "top-right", "top-left"};
+
+    private InputPanel typePanel;
+    private InputPanel id;
+    private InputPanel layer;
+    private InputPanel visible;
+    private InputPanel interaction;
+    private InputPanel desc;
+    private InputPanel state;
+    private InputPanel renderer;
+    private InputPanel fakeDepth;
+    private InputPanel pos;
+    private InputPanel refPoint;
+    private InputPanel scale;
+    private InputPanel rot;
+    private InputPanel tint;
+    private InputPanel bboxFromRenderer;
+    private InputPanel zIndex;
+    private InputPanel walkingSpeed;
+    private InputPanel talkingTextPos;
+
+    private InputPanel orgAlign;
+
+    private InputPanel textColor;
+    private InputPanel textStyle;
+
+    // Spine Renderer
+    private InputPanel spineSkin;
+
+    // Particle Renderer
+    private InputPanel particleName;
+    private InputPanel particleAtlas;
+
+    // Text Renderer
+    private InputPanel text;
+    private InputPanel font;
+    private InputPanel size;
+    private InputPanel textAlign;
+
+    private InputPanel textMaxWidth;
+    private InputPanel borderWidth;
+    private InputPanel borderColor;
+    private InputPanel borderStraight;
+    private InputPanel shadowOffsetX;
+    private InputPanel shadowOffsetY;
+    private InputPanel shadowColor;
+
+    @SuppressWarnings("unchecked")
+    public EditActorDialog(Skin skin, Scene parent, BaseActor e) {
+        super(skin);
+
+        typePanel = InputPanelFactory.createInputPanel(skin, "Actor Type", "Actors can be from different types",
+                ACTOR_TYPES, true);
+
+        id = InputPanelFactory.createInputPanel(skin, "Actor ID", "IDs can not contain '.' character.", true);
+
+        layer = InputPanelFactory.createInputPanel(skin, "Actor Layer", "The layer for drawing order",
+                getLayers(parent), true);
+
+        visible = InputPanelFactory.createInputPanel(skin, "Visible", "The actor visibility.", Param.Type.BOOLEAN, true,
+                "true");
+
+        interaction = InputPanelFactory.createInputPanel(skin, "Interaction",
+                "True when the actor reacts to the user input.", Param.Type.BOOLEAN, true, "true");
+
+        desc = InputPanelFactory.createInputPanel(skin, "Description",
+                "The text showed when the cursor is over the actor.");
+        state = InputPanelFactory.createInputPanel(skin, "State",
+                "Initial state of the actor. Actors can be in several states along the game.");
+
+        renderer = InputPanelFactory.createInputPanel(skin, "Actor Renderer",
+                "Actors can be renderer from several sources", ACTOR_RENDERERS, true);
+
+        fakeDepth = InputPanelFactory.createInputPanel(skin, "Fake Depth", "Scene fake depth for scaling",
+                Param.Type.BOOLEAN, true, "false");
+
+        pos = InputPanelFactory.createInputPanel(skin, "Position", "The sprite position.", Param.Type.VECTOR2, true,
+                "0,0");
+        refPoint = InputPanelFactory.createInputPanel(skin, "Ref. Point",
+                "Point of reference to relative position other actors.", Param.Type.VECTOR2, true, "0,0");
+        scale = InputPanelFactory.createInputPanel(skin, "Scale", "The sprite scale.", Param.Type.VECTOR2, true, "1,1");
+
+        rot = InputPanelFactory.createInputPanel(skin, "Rotation", "The sprite rotation.", Param.Type.FLOAT, true, "0");
+
+        tint = InputPanelFactory.createInputPanel(skin, "Tint", "Draw the actor with the specified color (RRGGBBAA).",
+                Param.Type.COLOR, false);
+
+        bboxFromRenderer = InputPanelFactory.createInputPanel(skin, "BBox From Renderer",
+                "Sets the actor bounding box automatically from the sprite dimensions.", Param.Type.BOOLEAN, true,
+                "true");
+
+        zIndex = InputPanelFactory.createInputPanel(skin, "zIndex", "The order to draw.", Param.Type.FLOAT, false, "0");
+
+        orgAlign = InputPanelFactory.createInputPanel(skin, "orgAlign",
+                "Alignment of the origin for rotation and scale.", ORG_ALIGN, true);
+
+        walkingSpeed = InputPanelFactory.createInputPanel(skin, "Walking Speed",
+                "The walking speed in pix/sec. Default 700.", Param.Type.FLOAT, true,
+                Float.toString(CharacterActor.DEFAULT_WALKING_SPEED));
+
+        spineSkin = InputPanelFactory.createInputPanel(skin, "Skin", "The initial skin.");
+
+        textColor = InputPanelFactory.createInputPanel(skin, "Text Color",
+                "The text color (RRGGBBAA) when the actor talks.", Param.Type.COLOR, false);
+
+        textStyle = InputPanelFactory.createInputPanel(skin, "Text Style",
+                "The style to use (an entry in your `ui.json` in the `com.bladecoder.engine.ui" +
+                        ".TextManagerUI$TextManagerUIStyle` section).",
+                Param.Type.STRING, false);
+
+        talkingTextPos = InputPanelFactory.createInputPanel(skin, "Talking Text Pos",
+                "Position of the text when talking. Relative to the character position.", Param.Type.VECTOR2, false);
+
+        particleName = InputPanelFactory.createInputPanel(skin, "Particle Name", "The name of the particle system.",
+                Type.PARTICLE_ASSET, true);
+
+        particleAtlas = InputPanelFactory.createInputPanel(skin, "Particle Atlas",
+                "The atlas used by the particle system.", Type.ATLAS_ASSET, true);
+
+        text = InputPanelFactory.createInputPanel(skin, "Text", "The text to draw.", Type.SMALL_TEXT, true);
+        text.getCell(text.getField()).fillX();
+
+        font = InputPanelFactory.createInputPanel(skin, "Font", "Select the font name.", Type.FONT_ASSET, true);
+        size = InputPanelFactory.createInputPanel(skin, "Size", "The size of the text.", Type.INTEGER, true, "20");
+        textAlign = InputPanelFactory.createInputPanel(skin, "Text Align", "The alignment of the text.", TEXT_ALIGN,
+                true);
+        textMaxWidth = InputPanelFactory.createInputPanel(skin, "Max Width", "The max width of the text block.",
+                Type.INTEGER,
+                true, "0");
+        borderWidth = InputPanelFactory.createInputPanel(skin, "Border Width", "Zero for no border.", Type.INTEGER,
+                true, "0");
+        borderColor = InputPanelFactory.createInputPanel(skin, "Border Color", "The Border Color.", Type.COLOR, true,
+                "black");
+        borderStraight = InputPanelFactory.createInputPanel(skin, "Border Straigh", "Is the border straight?",
+                Type.BOOLEAN, true);
+        shadowOffsetX = InputPanelFactory.createInputPanel(skin, "Shadow Offset X", "The Shadow X offset.",
+                Type.INTEGER, true, "0");
+        shadowOffsetY = InputPanelFactory.createInputPanel(skin, "Shadow Offset Y", "The Shadow Y offset.",
+                Type.INTEGER, true, "0");
+        shadowColor = InputPanelFactory.createInputPanel(skin, "Shadow Color", "The shadow Color.", Type.COLOR, true,
+                "black");
+
+        setInfo(TYPES_INFO[0]);
+
+        ((FilteredSelectBox<String>) typePanel.getField()).addListener(new ChangeListener() {
+
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                typeChanged();
+            }
+        });
+
+        ((FilteredSelectBox<String>) renderer.getField()).addListener(new ChangeListener() {
+
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                rendererChanged();
+            }
+        });
+
+        init(parent, e,
+                new InputPanel[]{typePanel, id, renderer, particleName, particleAtlas, layer, visible, interaction,
+                        desc, state, fakeDepth, pos, refPoint, scale, rot, tint, text, font, size, textAlign,
+                        textMaxWidth,
+                        borderWidth, borderColor, borderStraight, shadowOffsetX, shadowOffsetY, shadowColor,
+                        bboxFromRenderer, zIndex, orgAlign, walkingSpeed, talkingTextPos, spineSkin, textColor,
+                        textStyle});
+
+        typeChanged();
+
+    }
+
+    private String[] getLayers(Scene parent) {
+        String[] result = new String[parent.getLayers().size()];
+
+        for (int i = 0; i < parent.getLayers().size(); i++) {
+            result[i] = parent.getLayers().get(i).getName();
+        }
+
+        return result;
+    }
+
+    private void typeChanged() {
+        int i = ((OptionsInputPanel) typePanel).getSelectedIndex();
+
+        setInfo(TYPES_INFO[i]);
+
+        hideAllInputs();
+
+        setVisible(pos, true);
+
+        if (!ACTOR_TYPES[i].equals(ANCHOR_TYPE_STR) && !ACTOR_TYPES[i].equals(WALKZONE_TYPE_STR)) {
+            setVisible(visible, true);
+        }
+
+        if (!ACTOR_TYPES[i].equals(OBSTACLE_TYPE_STR) && !ACTOR_TYPES[i].equals(ANCHOR_TYPE_STR)
+                && !ACTOR_TYPES[i].equals(WALKZONE_TYPE_STR)) {
+            setVisible(layer, true);
+            setVisible(interaction, true);
+            setVisible(desc, true);
+            setVisible(state, true);
+            setVisible(zIndex, true);
+            setVisible(refPoint, true);
+        }
+
+        if (ACTOR_TYPES[i].equals(SPRITE_TYPE_STR) || ACTOR_TYPES[i].equals(CHARACTER_TYPE_STR)) {
+            setVisible(renderer, true);
+            setVisible(fakeDepth, true);
+            setVisible(scale, true);
+            setVisible(rot, true);
+            setVisible(tint, true);
+            setVisible(bboxFromRenderer, true);
+            setVisible(orgAlign, true);
+        }
+
+        if (ACTOR_TYPES[i].equals(CHARACTER_TYPE_STR)) {
+            setVisible(walkingSpeed, true);
+            setVisible(textColor, true);
+            setVisible(textStyle, true);
+            setVisible(talkingTextPos, true);
+        }
+
+        rendererChanged();
+    }
+
+    private void rendererChanged() {
+        int i = ((OptionsInputPanel) renderer).getSelectedIndex();
+
+        // setInfo(RENDERERS_INFO[i]);
+
+        setVisible(spineSkin, false);
+
+        setVisible(particleName, false);
+        setVisible(particleAtlas, false);
+
+        setVisible(text, false);
+        setVisible(font, false);
+        setVisible(size, false);
+        setVisible(textAlign, false);
+        setVisible(textMaxWidth, false);
+        setVisible(borderWidth, false);
+        setVisible(borderColor, false);
+        setVisible(borderStraight, false);
+        setVisible(shadowOffsetX, false);
+        setVisible(shadowOffsetY, false);
+        setVisible(shadowColor, false);
+
+        if (renderer.isVisible()) {
+            if (ACTOR_RENDERERS[i].equals(Project.SPINE_RENDERER_STRING)) {
+                setVisible(spineSkin, true);
+            } else if (ACTOR_RENDERERS[i].equals(Project.PARTICLE_RENDERER_STRING)) {
+                setVisible(particleName, true);
+                setVisible(particleAtlas, true);
+            } else if (ACTOR_RENDERERS[i].equals(Project.TEXT_RENDERER_STRING)) {
+                setVisible(text, true);
+                setVisible(font, true);
+                setVisible(size, true);
+                setVisible(textAlign, true);
+                setVisible(textMaxWidth, true);
+                setVisible(borderWidth, true);
+                setVisible(borderColor, true);
+                setVisible(borderStraight, true);
+                setVisible(shadowOffsetX, true);
+                setVisible(shadowOffsetY, true);
+                setVisible(shadowColor, true);
+            }
+        }
+    }
+
+    private void hideAllInputs() {
+
+        for (int idx = 2; idx < i.length; idx++) {
+            InputPanel ip = i[idx];
+
+            setVisible(ip, false);
+        }
+    }
+
+    @Override
+    protected void inputsToModel(boolean create) {
+
+        String type = typePanel.getText();
+        boolean typeChanged = false;
+        BaseActor oldElement = e;
+        String oldId = null;
+
+        boolean isPlayer = false;
+
+        if (!create) {
+
+            typeChanged = (type.equals(CHARACTER_TYPE_STR) && !(e instanceof CharacterActor))
+                    || (type.equals(SPRITE_TYPE_STR) && (!(e instanceof SpriteActor) || e instanceof CharacterActor))
+                    || (type.equals(BACKGROUND_TYPE_STR)
+                    && (!(e instanceof InteractiveActor) || e instanceof SpriteActor))
+                    || (type.equals(OBSTACLE_TYPE_STR) && !(e instanceof ObstacleActor))
+                    || (type.equals(ANCHOR_TYPE_STR) && !(e instanceof AnchorActor))
+                    || (type.equals(WALKZONE_TYPE_STR) && !(e instanceof WalkZoneActor));
+
+            isPlayer = parent.getPlayer() == e;
+
+            // remove to allow id, zindex and layer change
+            parent.removeActor(e);
+
+            oldId = e.getId();
+        }
+
+        if (create || typeChanged) {
+            if (type.equals(BACKGROUND_TYPE_STR)) {
+                e = new InteractiveActor();
+            } else if (type.equals(SPRITE_TYPE_STR)) {
+                e = new SpriteActor();
+            } else if (type.equals(CHARACTER_TYPE_STR)) {
+                e = new CharacterActor();
+            } else if (type.equals(OBSTACLE_TYPE_STR)) {
+                e = new ObstacleActor();
+            } else if (type.equals(WALKZONE_TYPE_STR)) {
+                e = new WalkZoneActor();
+            } else if (type.equals(ANCHOR_TYPE_STR)) {
+                e = new AnchorActor();
+            }
+
+            if (!(e instanceof SpriteActor) && !(e instanceof AnchorActor)) {
+                Polygon bbox = e.getBBox();
+
+                bbox.setVertices(new float[8]);
+
+                float[] verts = bbox.getVertices();
+
+                verts[0] = -DEFAULT_DIM / 2;
+                verts[1] = 0f;
+                verts[2] = -DEFAULT_DIM / 2;
+                verts[3] = DEFAULT_DIM;
+                verts[4] = DEFAULT_DIM / 2;
+                verts[5] = DEFAULT_DIM;
+                verts[6] = DEFAULT_DIM / 2;
+                verts[7] = 0f;
+                bbox.dirty();
+            }
+        }
+
+        if (typeChanged) {
+            // Put sounds, verbs and animations in the new element
+
+            if (oldElement instanceof InteractiveActor && e instanceof InteractiveActor) {
+                HashMap<String, Verb> verbs = ((InteractiveActor) e).getVerbManager().getVerbs();
+                HashMap<String, Verb> oldVerbs = ((InteractiveActor) oldElement).getVerbManager().getVerbs();
+
+                for (String k : oldVerbs.keySet()) {
+                    Verb v = oldVerbs.get(k);
+                    verbs.put(k, v);
+                }
+            }
+
+            if (oldElement instanceof SpriteActor && e instanceof SpriteActor) {
+                ((SpriteActor) e).setRenderer(((SpriteActor) oldElement).getRenderer());
+            }
+        }
+
+        e.setId(ElementUtils.getCheckedId(id.getText(), parent.getActors().keySet().toArray(new String[0])));
+        e.setVisible(Boolean.parseBoolean(visible.getText()));
+
+        Vector2 p = Param.parseVector2(pos.getText());
+
+        e.setPosition(p.x, p.y);
+
+        if (e instanceof InteractiveActor) {
+            InteractiveActor ia = (InteractiveActor) e;
+
+            ia.setLayer(layer.getText());
+            ia.setInteraction(Boolean.parseBoolean(interaction.getText()));
+
+            Vector2 rp = Param.parseVector2(refPoint.getText());
+
+            ia.setRefPoint(rp.x, rp.y);
+
+            String key = ia.getDesc();
+
+            if (key == null || key.isEmpty() || key.charAt(0) != I18N.PREFIX || !e.getId().equals(oldId))
+                key = Ctx.project.getI18N().genKey(parent.getId(), e.getId(), "desc");
+
+            Ctx.project.getI18N().setTranslation(key, desc.getText());
+
+            if (desc.getText() != null)
+                ia.setDesc(key);
+            else
+                ia.setDesc(null);
+
+            ia.setState(state.getText());
+
+            float zi = 0f;
+
+            try {
+                zi = Float.parseFloat(zIndex.getText() == null ? "0" : zIndex.getText());
+            } catch (NumberFormatException e) {
+            }
+
+            ia.setZIndex(zi);
+
+            if (e instanceof SpriteActor) {
+                SpriteActor sa = (SpriteActor) e;
+
+                String rendererType = renderer.getText();
+
+                if (Project.ATLAS_RENDERER_STRING.equals(rendererType)) {
+                    if (sa.getRenderer() == null || !(sa.getRenderer() instanceof AtlasRenderer))
+                        sa.setRenderer(new AtlasRenderer());
+                } else if (Project.IMAGE_RENDERER_STRING.equals(rendererType)) {
+                    if (sa.getRenderer() == null || !(sa.getRenderer() instanceof ImageRenderer))
+                        sa.setRenderer(new ImageRenderer());
+                } else if (Project.PARTICLE_RENDERER_STRING.equals(rendererType)) {
+                    ParticleRenderer r;
+
+                    if (sa.getRenderer() == null || !(sa.getRenderer() instanceof ParticleRenderer)) {
+                        r = new ParticleRenderer();
+                        sa.setRenderer(r);
+                    } else {
+                        r = (ParticleRenderer) sa.getRenderer();
+                    }
+
+                    r.setParticleName(particleName.getText());
+                    r.setAtlasName(particleAtlas.getText());
+
+                } else if (Project.TEXT_RENDERER_STRING.equals(rendererType)) {
+                    TextRenderer r;
+
+                    if (sa.getRenderer() == null || !(sa.getRenderer() instanceof TextRenderer)) {
+                        r = new TextRenderer();
+                        sa.setRenderer(r);
+                    } else {
+                        r = (TextRenderer) sa.getRenderer();
+                    }
+
+                    key = text.getText();
+
+                    if (key == null || key.isEmpty() || key.charAt(0) != I18N.PREFIX || !e.getId().equals(oldId))
+                        key = Ctx.project.getI18N().genKey(parent.getId(), e.getId(), "text");
+
+                    Ctx.project.getI18N().setTranslation(key, text.getText());
+
+                    if (text.getText() != null)
+                        r.setText(key, text.getText());
+                    else
+                        r.setText(null, null);
+
+                    r.setFontSize(Integer.parseInt(size.getText()));
+                    r.setFontName(font.getText());
+                    r.setAlign(AlignUtils.getAlign(textAlign.getText()));
+                    r.setMaxWidth(Integer.parseInt(textMaxWidth.getText()));
+                    r.setBorderWidth(Integer.parseInt(borderWidth.getText()));
+                    r.setBorderColor(Param.parseColor(borderColor.getText()));
+                    r.setBorderStraight(Boolean.parseBoolean(borderStraight.getText()));
+                    r.setShadowOffsetX(Integer.parseInt(shadowOffsetX.getText()));
+                    r.setShadowOffsetY(Integer.parseInt(shadowOffsetY.getText()));
+                    r.setShadowColor(Param.parseColor(shadowColor.getText()));
+
+                    // dispose to force reload the text attributes
+                    sa.dispose();
+                } else if (Project.SPINE_RENDERER_STRING.equals(rendererType)) {
+                    SpineRenderer r;
+
+                    if (sa.getRenderer() == null || !(sa.getRenderer() instanceof SpineRenderer)) {
+                        r = new SpineRenderer();
+                        sa.setRenderer(r);
+                    } else {
+                        r = (SpineRenderer) sa.getRenderer();
+                    }
+
+                    try {
+                        r.setSkin(spineSkin.getText());
+                    } catch (Exception e) {
+                        r.setSkin(null);
+                        Message.showMsgDialog(getStage(), "Error setting skin.", e.getMessage());
+                    }
+                }
+
+                sa.getRenderer().setWorld(parent.getWorld());
+                boolean bbfr = Boolean.parseBoolean(bboxFromRenderer.getText());
+
+                if (bbfr != sa.isBboxFromRenderer())
+                    sa.setBboxFromRenderer(bbfr);
+
+                // Bbox always has to be valid
+                if (sa.getBBox().getVertices().length < 4) {
+                    sa.getRenderer().updateBboxFromRenderer(sa.getBBox());
+
+                    if (!sa.isBboxFromRenderer())
+                        sa.getRenderer().updateBboxFromRenderer(null);
+                }
+
+                sa.setFakeDepth(Boolean.parseBoolean(fakeDepth.getText()));
+
+                Vector2 ps = Param.parseVector2(scale.getText());
+                sa.setScale(ps.x, ps.y);
+                sa.setRot(Float.parseFloat(rot.getText()));
+                sa.getRenderer().setOrgAlign(AlignUtils.getAlign(orgAlign.getText()));
+                sa.setTint(Param.parseColor(tint.getText()));
+
+                if (e instanceof CharacterActor) {
+                    CharacterActor ca = (CharacterActor) e;
+
+                    ca.setWalkingSpeed(Float.parseFloat(walkingSpeed.getText()));
+                    ca.setTextColor(Param.parseColor(textColor.getText()));
+                    ca.setTextStyle(textStyle.getText());
+                    ca.setTalkingTextPos(Param.parseVector2(talkingTextPos.getText()));
+                }
+            }
+        }
+
+        parent.addActor(e);
+
+        if (isPlayer && !typeChanged)
+            parent.setPlayer((CharacterActor) e);
+
+        if (e instanceof InteractiveActor) {
+            SceneLayer l = parent.getLayer(((InteractiveActor) e).getLayer());
+            l.orderByZIndex();
+        }
+
+        if (e instanceof SpriteActor)
+            ((SpriteActor) e).retrieveAssets();
+
+        if (create && e instanceof WalkZoneActor && parent.getWalkZone() == null)
+            parent.setWalkZone(e.getId());
+
+        // TODO UNDO OP
+        // UndoOp undoOp = new UndoAddElement(doc, e);
+        // Ctx.project.getUndoStack().add(undoOp);
+
+        Ctx.project.setModified();
+    }
+
+    @Override
+    protected void modelToInputs() {
+
+        id.setText(e.getId());
+        visible.setText(Boolean.toString(e.isVisible()));
+        pos.setText(Param.toStringParam(new Vector2(e.getX(), e.getY())));
+
+        if (e instanceof InteractiveActor) {
+            InteractiveActor ia = (InteractiveActor) e;
+            layer.setText(ia.getLayer());
+            interaction.setText(Boolean.toString(ia.getInteraction()));
+            refPoint.setText(Param.toStringParam(ia.getRefPoint()));
+            desc.setText(Ctx.project.translate(ia.getDesc()));
+            state.setText(ia.getState());
+            zIndex.setText(Float.toString(ia.getZIndex()));
+
+            if (e instanceof SpriteActor) {
+                SpriteActor sa = (SpriteActor) e;
+
+                ActorRenderer r = sa.getRenderer();
+
+                if (r instanceof AtlasRenderer) {
+                    renderer.setText(Project.ATLAS_RENDERER_STRING);
+                } else if (r instanceof ImageRenderer) {
+                    renderer.setText(Project.IMAGE_RENDERER_STRING);
+                } else if (r instanceof ParticleRenderer) {
+                    renderer.setText(Project.PARTICLE_RENDERER_STRING);
+                    ParticleRenderer pr = (ParticleRenderer) r;
+
+                    particleName.setText(pr.getParticleName());
+                    particleAtlas.setText(pr.getAtlasName());
+                } else if (r instanceof TextRenderer) {
+                    renderer.setText(Project.TEXT_RENDERER_STRING);
+                    TextRenderer tr = (TextRenderer) r;
+
+                    text.setText(Ctx.project.translate(tr.getText()));
+                    size.setText(Integer.toString(tr.getFontSize()));
+                    font.setText(tr.getFontName());
+                    borderWidth.setText(Integer.toString(tr.getBorderWidth()));
+                    textAlign.setText(AlignUtils.getAlign(tr.getAlign()));
+                    textMaxWidth.setText(Integer.toString(tr.getMaxWidth()));
+                    borderColor.setText(tr.getBorderColor().toString());
+                    borderStraight.setText(Boolean.toString(tr.isBorderStraight()));
+                    shadowOffsetX.setText(Integer.toString(tr.getShadowOffsetX()));
+                    shadowOffsetY.setText(Integer.toString(tr.getShadowOffsetY()));
+                    shadowColor.setText(tr.getShadowColor().toString());
+
+                } else if (r instanceof SpineRenderer) {
+                    renderer.setText(Project.SPINE_RENDERER_STRING);
+                    spineSkin.setText(((SpineRenderer) r).getSkin());
+                }
+
+                fakeDepth.setText(Boolean.toString(sa.getFakeDepth()));
+                scale.setText(Param.toStringParam(new Vector2(sa.getScaleX(), sa.getScaleY())));
+                rot.setText(Float.toString(sa.getRot()));
+                tint.setText(sa.getTint() == null ? null : sa.getTint().toString());
+                bboxFromRenderer.setText(Boolean.toString(sa.isBboxFromRenderer()));
+                orgAlign.setText(AlignUtils.getAlign(sa.getRenderer().getOrgAlign()));
+
+                if (e instanceof CharacterActor) {
+                    CharacterActor ca = (CharacterActor) e;
+
+                    walkingSpeed.setText(Float.toString(ca.getWalkingSpeed()));
+                    textColor.setText(ca.getTextColor() == null ? null : ca.getTextColor().toString());
+                    textStyle.setText(ca.getTextStyle());
+                    talkingTextPos.setText(Param.toStringParam(ca.getTalkingTextPos()));
+                    typePanel.setText(CHARACTER_TYPE_STR);
+                } else {
+                    typePanel.setText(SPRITE_TYPE_STR);
+                }
+            } else {
+                typePanel.setText(BACKGROUND_TYPE_STR);
+            }
+        } else if (e instanceof AnchorActor) {
+            typePanel.setText(ANCHOR_TYPE_STR);
+        } else if (e instanceof WalkZoneActor) {
+            typePanel.setText(WALKZONE_TYPE_STR);
+        } else if (e instanceof ObstacleActor) {
+            typePanel.setText(OBSTACLE_TYPE_STR);
+        }
+
+    }
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditAnimationDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditAnimationDialog.java
new file mode 100644
index 000000000..d83db4803
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditAnimationDialog.java
@@ -0,0 +1,492 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.anim.AtlasAnimationDesc;
+import com.bladecoder.engine.anim.SpineAnimationDesc;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.anim.Tween.Type;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.*;
+import com.bladecoder.engine.spine.SpineRenderer;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.scneditor.AnimationWidget;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.FilteredSelectBox;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+import java.util.HashMap;
+
+public class EditAnimationDialog extends EditModelDialog<SpriteActor, AnimationDesc> {
+
+    public static final String ANIMATION_TYPES[] = {Tween.Type.NO_REPEAT.toString(), Tween.Type.REPEAT.toString(),
+            Tween.Type.YOYO.toString(), Tween.Type.REVERSE.toString()};
+
+    public static final String INFO = "Define sprites and animations";
+
+    InputPanel source;
+    InputPanel atlas;
+    InputPanel id;
+    InputPanel localizable;
+    InputPanel repeat;
+    InputPanel speed;
+    InputPanel count;
+    InputPanel in;
+    InputPanel out;
+    InputPanel sound;
+    InputPanel preload;
+    InputPanel dispose;
+
+    AnimationWidget spriteWidget = new AnimationWidget(this);
+
+    @SuppressWarnings("unchecked")
+    public EditAnimationDialog(Skin skin, SpriteActor p, AnimationDesc e) {
+        super(skin);
+
+        setInfo(INFO);
+
+        source = InputPanelFactory.createInputPanel(skin, "Source",
+                "Select the source where the sprite or animation is defined", new String[0], true);
+        atlas = InputPanelFactory.createInputPanel(skin, "Atlas", "Select the atlas for the selected Spine skeleton",
+                getAtlases(), true);
+        localizable = InputPanelFactory.createInputPanel(skin, "Localizable",
+                "True if the image is customizable per language.", Param.Type.BOOLEAN, true, "false");
+        id = InputPanelFactory.createInputPanel(skin, "ID", "Select the id of the animation", new String[0], true);
+        repeat = InputPanelFactory.createInputPanel(skin, "Animation type", "Select the type of the animation",
+                Param.Type.OPTION, true, Tween.Type.NO_REPEAT.toString(), Tween.Type.class.getEnumConstants());
+
+        speed = InputPanelFactory.createInputPanel(skin, "Speed", "Select the speed of the animation in secods",
+                Param.Type.FLOAT, true, "1.0");
+        count = InputPanelFactory.createInputPanel(skin, "Count", "Select the repeat times. -1 for infinity",
+                Param.Type.INTEGER, true, "-1");
+        in = InputPanelFactory.createInputPanel(skin, "In Dist",
+                "Select the distance in pixels to add to the actor position when the sprite is displayed",
+                Param.Type.VECTOR2, false);
+        out = InputPanelFactory.createInputPanel(skin, "Out Dist",
+                "Select the distance in pixels to add to the actor position when the sprite is changed",
+                Param.Type.VECTOR2, false);
+        sound = InputPanelFactory.createInputPanel(skin, "Sound",
+                "Select the sound ID that will be played when showing", Param.Type.SOUND, false);
+        preload = InputPanelFactory.createInputPanel(skin, "Preload", "Preload the animation when the scene is loaded",
+                Param.Type.BOOLEAN, true, "true");
+        dispose = InputPanelFactory.createInputPanel(skin, "Dispose When Played", "Dispose de animation after playing",
+                Param.Type.BOOLEAN, true, "false");
+
+        ((SelectBox<String>) repeat.getField()).addListener(new ChangeListener() {
+
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                showHideFieldsDelayCountFields();
+            }
+        });
+
+        ((FilteredSelectBox<String>) source.getField()).addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                EditorLogger.debug("EditAnimationDialog.setSource():" + source.getText());
+
+                setSource();
+                fillAnimations();
+            }
+        });
+
+        ((FilteredSelectBox<String>) id.getField()).addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                setAnimation();
+            }
+        });
+
+        ((FilteredSelectBox<String>) atlas.getField()).addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                setSource();
+                fillAnimations();
+            }
+        });
+
+        ((TextField) speed.getField()).addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                setAnimation();
+            }
+        });
+
+        setInfoWidget(spriteWidget);
+
+        init(p, e, new InputPanel[]{source, localizable, atlas, id, repeat, speed, count, in, out, sound, preload,
+                dispose});
+
+        addSources();
+
+        // call modelToInputs again to set the correct source
+        if (e != null)
+            modelToInputs();
+
+        setVisible(count, false);
+        setVisible(atlas, false);
+        setVisible(localizable, false);
+
+        ActorRenderer renderer = parent.getRenderer();
+        if (renderer instanceof ImageRenderer) {
+            setVisible(localizable, true);
+            setVisible(speed, false);
+            setVisible(repeat, false);
+            setVisible(id, false);
+        }
+
+        if (e != null) {
+            source.setText(e.source);
+        } else {
+            // If the actor has some animation, set the same source.
+            HashMap<String, AnimationDesc> animations = ((AnimationRenderer) p.getRenderer()).getAnimations();
+            if (animations.size() > 0) {
+                source.setText(animations.values().iterator().next().source);
+            } else {
+                // set the background source it atlas type
+                if (p.getRenderer() instanceof AtlasRenderer && p.getScene().getBackgroundAtlas() != null)
+                    source.setText(p.getScene().getBackgroundAtlas());
+            }
+        }
+
+        if (source.getText() != null && !source.getText().isEmpty()) {
+            setSource();
+
+            fillAnimations();
+
+            if (e != null) {
+                id.setText(e.id);
+            }
+        }
+    }
+
+    private void showHideFieldsDelayCountFields() {
+        String type = repeat.getText();
+
+        if (type.equals(Tween.Type.REPEAT.toString()) || type.equals(Tween.Type.YOYO.toString())) {
+            setVisible(count, true);
+        } else {
+            setVisible(count, false);
+        }
+    }
+
+    private void setSource() {
+        AnimationDesc anim = null;
+
+        ActorRenderer renderer = parent.getRenderer();
+        String sourceStr = source.getText();
+
+        if (renderer instanceof SpineRenderer) {
+            anim = new SpineAnimationDesc();
+
+            if (spineAtlasExists(sourceStr)) {
+                ((SpineAnimationDesc) anim).atlas = null;
+                setVisible(atlas, false);
+            } else {
+                if (!atlas.isVisible()) {
+                    setVisible(atlas, true);
+                }
+
+                ((SpineAnimationDesc) anim).atlas = atlas.getText();
+            }
+
+        } else if (renderer instanceof AtlasRenderer) {
+            anim = new AtlasAnimationDesc();
+        } else {
+            anim = new AnimationDesc();
+        }
+
+        anim.source = sourceStr;
+        anim.count = Tween.INFINITY;
+        anim.preload = true;
+        anim.disposeWhenPlayed = false;
+
+        if (renderer instanceof SpineRenderer) {
+            spriteWidget.setSource(Project.SPINE_RENDERER_STRING, anim);
+        } else if (renderer instanceof AtlasRenderer) {
+            spriteWidget.setSource(Project.ATLAS_RENDERER_STRING, anim);
+        } else if (renderer instanceof ImageRenderer) {
+            spriteWidget.setSource(Project.IMAGE_RENDERER_STRING, anim);
+        }
+    }
+
+    public boolean spineAtlasExists(String source) {
+        return EngineAssetManager.getInstance()
+                .assetExists(Ctx.project.getAssetPath() + Project.ATLASES_PATH + "/" + source + ".atlas");
+    }
+
+    private void setAnimation() {
+        String ids = id.getText();
+        String type = repeat.getText();
+        String speedStr = speed.getText();
+
+        @SuppressWarnings("unchecked")
+        FilteredSelectBox<String> cb = (FilteredSelectBox<String>) id.getField();
+
+        if (e != null || cb.getSelectedIndex() != 0)
+            spriteWidget.setAnimation(ids, speedStr, Tween.Type.valueOf(type));
+    }
+
+    private void fillAnimations() {
+        @SuppressWarnings("unchecked")
+        FilteredSelectBox<String> cb = (FilteredSelectBox<String>) id.getField();
+        cb.clearItems();
+
+        // When creating, give option to add all elements
+        if (e == null)
+            cb.getItems().add("<ADD ALL>");
+
+        String[] ids = spriteWidget.getAnimations();
+        for (String s : ids)
+            cb.getItems().add(s);
+
+        cb.getList().setItems(cb.getItems());
+        if (cb.getItems().size > 0)
+            cb.setSelectedIndex(0);
+
+        cb.invalidateHierarchy();
+
+        setAnimation();
+    }
+
+    String ext;
+
+    private void addSources() {
+        @SuppressWarnings("unchecked")
+        FilteredSelectBox<String> cb = (FilteredSelectBox<String>) source.getField();
+        String[] src = getSources();
+        cb.getItems().clear();
+
+        for (String s : src)
+            cb.getItems().add(s);
+
+        cb.getList().setItems(cb.getItems());
+        if (cb.getItems().size > 0)
+            cb.setSelectedIndex(0);
+        cb.invalidateHierarchy();
+    }
+
+    private String[] getSources() {
+        String path = null;
+        ActorRenderer renderer = parent.getRenderer();
+
+        if (renderer instanceof AtlasRenderer) {
+            path = Ctx.project.getAssetPath() + Project.ATLASES_PATH + "/" + Ctx.project.getResDir();
+            ext = EngineAssetManager.ATLAS_EXT;
+        } else if (renderer instanceof SpineRenderer) {
+            path = Ctx.project.getAssetPath() + Project.SPINE_PATH;
+            ext = EngineAssetManager.SPINE_EXT;
+        } else if (renderer instanceof ImageRenderer) {
+            path = Ctx.project.getAssetPath() + Project.IMAGE_PATH + "/" + Ctx.project.getResDir();
+            ext = "";
+        }
+
+        File f = new File(path);
+
+        String[] sources = f.list(new FilenameFilter() {
+
+            @Override
+            public boolean accept(File arg0, String arg1) {
+                return arg1.endsWith(ext);
+            }
+        });
+
+        if (sources != null) {
+            Arrays.sort(sources);
+
+            for (int i = 0; i < sources.length; i++)
+                sources[i] = sources[i].substring(0, sources[i].length() - ext.length());
+        } else {
+            sources = new String[0];
+        }
+
+        return sources;
+    }
+
+    private String[] getAtlases() {
+        String path = Ctx.project.getAssetPath() + Project.ATLASES_PATH + "/" + Ctx.project.getResDir();
+
+        File f = new File(path);
+
+        String[] atlases = f.list(new FilenameFilter() {
+
+            @Override
+            public boolean accept(File arg0, String arg1) {
+                return arg1.endsWith(EngineAssetManager.ATLAS_EXT);
+            }
+        });
+
+        if (atlases != null) {
+            Arrays.sort(atlases);
+
+            for (int i = 0; i < atlases.length; i++)
+                atlases[i] = atlases[i].substring(0, atlases[i].length() - EngineAssetManager.ATLAS_EXT.length());
+        } else {
+            atlases = new String[0];
+        }
+
+        return atlases;
+    }
+
+    /**
+     * Override to append all animations if selected.
+     */
+    @Override
+    protected void ok() {
+        @SuppressWarnings("unchecked")
+        FilteredSelectBox<String> cb = (FilteredSelectBox<String>) id.getField();
+
+        if (e == null && cb.getSelectedIndex() == 0) {
+            AnimationRenderer renderer = (AnimationRenderer) parent.getRenderer();
+
+            for (int i = 1; i < cb.getItems().size; i++) {
+                cb.setSelectedIndex(i);
+
+                if (renderer.getAnimations().get(id.getText()) != null)
+                    continue;
+
+                inputsToModel(true);
+                // doc.setId(e, cb.getItems().get(i));
+
+                if (listener != null)
+                    listener.changed(new ChangeEvent(), this);
+            }
+
+        } else {
+            super.ok();
+        }
+    }
+
+    @Override
+    protected void inputsToModel(boolean create) {
+
+        String sourceStr = source.getText();
+        AnimationRenderer renderer = (AnimationRenderer) parent.getRenderer();
+
+        if (create) {
+
+            if (renderer instanceof SpineRenderer) {
+                e = new SpineAnimationDesc();
+            } else if (renderer instanceof AtlasRenderer) {
+                e = new AtlasAnimationDesc();
+            } else {
+                e = new AnimationDesc();
+            }
+        } else {
+            HashMap<String, AnimationDesc> animations = renderer.getAnimations();
+            animations.remove(e.id);
+
+            if (e.id.equals(renderer.getInitAnimation()))
+                renderer.setInitAnimation(null);
+        }
+
+        if (renderer instanceof SpineRenderer) {
+            if (spineAtlasExists(sourceStr)) {
+                ((SpineAnimationDesc) e).atlas = null;
+                setVisible(atlas, false);
+            } else {
+                if (!atlas.isVisible()) {
+                    setVisible(atlas, true);
+                }
+
+                ((SpineAnimationDesc) e).atlas = atlas.getText();
+            }
+        }
+
+        e.id = id.getText();
+        e.sound = sound.getText();
+        e.source = sourceStr;
+        e.count = Integer.parseInt(count.getText());
+        e.preload = Boolean.parseBoolean(preload.getText());
+        e.disposeWhenPlayed = Boolean.parseBoolean(dispose.getText());
+        e.animationType = Type.valueOf(repeat.getText());
+        e.inD = Param.parseVector2(in.getText());
+        e.outD = Param.parseVector2(out.getText());
+        e.duration = Float.parseFloat(speed.getText());
+
+        ((AnimationRenderer) parent.getRenderer()).addAnimation(e);
+
+        if (renderer instanceof ImageRenderer && Boolean.parseBoolean(localizable.getText()) && e.source != null
+                && e.source.length() > 0) {
+            e.source = I18N.PREFIX + e.source;
+        }
+
+        if (renderer.getInitAnimation() == null)
+            renderer.setInitAnimation(e.id);
+
+        // TODO UNDO OP
+        // UndoOp undoOp = new UndoAddElement(doc, e);
+        // Ctx.project.getUndoStack().add(undoOp);
+
+        Ctx.project.setModified();
+    }
+
+    @Override
+    protected void modelToInputs() {
+        source.setText(e.source);
+
+        if (atlas.isVisible() && e instanceof SpineAnimationDesc)
+            atlas.setText(((SpineAnimationDesc) e).atlas);
+
+        id.setText(e.id);
+        repeat.setText(e.animationType.toString());
+        speed.setText(Float.toString(e.duration));
+        count.setText(Integer.toString(e.count));
+        in.setText(Param.toStringParam(e.inD));
+        out.setText(Param.toStringParam(e.outD));
+        sound.setText(e.sound);
+        preload.setText(Boolean.toString(e.preload));
+        dispose.setText(Boolean.toString(e.disposeWhenPlayed));
+
+        showHideFieldsDelayCountFields();
+
+        ActorRenderer renderer = parent.getRenderer();
+        if (renderer instanceof ImageRenderer && e.source != null && e.source.length() > 1
+                && e.source.charAt(0) == I18N.PREFIX) {
+            localizable.setText("true");
+            source.setText(e.source.substring(1));
+        }
+    }
+
+    @Override
+    protected boolean validateFields() {
+        AnimationRenderer renderer = (AnimationRenderer) parent.getRenderer();
+        HashMap<String, AnimationDesc> animations = renderer.getAnimations();
+
+        if ((e == null && animations.get(id.getText()) != null)
+                || (e != null && animations.get(id.getText()) != null && !e.id.equals(id.getText()))) {
+            id.setError(true);
+            return false;
+        }
+
+        return super.validateFields();
+    }
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditChapterDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditChapterDialog.java
similarity index 74%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditChapterDialog.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditChapterDialog.java
index 209d7c488..a82f90fbe 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditChapterDialog.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditChapterDialog.java
@@ -15,7 +15,6 @@
  ******************************************************************************/
 package com.bladecoder.engineeditor.ui;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.text.MessageFormat;
 
@@ -28,13 +27,16 @@
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent;
 import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.WorldDocument;
-import com.bladecoder.engineeditor.ui.components.EditDialog;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.model.Chapter;
+import com.bladecoder.engineeditor.ui.panels.EditDialog;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
 
 public class EditChapterDialog extends EditDialog {
 
-	private WorldDocument doc;
+	private Chapter doc;
 	private InputPanel inputId;
 
 	private String previousId = null;
@@ -42,12 +44,12 @@ public class EditChapterDialog extends EditDialog {
 	
     private ChangeListener listener;
 
-	public EditChapterDialog(Skin skin, WorldDocument doc, String chapter) {
+	public EditChapterDialog(Skin skin, Chapter doc, String chapter) {
 		super("", skin);
 		
 		this.doc = doc;
 
-		inputId = new InputPanel(skin, "Chapter ID", "The id of the chapter",
+		inputId = InputPanelFactory.createInputPanel(skin, "Chapter ID", "The id of the chapter",
 				true);
 
 		setInfo("An adventure game is composed of chapters. Chapters contains scenes.");
@@ -68,15 +70,15 @@ public EditChapterDialog(Skin skin, WorldDocument doc, String chapter) {
 	
 
 	private void create() {
-		try {
-			newId = ((WorldDocument) doc).createChapter(inputId.getText()).getRootAttr("id");
-		} catch (FileNotFoundException | TransformerException
-				| ParserConfigurationException e) {
+		try {	
+			newId = doc.createChapter(inputId.getText());
+		} catch (TransformerException
+				| ParserConfigurationException | IOException e) {
 			String msg = "Something went wrong while creating the chapter.\n\n"
 					+ e.getClass().getSimpleName() + " - " + e.getMessage();
-			Ctx.msg.show(getStage(), msg, 2);
+			Message.showMsg(getStage(), msg, 2);
 
-			e.printStackTrace();
+			EditorLogger.printStackTrace(e);
 		}
 	}
 
@@ -86,19 +88,19 @@ private void renameChapter() {
 
 			try {
 				// save selected chapter if renamed chapter is the selected chapter
-				if(previousId.equals(Ctx.project.getSelectedChapter())) {
-					Ctx.project.getSelectedChapter().save();
+				if(previousId.equals(Ctx.project.getChapter().getId())) {
+					Ctx.project.getChapter().save();
 				}
 				
-				((WorldDocument) doc).renameChapter(previousId, newId);
+				doc.renameChapter(previousId, newId);
 				
 				// Reload chapter if renamed chapter is the selected chapter
-				if(previousId.equals(Ctx.project.getSelectedChapter())) {
+				if(previousId.equals(Ctx.project.getChapter().getId())) {
 					Ctx.project.loadChapter(newId);
 				}
 				
 				// sets the init chapter
-				if(previousId.equals(Ctx.project.getWorld().getInitChapter())) {
+				if(previousId.equals(doc.getInitChapter())) {
 					Ctx.project.getWorld().setInitChapter(newId);
 				}
 				
@@ -109,9 +111,9 @@ private void renameChapter() {
 						+ e1.getClass().getSimpleName()
 						+ " - "
 						+ e1.getMessage();
-				Ctx.msg.show(getStage(), msg, 3);
+				Message.showMsg(getStage(), msg, 3);
 
-				e1.printStackTrace();
+				EditorLogger.printStackTrace(e1);
 			}
 		}
 	}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditDialogDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditDialogDialog.java
new file mode 100644
index 000000000..704baf970
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditDialogDialog.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+
+public class EditDialogDialog extends EditModelDialog<CharacterActor, Dialog> {
+	public static final String INFO = "[RED]DEPRECATED:[]\nActors can have several dialogs defined. Dialogs have a list of options to choose. This is the legacy option to create simple dialogs, for more complex dialogs use the *Ink* language.";
+
+	private InputPanel id;
+
+	public EditDialogDialog(Skin skin, CharacterActor parent, Dialog e) {
+		super(skin);
+
+		id = InputPanelFactory.createInputPanel(skin, "Dialog ID", "Select the dialog id to create.", true);
+
+		setInfo(INFO);
+
+		init(parent, e, new InputPanel[] { id });
+	}
+
+	@Override
+	protected void inputsToModel(boolean create) {
+
+		if (create) {
+			e = new Dialog();
+		} else {
+			parent.getDialogs().remove(e.getId());
+		}
+
+		if (parent.getDialogs() != null)
+			e.setId(ElementUtils.getCheckedId(id.getText(), parent.getDialogs().keySet().toArray(new String[0])));
+		else
+			e.setId(id.getText());
+
+		parent.addDialog(e);
+
+		// TODO UNDO OP
+//		UndoOp undoOp = new UndoAddElement(doc, e);
+//		Ctx.project.getUndoStack().add(undoOp);
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void modelToInputs() {
+		id.setText(e.getId());
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditInkDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditInkDialog.java
new file mode 100644
index 000000000..ec4057d8c
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditInkDialog.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.EditDialog;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+
+public class EditInkDialog extends EditDialog {
+
+	private InputPanel inkStory;
+
+	public EditInkDialog(Skin skin) {
+		super("", skin);
+
+		inkStory = InputPanelFactory.createInputPanel(skin, "Ink Story", "Ink story file for this chapter",
+				getInkFiles(), false);
+
+		setTitle("SET INK STORY FILE");
+		setInfo("Each chapter have its own ink story file.\n\nStories are compiled Ink files with the '.ink.json' extension in the 'assets/model' folder.");
+
+		addInputPanel(inkStory);
+
+		inkStory.setText(Ctx.project.getWorld().getInkManager().getStoryName());
+	}
+
+	@Override
+	protected boolean validateFields() {
+		return inkStory.validateField();
+	}
+
+	@Override
+	protected void ok() {
+		Ctx.project.getWorld().getInkManager().setStoryName(inkStory.getText());
+		Ctx.project.setModified();
+	}
+
+	private String[] getInkFiles() {
+		String path = Ctx.project.getAssetPath() + Project.MODEL_PATH;
+
+		File f = new File(path);
+
+		String inkFiles[] = f.list(new FilenameFilter() {
+
+			@Override
+			public boolean accept(File arg0, String arg1) {
+				if (arg1.endsWith(EngineAssetManager.INK_EXT))
+					return true;
+
+				return false;
+			}
+		});
+
+		if (inkFiles == null)
+			inkFiles = new String[0];
+
+		for (int i = 0; i < inkFiles.length; i++)
+			inkFiles[i] = inkFiles[i].substring(0, inkFiles[i].length() - EngineAssetManager.INK_EXT.length());
+
+		Arrays.sort(inkFiles);
+
+		return inkFiles;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditLayerDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditLayerDialog.java
new file mode 100644
index 000000000..39dd62ab0
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditLayerDialog.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SceneLayer;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+
+public class EditLayerDialog extends EditModelDialog<Scene, SceneLayer> {
+
+    private InputPanel name;
+    private InputPanel visible;
+    private InputPanel dynamic;
+    private InputPanel parallax;
+
+    public EditLayerDialog(Skin skin, Scene parent, SceneLayer e) {
+        super(skin);
+
+        name = InputPanelFactory.createInputPanel(skin, "Layer Name", "The name of the layer", true);
+        visible = InputPanelFactory.createInputPanel(skin, "Visible", "Layer Visibility", Param.Type.BOOLEAN, true, "true");
+        dynamic = InputPanelFactory.createInputPanel(skin, "Dynamic", "True for actor reordering based in y position", Param.Type.BOOLEAN, true, "false");
+        parallax = InputPanelFactory.createInputPanel(skin, "Parallax Factor", "The multiplier factor for parallax effect", Param.Type.FLOAT, true, "1.0");
+
+        setInfo("Scenes can have a list of layers. Actors are added to a specific layer to control the draw order");
+
+        init(parent, e, new InputPanel[]{name, visible, dynamic, parallax});
+    }
+
+    @Override
+    protected void inputsToModel(boolean create) {
+
+        if (create) {
+            e = new SceneLayer();
+        }
+
+        // if the name is changed. Change all actor layer name.
+        if (!create && !e.getName().equals(name.getText())) {
+            for (SceneLayer l : parent.getLayers()) {
+                for (int i = 0; i < l.getActors().size(); i++) {
+                    if (l.getActors().get(i).getLayer().equals(e.getName())) {
+                        l.getActors().get(i).setLayer(name.getText());
+                    }
+                }
+            }
+        }
+
+        e.setName(name.getText());
+        e.setVisible(Boolean.parseBoolean(visible.getText()));
+        e.setDynamic(Boolean.parseBoolean(dynamic.getText()));
+        e.setParallaxMultiplier(Float.parseFloat(parallax.getText()));
+
+        if (create) {
+            parent.getLayers().add(e);
+        }
+
+        // TODO UNDO OP
+//		UndoOp undoOp = new UndoAddElement(doc, e);
+//		Ctx.project.getUndoStack().add(undoOp);
+
+        Ctx.project.setModified();
+    }
+
+    @Override
+    protected void modelToInputs() {
+        name.setText(e.getName());
+        visible.setText(Boolean.toString(e.isVisible()));
+        dynamic.setText(Boolean.toString(e.isDynamic()));
+        parallax.setText(Float.toString(e.getParallaxMultiplier()));
+    }
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditOptionDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditOptionDialog.java
new file mode 100644
index 000000000..03922020a
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditOptionDialog.java
@@ -0,0 +1,149 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.DialogOption;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+
+public class EditOptionDialog extends EditModelDialog<Dialog, DialogOption> {
+
+	private InputPanel text;
+	private InputPanel voice;
+	private InputPanel responseText;
+	private InputPanel responseVoice;
+	private InputPanel verb;
+	private InputPanel next;
+	private InputPanel visible;
+	private InputPanel once;
+	private int pos;
+	
+
+	public EditOptionDialog(Skin skin, Dialog parent, DialogOption e, int pos) {
+		super(skin);
+		
+		this.pos = e == null ? pos + 1 : pos;
+
+		text = InputPanelFactory.createInputPanel(skin, "Text", "The sentence of the dialog to say by the player",
+				Type.SMALL_TEXT, true);
+		voice = InputPanelFactory.createInputPanel(skin, "Voice", "The voice filename for the player lines",
+				Type.VOICE, false);
+		responseText = InputPanelFactory.createInputPanel(skin, "Response Text", "The response said by the character",
+				Type.TEXT, false);
+		responseVoice = InputPanelFactory.createInputPanel(skin, "Response Voice", "The voice filename for the response lines",
+				Type.VOICE, false);
+		verb = InputPanelFactory.createInputPanel(skin, "Verb", "The verb to execute when choosing this option");
+		next = InputPanelFactory.createInputPanel(skin, "Next Dialog",
+				"The next dialog to show when this option is selected",
+				getActorDialogs((CharacterActor) Ctx.project.getSelectedActor()), false);
+		visible = InputPanelFactory.createInputPanel(skin, "Visible", "The visibility", Param.Type.BOOLEAN, true, "true");
+		once = InputPanelFactory.createInputPanel(skin, "Once", "When true, the option is hidden after selection",
+				Param.Type.BOOLEAN, false);
+
+		setInfo("A dialog is composed of an option tree. Each option is a dialog sentence that the user can choose to say");
+
+		text.getCell(text.getField()).fillX();
+		responseText.getCell(responseText.getField()).fillX();
+
+		init(parent, e, new InputPanel[] { text, responseText, voice, responseVoice, verb, next, visible, once });
+	}
+
+	@Override
+	protected void inputsToModel(boolean create) {
+
+		if (create) {
+			e = new DialogOption();
+//			parent.addOption(e);
+			
+			parent.getOptions().add(pos, e);
+		}
+		
+		String key = e.getText();
+
+		if (key == null || key.isEmpty() || key.charAt(0) != I18N.PREFIX)
+			key = Ctx.project.getI18N().genKey(Ctx.project.getSelectedScene().getId(), Ctx.project.getSelectedActor().getId(), parent.getId(), pos, "text");
+
+		Ctx.project.getI18N().setTranslation(key, text.getText());
+
+		if (text.getText() != null && !text.getText().isEmpty())
+			e.setText(key);
+		else
+			e.setText(null);
+
+		String responseKey = e.getResponseText();
+		
+		if (responseKey == null || responseKey.isEmpty() || responseKey.charAt(0) != I18N.PREFIX)
+			responseKey = Ctx.project.getI18N().genKey(Ctx.project.getSelectedScene().getId(), Ctx.project.getSelectedActor().getId(), parent.getId(), pos, "responseText");
+		
+		Ctx.project.getI18N().setTranslation(responseKey, responseText.getText());
+
+		if (responseText.getText() != null && !responseText.getText().isEmpty())
+			e.setResponseText(responseKey);
+		else
+			e.setResponseText(null);
+
+		e.setVerbId(verb.getText());
+		e.setNext(next.getText());
+		e.setVisible(Boolean.parseBoolean(visible.getText()));
+		e.setOnce(Boolean.parseBoolean(once.getText()));
+		e.setVoiceId(voice.getText());
+		e.setResponseVoiceId(responseVoice.getText());
+		
+
+		// TODO UNDO OP
+		// UndoOp undoOp = new UndoAddElement(doc, e);
+		// Ctx.project.getUndoStack().add(undoOp);
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void modelToInputs() {
+		text.setText(Ctx.project.translate(e.getText()));
+		
+		
+		responseText.setText(Ctx.project.translate(e.getResponseText()));
+		
+		verb.setText(e.getVerbId());
+		next.setText(e.getNext());
+
+		visible.setText(Boolean.toString(e.isVisible()));
+		once.setText(Boolean.toString(e.isOnce()));
+		voice.setText(e.getVoiceId());
+		responseVoice.setText(e.getResponseVoiceId());
+	}
+
+	private String[] getActorDialogs(CharacterActor actor) {
+		Dialog[] array = actor.getDialogs().values().toArray(new Dialog[0]);
+
+		String[] result = new String[array.length + 1];
+		result[0] = "this";
+
+		for (int i = 0; i < array.length; i++) {
+			result[i + 1] = array[i].getId();
+		}
+
+		return result;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditSceneDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditSceneDialog.java
new file mode 100644
index 000000000..79ebdd201
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditSceneDialog.java
@@ -0,0 +1,308 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Container;
+import com.badlogic.gdx.scenes.scene2d.ui.Image;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.Scaling;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.MusicDesc;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SceneLayer;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.FilteredSelectBox;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+import com.bladecoder.engineeditor.undo.UndoCreateScene;
+import com.bladecoder.engineeditor.undo.UndoEditScene;
+
+public class EditSceneDialog extends EditModelDialog<World, Scene> {
+
+	public static final String INFO = "An adventure is composed of many scenes (rooms/screens).\n"
+			+ "Inside a scene, there are actors and a 'player'.\nThe player/user can interact with actors throught 'verbs'.";
+
+	private Image bgImage;
+	private Container<Image> infoContainer;
+	private TextureAtlas atlas;
+
+	private InputPanel id;
+	private InputPanel backgroundAtlas;
+	private InputPanel backgroundRegion;
+	private InputPanel depthVector;
+	private InputPanel state;
+	private InputPanel music;
+	private InputPanel loopMusic;
+	private InputPanel volumeMusic;
+	private InputPanel initialMusicDelay;
+	private InputPanel repeatMusicDelay;
+	private InputPanel stopWhenLeaving;
+	private InputPanel sceneSize;
+	private InputPanel walkzone;
+
+	@SuppressWarnings("unchecked")
+	public EditSceneDialog(Skin skin, World parent, Scene e) {
+
+		super(skin);
+
+		id = InputPanelFactory.createInputPanel(skin, "Scene ID", "The ID is mandatory for scenes.", true);
+		backgroundAtlas = InputPanelFactory.createInputPanel(skin, "Background Atlas",
+				"The atlas where the background for the scene is located", Type.ATLAS_ASSET, false);
+		backgroundRegion = InputPanelFactory.createInputPanel(skin, "Background Region Id",
+				"The region id for the background.", new String[0], false);
+//		depthVector = InputPanelFactory.createInputPanel(skin, "Depth Vector",
+//				"X: the actor 'y' position for a 0.0 scale, Y: the actor 'y' position for a 1.0 scale.",
+//				Param.Type.VECTOR2, false);
+
+		depthVector = InputPanelFactory.createInputPanel(skin, "Fake depth",
+				"Change actor scale based in the 'y' axis position.", Param.Type.BOOLEAN, true, "false");
+
+		state = InputPanelFactory.createInputPanel(skin, "State", "The initial state for the scene.", false);
+		music = InputPanelFactory.createInputPanel(skin, "Music Filename", "The music for the scene", Type.MUSIC_ASSET,
+				false);
+		loopMusic = InputPanelFactory.createInputPanel(skin, "Loop Music", "If the music is playing in looping",
+				Param.Type.BOOLEAN, true, "true");
+		volumeMusic = InputPanelFactory.createInputPanel(skin, "Music Volume",
+				"The volume of the music. Value is between 0 and 1.", Param.Type.FLOAT, true, "1");
+		initialMusicDelay = InputPanelFactory.createInputPanel(skin, "Initial music delay",
+				"The time to wait before playing", Param.Type.FLOAT, true, "0");
+		repeatMusicDelay = InputPanelFactory.createInputPanel(skin, "Repeat music delay",
+				"The time to wait before repetitions", Param.Type.FLOAT, true, "-1");
+		stopWhenLeaving = InputPanelFactory.createInputPanel(skin, "Stop music when leaving",
+				"Stops the music when leaving the current scene.", Param.Type.BOOLEAN, true, "true");
+
+		sceneSize = InputPanelFactory.createInputPanel(skin, "Scene Dimension",
+				"Sets the size of the scene. If empty, the background image size is used as the scene dimension.",
+				Param.Type.DIMENSION, false);
+
+		walkzone = InputPanelFactory.createInputPanel(skin, "Walkzone", "The initial walkzone.", Type.WALKZONE_ACTOR,
+				false);
+
+		bgImage = new Image();
+		bgImage.setScaling(Scaling.fit);
+		infoContainer = new Container<Image>(bgImage);
+		setInfo(INFO);
+
+		((FilteredSelectBox<String>) backgroundAtlas.getField()).addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				try {
+					fillBGRegions(backgroundAtlas, backgroundRegion);
+				} catch (Exception e) {
+					EditorLogger.error("Error loading regions from selected atlas: " + backgroundAtlas.getText() + "."
+							+ backgroundRegion.getText());
+				}
+			}
+		});
+
+		((FilteredSelectBox<String>) backgroundRegion.getField()).addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				showBgImage(backgroundRegion.getText());
+			}
+		});
+
+		try {
+			fillBGRegions(backgroundAtlas, backgroundRegion);
+		} catch (Exception e2) {
+			EditorLogger.error("Error loading regions from selected atlas: " + backgroundAtlas.getText() + "."
+					+ backgroundRegion.getText());
+		}
+
+		init(parent, e, new InputPanel[] { id, backgroundAtlas, backgroundRegion, depthVector, state, sceneSize, music,
+				loopMusic, volumeMusic, initialMusicDelay, repeatMusicDelay, stopWhenLeaving, walkzone });
+	}
+
+	private void showBgImage(String r) {
+		if (atlas == null || r == null)
+			return;
+
+		bgImage.setDrawable(new TextureRegionDrawable(atlas.findRegion(r)));
+
+		infoContainer.prefWidth(250);
+		infoContainer.prefHeight(250);
+		setInfoWidget(infoContainer);
+	}
+
+	private void fillBGRegions(InputPanel atlasInput, InputPanel regionInput) {
+		@SuppressWarnings("unchecked")
+		FilteredSelectBox<String> cb = (FilteredSelectBox<String>) regionInput.getField();
+
+		// cb.clearItems();
+		cb.getItems().clear();
+
+		if (atlas != null) {
+			atlas.dispose();
+			atlas = null;
+		}
+
+		if (backgroundAtlas.getText().isEmpty()) {
+			setInfoWidget(new Label(INFO, getSkin()));
+			return;
+		}
+
+		atlas = new TextureAtlas(Gdx.files.absolute(Ctx.project.getAssetPath() + Project.ATLASES_PATH + "/"
+				+ Ctx.project.getResDir() + "/" + atlasInput.getText() + ".atlas"));
+
+		Array<AtlasRegion> regions = atlas.getRegions();
+
+		for (AtlasRegion r : regions)
+			if (cb.getItems().indexOf(r.name, false) == -1)
+				cb.getItems().add(r.name);
+
+		cb.getList().setItems(cb.getItems());
+		if (cb.getItems().size > 0)
+			cb.setSelectedIndex(0);
+
+		cb.invalidateHierarchy();
+
+		showBgImage(regionInput.getText());
+	}
+
+	@Override
+	protected void inputsToModel(boolean create) {
+
+		if (create) {
+			e = new Scene(Ctx.project.getWorld());
+
+			// CREATE DEFAULT LAYERS: BG, DYNAMIC, FG
+			SceneLayer l = new SceneLayer();
+			l.setName("foreground");
+			l.setVisible(true);
+			l.setDynamic(false);
+			e.addLayer(l);
+
+			l = new SceneLayer();
+			l.setName("dynamic");
+			l.setVisible(true);
+			l.setDynamic(true);
+			e.addLayer(l);
+
+			l = new SceneLayer();
+			l.setName("background");
+			l.setVisible(true);
+			l.setDynamic(false);
+			e.addLayer(l);
+		} else {
+			parent.getScenes().remove(e.getId());
+		}
+
+		e.setId(ElementUtils.getCheckedId(id.getText(),
+				Ctx.project.getWorld().getScenes().keySet().toArray(new String[0])));
+
+		e.setBackgroundAtlas(backgroundAtlas.getText());
+		e.setBackgroundRegionId(backgroundRegion.getText());
+
+		boolean dv = Boolean.parseBoolean(depthVector.getText());
+
+		if (dv == true && e.getDepthVector() == null) { // create depth vector
+			e.setDepthVector(new Vector2(Ctx.project.getWorld().getHeight(), 0));
+		} else if (dv == false && e.getDepthVector() != null) { // Remove depth vector
+			e.setDepthVector(null);
+		}
+
+		e.setState(state.getText());
+
+		MusicDesc md = null;
+
+		if (music.getText() != null) {
+			md = new MusicDesc();
+
+			md.setFilename(music.getText());
+			md.setLoop(Boolean.parseBoolean(loopMusic.getText()));
+			md.setVolume(Float.parseFloat(volumeMusic.getText()));
+			md.setInitialDelay(Float.parseFloat(initialMusicDelay.getText()));
+			md.setRepeatDelay(Float.parseFloat(repeatMusicDelay.getText()));
+			md.setStopWhenLeaving(Boolean.parseBoolean(stopWhenLeaving.getText()));
+		}
+
+		e.setMusicDesc(md);
+
+		e.setSceneSize(Param.parseVector2(sceneSize.getText()));
+
+		e.setWalkZone(walkzone.getText());
+
+		parent.addScene(e);
+
+		if (parent.getScenes().size() == 1)
+			parent.setInitScene(e.getId());
+
+		// UNDO OP
+		if (create) {
+			Ctx.project.getUndoStack().add(new UndoCreateScene(e));
+		} else {
+			Ctx.project.getUndoStack().add(new UndoEditScene(e));
+		}
+
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, e);
+	}
+
+	@Override
+	protected void modelToInputs() {
+
+		id.setText(e.getId());
+		backgroundAtlas.setText(e.getBackgroundAtlas());
+		backgroundRegion.setText(e.getBackgroundRegionId());
+
+		if (e.getDepthVector() != null)
+			depthVector.setText("true");
+		else
+			depthVector.setText("false");
+
+		state.setText(e.getState());
+
+		MusicDesc md = e.getMusicDesc();
+
+		if (md != null) {
+			music.setText(md.getFilename());
+			loopMusic.setText(Boolean.toString(md.isLoop()));
+			volumeMusic.setText(Float.toString(md.getVolume()));
+			initialMusicDelay.setText(Float.toString(md.getInitialDelay()));
+			repeatMusicDelay.setText(Float.toString(md.getRepeatDelay()));
+			stopWhenLeaving.setText(Boolean.toString(md.isStopWhenLeaving()));
+		}
+
+		if (e.getSceneSize() != null)
+			sceneSize.setText(Param.toStringParam(e.getSceneSize()));
+
+		walkzone.setText(e.getWalkZone());
+	}
+
+	@Override
+	protected void result(Object object) {
+		if (atlas != null) {
+			atlas.dispose();
+		}
+
+		super.result(object);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditSoundDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditSoundDialog.java
new file mode 100644
index 000000000..67b7703e6
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditSoundDialog.java
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.util.HashMap;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.model.SoundDesc;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.common.ModelTools;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+import com.bladecoder.engineeditor.undo.UndoCreateSound;
+
+public class EditSoundDialog extends EditModelDialog<World, SoundDesc> {
+
+	private InputPanel id;
+	private InputPanel filename;
+	private InputPanel loop;
+	private InputPanel volume;
+	private InputPanel pan;
+	private InputPanel pitch;
+	private InputPanel preload;
+
+	private Sound s = null;
+
+	public EditSoundDialog(Skin skin, World parent, SoundDesc e) {
+		super(skin);
+
+		id = InputPanelFactory.createInputPanel(skin, "Sound ID", "The id of the sound", true);
+		filename = InputPanelFactory.createInputPanel(skin, "Filename", "Filename of the sound",
+				ModelTools.getSoundList(), true);
+		loop = InputPanelFactory.createInputPanel(skin, "Loop", "True if the sound is looping", Param.Type.BOOLEAN,
+				true, "false");
+		volume = InputPanelFactory.createInputPanel(skin, "Volume", "Select the volume between 0 and 1",
+				Param.Type.FLOAT, true, "1.0");
+		pan = InputPanelFactory.createInputPanel(skin, "Pan",
+				"Panning in the range -1 (full left) to 1 (full right). 0 is center position", Param.Type.FLOAT, true,
+				"0.0");
+		pitch = InputPanelFactory.createInputPanel(skin, "Pitch",
+				"The pitch multiplier, 1 == default, >1 == faster, <1 == slower, the value has to be between 0.5 and 2.0",
+				Param.Type.FLOAT, true, "1.0");
+		preload = InputPanelFactory.createInputPanel(skin, "Preload",
+				"True if the sound has to be loaded when the scene is loaded.", Param.Type.BOOLEAN, true, "true");
+
+		setInfo("Actors can have a list of sounds that can be associated to Sprites or played with the 'sound' action");
+
+		init(parent, e, new InputPanel[] { id, filename, loop, volume, pan, pitch, preload });
+
+		TextButton playButton = new TextButton("Play", skin, "no-toggled");
+
+		playButton.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				if (s != null) {
+					s.dispose();
+					s = null;
+				}
+
+				if (filename.getText() != null && !filename.getText().isEmpty()) {
+					try {
+						s = Gdx.audio.newSound(
+								new FileHandle(
+										Ctx.project.getAssetPath() + Project.SOUND_PATH + "/" + filename.getText()));
+
+						s.play(Float.parseFloat(volume.getText()), Float.parseFloat(pitch.getText()),
+								Float.parseFloat(pan.getText()));
+					} catch (Exception e) {
+						Message.showMsg(getStage(), "Could not play sound: " + e.getMessage(), 4);
+					}
+				}
+
+			}
+		});
+
+		Table bt = getButtonTable();
+		bt.add(playButton);
+	}
+
+	@Override
+	protected void inputsToModel(boolean create) {
+
+		if (create) {
+			e = new SoundDesc();
+
+			// UNDO OP
+			Ctx.project.getUndoStack().add(new UndoCreateSound(e));
+		} else {
+			HashMap<String, SoundDesc> sounds = parent.getSounds();
+			sounds.remove(e.getId());
+		}
+
+		String checkedId = parent.getSounds() == null ? id.getText()
+				: ElementUtils.getCheckedId(id.getText(),
+						parent.getSounds().keySet().toArray(new String[parent.getSounds().size()]));
+
+		e.setId(checkedId);
+		e.setFilename(filename.getText());
+		e.setLoop(Boolean.parseBoolean(loop.getText()));
+		e.setVolume(Float.parseFloat(volume.getText()));
+		e.setPan(Float.parseFloat(pan.getText()));
+		e.setPitch(Float.parseFloat(pitch.getText()));
+		e.setPreload(Boolean.parseBoolean(preload.getText()));
+
+		parent.getSounds().put(e.getId(), e);
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void modelToInputs() {
+		id.setText(e.getId());
+		filename.setText(e.getFilename());
+		loop.setText(Boolean.toString(e.getLoop()));
+		volume.setText(Float.toString(e.getVolume()));
+		pan.setText(Float.toString(e.getPan()));
+		pitch.setText(Float.toString(e.getPitch()));
+		preload.setText(Boolean.toString(e.isPreload()));
+	}
+
+	@Override
+	protected void result(Object object) {
+		if (s != null) {
+			s.dispose();
+			s = null;
+		}
+
+		super.result(object);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditVerbDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditVerbDialog.java
new file mode 100644
index 000000000..bdc6e6653
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditVerbDialog.java
@@ -0,0 +1,193 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.util.HashMap;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField.TextFieldListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.model.VerbManager;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.EditableSelectBox;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+import com.bladecoder.engineeditor.ui.panels.OptionsInputPanel;
+import com.bladecoder.engineeditor.ui.panels.ScopePanel;
+
+public class EditVerbDialog extends EditModelDialog<VerbManager, Verb> {
+	private static final String VERBS[] = { "lookat", "pickup", "talkto", "use", "leave", "action", "enter", "exit" };
+
+	private static final String SCENE_VERBS[] = { "init", "test" };
+
+	private static final String DEFAULT_DESC = "Verbs are used to create the game interaction. Select or write the verb to create";
+	private static final String CUSTOM_VERB_DESC = "User defined verbs can be called\n from dialogs or inside other verbs using \nthe 'run_verb' action";
+
+	private static final String VERBS_INFO[] = {
+			"Called when the user clicks\n in the 'lookat' icon\n over a object in scene",
+			"Called when the user clicks\n in the 'pickup' icon\n over a object in scene",
+			"Called when the user clicks\n in the 'talkto' icon\n over a character in scene",
+			"Called when the user drags and drops\n an inventory object over\n an object in scene or in inventory",
+			"Called when the user clicks\n in an exit zone in scene",
+			"Called when the user clicks in the actor. Useful for one click actions. Doesn't show the verb menu.",
+			"Called when the player enters\n in the object bounding box",
+			"Called when the player exits\n the object bounding box" };
+
+	private static final String SCENE_VERBS_INFO[] = { "Called every time\n that the scene is loaded",
+			"Called every time\n that the scene is loaded in test mode.\n'test' verb is called before the 'init' verb" };
+
+	private InputPanel id;
+	private InputPanel state;
+	private InputPanel target;
+	private InputPanel icon;
+
+	private String scope;
+
+	public EditVerbDialog(Skin skin, String scope, VerbManager parentElement, Verb e) {
+		super(skin);
+
+		this.scope = scope;
+
+		id = InputPanelFactory.createInputPanel(skin, "Verb ID", "Select the verb to create.", Type.EDITABLE_OPTION,
+				true, "", ScopePanel.SCENE_SCOPE.equals(scope) ? SCENE_VERBS : VERBS);
+		state = InputPanelFactory.createInputPanel(skin, "State", "Select the state.");
+		target = InputPanelFactory.createInputPanel(skin, "Target BaseActor",
+				"Select the target actor id for the 'use' verb.");
+
+		icon = InputPanelFactory.createInputPanel(skin, "UI Icon",
+				"The icon that will be showed in the ui for selecting the verb.");
+
+		if (ScopePanel.SCENE_SCOPE.equals(scope))
+			setInfo(SCENE_VERBS_INFO[0]);
+		else
+			setInfo(VERBS_INFO[0]);
+
+		id.getField().addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				updateDesc();
+			}
+
+		});
+
+		((EditableSelectBox<?>) id.getField()).getInput().setTextFieldListener(new TextFieldListener() {
+			@Override
+			public void keyTyped(TextField actor, char c) {
+				updateDesc();
+			}
+		});
+
+		init(parentElement, e, new InputPanel[] { id, state, target, icon });
+
+		setVisible(target, false);
+
+		if (e != null) {
+			String id = e.getId();
+
+			if (id.equals("use"))
+				setVisible(target, true);
+		}
+
+		updateDesc();
+	}
+
+	private void updateDesc() {
+		String idStr = id.getText();
+		int i = ((OptionsInputPanel) id).getSelectedIndex();
+
+		if (i == -1) {
+			if (idStr != null && idStr.isEmpty())
+				setInfo(DEFAULT_DESC);
+			else
+				setInfo(CUSTOM_VERB_DESC);
+		} else {
+			if (ScopePanel.SCENE_SCOPE.equals(scope)) {
+				setInfo(SCENE_VERBS_INFO[i]);
+			} else {
+				setInfo(VERBS_INFO[i]);
+			}
+		}
+
+		if (idStr != null && idStr.equals("use"))
+			setVisible(target, true);
+		else
+			setVisible(target, false);
+
+		pack();
+	}
+
+	@Override
+	protected void inputsToModel(boolean create) {
+
+		if (create) {
+			e = new Verb();
+		} else {
+			HashMap<String, Verb> verbs = parent.getVerbs();
+			verbs.remove(e.getHashKey());
+		}
+
+		e.setId(id.getText());
+		e.setState(state.getText());
+		e.setTarget(target.getText());
+		e.setIcon(icon.getText());
+
+		parent.addVerb(e);
+
+		// TODO UNDO OP
+//		UndoOp undoOp = new UndoAddElement(doc, e);
+//		Ctx.project.getUndoStack().add(undoOp);
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void modelToInputs() {
+		id.setText(e.getId());
+		state.setText(e.getState());
+		target.setText(e.getTarget());
+		icon.setText(e.getIcon());
+	}
+
+	@Override
+	protected boolean validateFields() {
+
+		if (!super.validateFields())
+			return false;
+
+		Verb verb = parent.getVerb(id.getText(), state.getText(), target.getText());
+
+		if (verb == null)
+			return true;
+
+		boolean sameParams = verb.getId().equals(id.getText())
+				&& ActionUtils.compareNullStr(verb.getState(), state.getText())
+				&& ActionUtils.compareNullStr(verb.getTarget(), target.getText());
+
+		if (sameParams && (e == null || verb != e)) {
+			id.setError(true);
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActionList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/LayerList.java
similarity index 50%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActionList.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/LayerList.java
index 4fe4d830a..78c15e07c 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ActionList.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/LayerList.java
@@ -15,32 +15,42 @@
  ******************************************************************************/
 package com.bladecoder.engineeditor.ui;
 
-import java.text.MessageFormat;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.badlogic.gdx.utils.Array;
-import com.bladecoder.engineeditor.ui.components.CellRenderer;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.ElementList;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SceneLayer;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.ModelList;
+
+public class LayerList extends ModelList<Scene, SceneLayer> {
 
-public class ActionList extends ElementList {
-	Skin skin;
-	
 	private ImageButton upBtn;
 	private ImageButton downBtn;
+	private ImageButton visibilityBtn;
+
+	public LayerList(Skin skin) {
+		super(skin, false);
 
-	public ActionList(Skin skin) {
-		super(skin, true);
-		this.skin = skin;
-		
-		setCellRenderer(listCellRenderer);
+		list.setCellRenderer(listCellRenderer);
+
+		visibilityBtn = new ImageButton(skin);
+		toolbar.addToolBarButton(visibilityBtn, "ic_eye", "Toggle Visibility", "Toggle Visibility");
+
+		visibilityBtn.setDisabled(false);
+
+		visibilityBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				toggleVisibility();
+			}
+		});
 
 		upBtn = new ImageButton(skin);
 		downBtn = new ImageButton(skin);
@@ -62,14 +72,13 @@ public void changed(ChangeEvent event, Actor actor) {
 		});
 
 		upBtn.addListener(new ChangeListener() {
-			
+
 			@Override
 			public void changed(ChangeEvent event, Actor actor) {
 				up();
 			}
 		});
-		
-		
+
 		downBtn.addListener(new ChangeListener() {
 			@Override
 			public void changed(ChangeEvent event, Actor actor) {
@@ -78,37 +87,16 @@ public void changed(ChangeEvent event, Actor actor) {
 		});
 	}
 
-	@Override
-	protected EditElementDialog getEditElementDialogInstance(Element e) {
-		return new EditActionDialog(skin, doc, parent, e);
-	}
-	
-	@Override
-	protected void create() {
-		EditElementDialog dialog = getEditElementDialogInstance(null);
-		dialog.show(getStage());
-		dialog.setListener(new ChangeListener() {
-			@Override
-			public void changed(ChangeEvent event, Actor actor) {
-				int pos = list.getSelectedIndex() + 1;
-				
-				Element e2 = null;							
-				
-				if(pos!=0 && pos < list.getItems().size) 
-					e2 = list.getItems().get(pos);
-				
-				Element e = ((EditElementDialog)actor).getElement();
-				list.getItems().insert(pos, e);
-
-				Node parent = e.getParentNode();
-				parent.removeChild(e);
-				parent.insertBefore(e, e2);					
-				
-				list.setSelectedIndex(pos);
-				
-				list.invalidateHierarchy();
-			}			
-		});
+	private void toggleVisibility() {
+
+		SceneLayer e = list.getSelected();
+
+		if (e == null)
+			return;
+
+		e.setVisible(!e.isVisible());
+
+		Ctx.project.setModified();
 	}
 
 	private void up() {
@@ -117,89 +105,130 @@ private void up() {
 		if (pos == -1 || pos == 0)
 			return;
 
-		Array<Element> items =  list.getItems();
-		Element e = items.get(pos);
-		Element e2 = items.get(pos - 1);
+		Array<SceneLayer> items = list.getItems();
+		SceneLayer e = items.get(pos);
+		SceneLayer e2 = items.get(pos - 1);
 
-		Node parent = e.getParentNode();
-		parent.removeChild(e);
-		parent.insertBefore(e, e2);
+		parent.getLayers().set(pos, e2);
+		parent.getLayers().set(pos - 1, e);
 
 		items.removeIndex(pos);
-		items.insert( pos - 1, e);
+		items.insert(pos - 1, e);
 		list.setSelectedIndex(pos - 1);
 		upBtn.setDisabled(list.getSelectedIndex() == 0);
 		downBtn.setDisabled(list.getSelectedIndex() == list.getItems().size - 1);
 
-		doc.setModified(e);
+		Ctx.project.setModified();
 	}
 
 	private void down() {
 		int pos = list.getSelectedIndex();
-		Array<Element> items =  list.getItems();
+		Array<SceneLayer> items = list.getItems();
 
 		if (pos == -1 || pos == items.size - 1)
 			return;
 
-		Element e = items.get(pos);
-		Element e2 = pos + 2 < items.size ? items.get(pos + 2) : null;
+		SceneLayer e = items.get(pos);
+		SceneLayer e2 = pos + 1 < items.size ? items.get(pos + 1) : null;
 
-		Node parent = e.getParentNode();
-		parent.removeChild(e);
-		parent.insertBefore(e, e2);
+		parent.getLayers().set(pos, e2);
+		parent.getLayers().set(pos + 1, e);
 
-		
 		items.removeIndex(pos);
 		items.insert(pos + 1, e);
 		list.setSelectedIndex(pos + 1);
 		upBtn.setDisabled(list.getSelectedIndex() == 0);
 		downBtn.setDisabled(list.getSelectedIndex() == list.getItems().size - 1);
 
-		doc.setModified(e);
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected EditModelDialog<Scene, SceneLayer> getEditElementDialogInstance(SceneLayer l) {
+		return new EditLayerDialog(skin, parent, l);
+	}
+
+	@Override
+	protected void delete() {
+
+		int pos = list.getSelectedIndex();
+
+		if (pos == -1)
+			return;
+
+		if (list.getItems().size < 2) {
+			String msg = "The layer will not be deleted, at least one layer must exist";
+			Message.showMsg(getStage(), msg, 3);
+
+			return;
+		}
+
+		SceneLayer e = list.getSelected();
+
+		if (e.getActors().isEmpty()) {
+			SceneLayer l = removeSelected();
+			parent.getLayers().remove(l);
+			Ctx.project.setModified();
+		} else {
+			String msg = "The layer is not empty.";
+			Message.showMsg(getStage(), msg, 3);
+		}
+
+	}
+	
+	@Override
+	protected void copy() {
+		// TODO
+	}
+	
+	@Override
+	protected void paste() {
+		// TODO
 	}
 
 	// -------------------------------------------------------------------------
 	// ListCellRenderer
 	// -------------------------------------------------------------------------
-	private final CellRenderer<Element> listCellRenderer = new CellRenderer<Element>() {
+	private static final CellRenderer<SceneLayer> listCellRenderer = new CellRenderer<SceneLayer>() {
 
 		@Override
-		protected String getCellTitle(Element e) {
-			String id = e.getAttribute("class").isEmpty()?e.getAttribute("action_name"): e.getAttribute("class");
-
-			String actor = e.getAttribute("actor");
-
-			if (!actor.isEmpty())
-				id = MessageFormat.format("{1}.{0}", id, actor);
-			
-			return id;
+		protected String getCellTitle(SceneLayer l) {
+			return l.getName();
 		}
 
 		@Override
-		protected String getCellSubTitle(Element e) {
-			StringBuilder sb = new StringBuilder();
+		protected String getCellSubTitle(SceneLayer l) {
 
-			NamedNodeMap attr = e.getAttributes();
+			StringBuilder sb = new StringBuilder();
 
-			for (int i = 0; i < attr.getLength(); i++) {
-				Node n = attr.item(i);
-				String name = n.getNodeName();
+			sb.append("dynamic: ").append(l.isDynamic());
+			sb.append(" visible: ").append(l.isVisible());
+			sb.append(" parallax: ").append(l.getParallaxMultiplier());
 
-				if (name.equals("actor") || name.equals("class") || name.equals("action_name"))
-					continue;
+			return sb.toString();
+		}
 
-				String v = n.getNodeValue();
+		@Override
+		public TextureRegion getCellImage(SceneLayer l) {
+			String u = null;
 
-				sb.append(name).append(": ").append(doc.getTranslation(v)).append(' ');
+			if (l.isVisible()) {
+				u = "eye";
+			} else {
+				u = "eye_disabled";
 			}
-			
-			return sb.toString();
+
+			return Ctx.assetManager.getIcon(u);
 		}
-		
+
 		@Override
 		protected boolean hasSubtitle() {
 			return true;
 		}
-	};
 
+		@Override
+		protected boolean hasImage() {
+			return true;
+		}
+	};
 }
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/OptionList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/OptionList.java
new file mode 100644
index 000000000..e0634a060
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/OptionList.java
@@ -0,0 +1,256 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.utils.Array;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.DialogOption;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.ModelList;
+import com.bladecoder.engineeditor.undo.UndoDeleteOption;
+
+public class OptionList extends ModelList<Dialog, DialogOption> {
+	Skin skin;
+
+	private ImageButton upBtn;
+	private ImageButton downBtn;
+
+	public OptionList(Skin skin) {
+		super(skin, false);
+		this.skin = skin;
+
+		setCellRenderer(listCellRenderer);
+
+		upBtn = new ImageButton(skin);
+		downBtn = new ImageButton(skin);
+
+		toolbar.addToolBarButton(upBtn, "ic_up", "Move up", "Move up");
+		toolbar.addToolBarButton(downBtn, "ic_down", "Move down", "Move down");
+		toolbar.pack();
+
+		list.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				int pos = list.getSelectedIndex();
+
+				toolbar.disableEdit(pos == -1);
+				upBtn.setDisabled(pos == -1 || pos == 0);
+				downBtn.setDisabled(pos == -1 || pos == list.getItems().size - 1);
+			}
+		});
+
+		upBtn.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				up();
+			}
+		});
+
+		downBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				down();
+			}
+		});
+
+		Ctx.project.addPropertyChangeListener(Project.NOTIFY_ELEMENT_CREATED, new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+				if (evt.getNewValue() instanceof DialogOption && !(evt.getSource() instanceof EditOptionDialog)) {
+					addElements(parent, parent.getOptions());
+				}
+			}
+		});
+	}
+
+	@Override
+	protected EditModelDialog<Dialog, DialogOption> getEditElementDialogInstance(DialogOption e) {
+		return new EditOptionDialog(skin, parent, e, list.getSelectedIndex());
+	}
+
+	@Override
+	protected void create() {
+		EditOptionDialog dialog = (EditOptionDialog) getEditElementDialogInstance(null);
+		dialog.show(getStage());
+		dialog.setListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				int pos = list.getSelectedIndex() + 1;
+
+				DialogOption e = ((EditOptionDialog) actor).getElement();
+				list.getItems().insert(pos, e);
+				list.setSelectedIndex(pos);
+				list.invalidateHierarchy();
+			}
+		});
+	}
+
+	private void up() {
+		int pos = list.getSelectedIndex();
+
+		if (pos == -1 || pos == 0)
+			return;
+
+		Array<DialogOption> items = list.getItems();
+		DialogOption e = items.get(pos);
+		DialogOption e2 = items.get(pos - 1);
+
+		items.set(pos - 1, e);
+		items.set(pos, e2);
+
+		parent.getOptions().set(pos - 1, e);
+		parent.getOptions().set(pos, e2);
+
+		list.setSelectedIndex(pos - 1);
+		upBtn.setDisabled(list.getSelectedIndex() == 0);
+		downBtn.setDisabled(list.getSelectedIndex() == list.getItems().size - 1);
+
+		Ctx.project.setModified();
+	}
+
+	private void down() {
+		int pos = list.getSelectedIndex();
+		Array<DialogOption> items = list.getItems();
+
+		if (pos == -1 || pos == items.size - 1)
+			return;
+
+		DialogOption e = items.get(pos);
+		DialogOption e2 = items.get(pos + 1);
+
+		parent.getOptions().set(pos + 1, e);
+		parent.getOptions().set(pos, e2);
+
+		items.set(pos + 1, e);
+		items.set(pos, e2);
+		list.setSelectedIndex(pos + 1);
+		upBtn.setDisabled(list.getSelectedIndex() == 0);
+		downBtn.setDisabled(list.getSelectedIndex() == list.getItems().size - 1);
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void delete() {
+
+		DialogOption option = removeSelected();
+
+		int idx = parent.getOptions().indexOf(option);
+
+		parent.getOptions().remove(option);
+
+		// TRANSLATIONS
+		Ctx.project.getI18N().putTranslationsInElement(option);
+
+		// UNDO
+		Ctx.project.getUndoStack().add(new UndoDeleteOption(parent, option, idx));
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void copy() {
+		DialogOption e = list.getSelected();
+
+		if (e == null)
+			return;
+
+		clipboard = (DialogOption) ElementUtils.cloneElement(e);
+		toolbar.disablePaste(false);
+
+		// TRANSLATIONS
+		Ctx.project.getI18N().putTranslationsInElement(clipboard);
+	}
+
+	@Override
+	protected void paste() {
+		DialogOption newElement = (DialogOption) ElementUtils.cloneElement(clipboard);
+
+		int pos = list.getSelectedIndex() + 1;
+
+		list.getItems().insert(pos, newElement);
+
+		parent.addOption(newElement);
+
+		Ctx.project.getI18N().extractStrings(Ctx.project.getSelectedScene().getId(),
+				Ctx.project.getSelectedActor().getId(), parent.getId(), pos, newElement);
+
+		list.setSelectedIndex(pos);
+		list.invalidateHierarchy();
+
+		Ctx.project.setModified();
+	}
+
+	// -------------------------------------------------------------------------
+	// ListCellRenderer
+	// -------------------------------------------------------------------------
+	private final CellRenderer<DialogOption> listCellRenderer = new CellRenderer<DialogOption>() {
+
+		@Override
+		protected String getCellTitle(DialogOption e) {
+			String text = e.getText();
+
+			int i = parent.getOptions().indexOf(e);
+
+			String str = i + ". " + Ctx.project.translate(text);
+			
+			if(e.isOnce())
+				str = "[[ONCE]" + str;
+			
+			if(!e.isVisible())
+				str = "[GRAY]" + str + "[]";
+			
+			return str;
+		}
+
+		@Override
+		protected String getCellSubTitle(DialogOption e) {
+
+			StringBuilder sb = new StringBuilder();
+			String response = e.getResponseText();
+
+			if (response != null && !response.isEmpty())
+				sb.append("R: ").append(Ctx.project.translate(response).replace("\n", "|")).append(' ');
+
+			if (e.getVerbId() != null)
+				sb.append(" verb: ").append(e.getVerbId());
+
+			if (e.getNext() != null)
+				sb.append(" next: ").append(e.getNext());
+
+			return sb.toString();
+		}
+
+		@Override
+		protected boolean hasSubtitle() {
+			return true;
+		}
+	};
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/PackageDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/PackageDialog.java
new file mode 100644
index 000000000..08fd73fda
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/PackageDialog.java
@@ -0,0 +1,854 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Cell;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.utils.Array;
+import com.badlogicgames.packr.Packr;
+import com.badlogicgames.packr.PackrConfig;
+import com.badlogicgames.packr.PackrConfig.Platform;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.util.Config;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.HttpUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.common.OrderedProperties;
+import com.bladecoder.engineeditor.common.RunProccess;
+import com.bladecoder.engineeditor.ui.panels.EditDialog;
+import com.bladecoder.engineeditor.ui.panels.FileInputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanel;
+import com.bladecoder.engineeditor.ui.panels.InputPanelFactory;
+import com.kotcrab.vis.ui.widget.file.FileChooser;
+import com.kotcrab.vis.ui.widget.file.FileChooserListener;
+import com.kotcrab.vis.ui.widget.file.FileTypeFilter;
+import org.apache.commons.compress.archivers.ArchiveException;
+import org.apache.commons.compress.compressors.CompressorException;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+public class PackageDialog extends EditDialog {
+    private static final String ARCH_PROP = "package.arch";
+    private static final String DIR_PROP = "package.dir";
+
+    private static final String DESKTOP_LAUNCHER = "DesktopLauncher.java";
+
+    private static final String INFO = "Package the Game for distribution";
+    private static final String[] ARCHS = {"desktop", "android", "ios"};
+    private static final String[] DESKTOP_TYPES = {"Bundle JRE", "Runnable jar"};
+    private static final String[] ANDROID_TYPES = {".apk", ".aab"};
+    private static final String[] OSS = {"windows64", "linux64", "macOS-x86"};
+
+    private final InputPanel arch;
+    private final InputPanel dir;
+
+    private final InputPanel desktopType;
+    private final InputPanel androidType;
+
+    private final InputPanel os;
+    private final FileInputPanel linux64JRE;
+    private final FileInputPanel winJRE64;
+    private final FileInputPanel osxJRE;
+    private final InputPanel version;
+    private final InputPanel icon;
+    private final InputPanel versionCode;
+    private final InputPanel androidSDK;
+    private final InputPanel expansionFile;
+    private final InputPanel androidKeyStore;
+    private final InputPanel androidKeyAlias;
+    private final InputPanel androidKeyStorePassword;
+    private final InputPanel androidKeyAliasPassword;
+
+    private final InputPanel iosSignIdentity;
+    private final InputPanel iosProvisioningProfile;
+
+    private final InputPanel customBuildParameters;
+
+    private final InputPanel[] options;
+
+    public PackageDialog(final Skin skin) {
+        super("PACKAGE GAME", skin);
+
+        arch = InputPanelFactory.createInputPanel(skin, "Architecture", "Select the target Architecture for the game",
+                ARCHS, true);
+        dir = new FileInputPanel(skin, "Output Directory", "Select the output directory to put the package",
+                FileInputPanel.DialogType.DIRECTORY);
+        desktopType = InputPanelFactory.createInputPanel(skin, "Type", "Select the package type", DESKTOP_TYPES, true);
+        androidType = InputPanelFactory.createInputPanel(skin, "Type", "Select the package type", ANDROID_TYPES, true);
+        os = InputPanelFactory.createInputPanel(skin, "OS", "Select the OS of the package", OSS, true);
+
+        FileTypeFilter typeFilter = new FileTypeFilter(true);
+        typeFilter.addRule("Compressed files", "zip", "tar.gz");
+
+        linux64JRE = new FileInputPanel(skin, "JRE lin64",
+                "Select the 64 bits Linux JRE Location to bundle. Must be a .zip or a .tar.gz file",
+                FileInputPanel.DialogType.OPEN_FILE);
+        linux64JRE.setFileTypeFilter(typeFilter);
+
+        winJRE64 = new FileInputPanel(skin, "JRE win64",
+                "Select the Windows 64 bits JRE Location to bundle. Must be a .zip or a .tar.gz file",
+                FileInputPanel.DialogType.OPEN_FILE);
+        winJRE64.setFileTypeFilter(typeFilter);
+
+        osxJRE = new FileInputPanel(skin, "JRE mac-x86",
+                "Select the MacOS-x86 JRE Location to bundle. Must be a .zip or a .tar.gz file",
+                FileInputPanel.DialogType.OPEN_FILE);
+        osxJRE.setFileTypeFilter(typeFilter);
+
+        version = InputPanelFactory.createInputPanel(skin, "Version", "Select the package version", true);
+        icon = new FileInputPanel(skin, "MacOS Icon", "The icon (.icns) for the Mac package. It is not mandatory.",
+                FileInputPanel.DialogType.OPEN_FILE, false);
+        versionCode = InputPanelFactory.createInputPanel(skin, "Version Code", "An integer that identify the version.",
+                Type.INTEGER, true);
+        androidSDK = new FileInputPanel(skin, "SDK",
+                "Select the Android SDK Location. If empty, the ANDROID_HOME variable will be used.",
+                FileInputPanel.DialogType.DIRECTORY, false);
+        expansionFile = InputPanelFactory.createInputPanel(skin, "Expansion File",
+                "If your assets exceeds 100mb, you have to create an expansion file to upload the game to the Play " +
+                        "Store.",
+                Param.Type.BOOLEAN, true, "false");
+        androidKeyStore = new FileInputPanel(skin, "KeyStore", "Select the Key Store Location",
+                FileInputPanel.DialogType.OPEN_FILE);
+        androidKeyAlias = InputPanelFactory.createInputPanel(skin, "KeyAlias", "Select the Key Alias", true);
+
+        androidKeyStorePassword = InputPanelFactory.createInputPanel(skin, "KeyStorePasswd", "Key Store Password",
+                true);
+        androidKeyAliasPassword = InputPanelFactory.createInputPanel(skin, "KeyAliasPasswd", "Key Alias Password",
+                true);
+
+        iosSignIdentity = InputPanelFactory.createInputPanel(skin, "Sign Identity",
+                "Empty for auto select.\nThis field matches against the start of the certificate name. Alternatively " +
+                        "you can use a certificate fingerprint.\nIf the value is enclosed in / a regexp search will " +
+                        "be" +
+                        " done against the certificate name instead.\nRun the command 'security find-identity -v -p " +
+                        "codesigning' or use theKeyChain Access OS X app to view your installed certificates.",
+                false);
+
+        iosProvisioningProfile = InputPanelFactory.createInputPanel(skin, "Provisioning Profile",
+                "Empty for auto select.", false);
+
+        customBuildParameters = InputPanelFactory.createInputPanel(skin, "Custom build parameters",
+                "You can add extra build parameters for customized build scripts.", false);
+
+        options = new InputPanel[]{androidType, desktopType, os, linux64JRE, winJRE64, osxJRE, version, icon,
+                versionCode, androidSDK, expansionFile, androidKeyStore, androidKeyAlias, iosSignIdentity,
+                iosProvisioningProfile, customBuildParameters};
+
+        addInputPanel(arch);
+        addInputPanel(dir);
+
+        for (InputPanel i : options) {
+            addInputPanel(i);
+        }
+
+        addInputPanel(androidKeyStorePassword);
+        addInputPanel(androidKeyAliasPassword);
+
+        ((TextField) androidKeyStorePassword.getField()).setPasswordMode(true);
+        ((TextField) androidKeyStorePassword.getField()).setPasswordCharacter('*');
+        ((TextField) androidKeyAliasPassword.getField()).setPasswordMode(true);
+        ((TextField) androidKeyAliasPassword.getField()).setPasswordCharacter('*');
+
+        dir.setMandatory(true);
+
+        arch.setText(Ctx.project.getEditorConfig().getProperty(ARCH_PROP, ARCHS[0]));
+        dir.setText(Ctx.project.getEditorConfig().getProperty(DIR_PROP, ""));
+
+        for (InputPanel i : options) {
+            String prop = Ctx.project.getEditorConfig().getProperty("package." + i.getTitle());
+
+            if (prop != null && !prop.isEmpty())
+                i.setText(prop);
+        }
+
+        version.setText(getCurrentVersion());
+
+        // TODO Set version code based in version
+        // androidVersionCode.setText(genVersionCode(version.getText()));
+
+        setInfo(INFO);
+
+        arch.getField().addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                archChanged();
+            }
+        });
+
+        desktopType.getField().addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                desktopTypeChanged();
+            }
+        });
+
+        os.getField().addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                osChanged();
+            }
+        });
+
+        androidType.getField().addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                androidTypeChanged();
+            }
+        });
+
+        // Add the 'create' button to the keystore.
+        TextButton createButton = new TextButton("Create", skin, "no-toggled");
+
+        createButton.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                final CreateAndroidKeystoreDialog c = new CreateAndroidKeystoreDialog(skin);
+                c.show(getStage());
+
+                c.setListener(new ChangeListener() {
+                    @Override
+                    public void changed(ChangeEvent event, Actor actor) {
+                        androidKeyStore.setText(c.getKeyStorePath());
+                        androidKeyAlias.setText(c.getKeyAlias());
+                        androidKeyStorePassword.setText(c.getKeyStorePassword());
+                        androidKeyAliasPassword.setText(c.getKeyAliasPassword());
+
+                    }
+                });
+
+            }
+        });
+
+        Table t = new Table();
+        Actor a = androidKeyStore.getField();
+        Cell<?> c = androidKeyStore.getCell(a);
+        t.add(a);
+        t.add(createButton);
+        c.setActor(t);
+
+        // Add the 'download' button to the OS combo.
+        TextButton downloadButton = new TextButton("Download JRE", skin, "no-toggled");
+
+        downloadButton.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+
+                if ("windows64".equals(os.getText())) {
+                    downloadJDK(
+                            "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.7_7.zip",
+                            "jdk17_windows64.tar.gz");
+                } else if ("linux64".equals(os.getText())) {
+                    downloadJDK("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
+                            "jdk17_linux64.tar.gz");
+                } else if ("macOS-x86".equals(os.getText())) {
+                    downloadJDK("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz",
+                            "jdk17_macos64_x86.tar.gz");
+                }
+            }
+        });
+
+        Table t2 = new Table();
+        Actor a2 = os.getField();
+        Cell<?> c2 = os.getCell(a2);
+        t2.add(a2);
+        t2.add(downloadButton);
+        c2.setActor(t2);
+
+        archChanged();
+    }
+
+    private void downloadJDK(String url, String fileName) {
+        FileChooser fileChooser = new FileChooser(FileChooser.Mode.OPEN);
+        fileChooser.setSize(Gdx.graphics.getWidth() * 0.7f, Gdx.graphics.getHeight() * 0.7f);
+        fileChooser.setViewMode(FileChooser.ViewMode.LIST);
+
+        fileChooser.setSelectionMode(FileChooser.SelectionMode.DIRECTORIES);
+        getStage().addActor(fileChooser);
+
+        fileChooser.setListener(new FileChooserListener() {
+
+            @Override
+            public void selected(Array<FileHandle> files) {
+                try {
+                    File outputFile = new File(files.get(0).file(), fileName);
+                    HttpUtils.downloadAsync(new URL(url), new FileOutputStream(outputFile), new HttpUtils.Callback() {
+                        @Override
+                        public void updated(int length, int totalLength) {
+                            final int progress = ((int) (((double) length / (double) totalLength) * 100));
+                            Message.showMsg(getStage(), "Downloading JDK... " + progress + "%", true);
+                        }
+
+                        @Override
+                        public void completed() {
+                            Gdx.app.postRunnable(new Runnable() {
+                                @Override
+                                public void run() {
+                                    Message.hideMsg();
+
+                                    if ("windows64".equals(os.getText())) {
+                                        winJRE64.setText(outputFile.getAbsolutePath());
+                                    } else if ("linux64".equals(os.getText())) {
+                                        linux64JRE.setText(outputFile.getAbsolutePath());
+                                    } else if ("macOS-x86".equals(os.getText())) {
+                                        osxJRE.setText(outputFile.getAbsolutePath());
+                                    }
+                                }
+                            });
+                        }
+
+                        @Override
+                        public void canceled() {
+                            Message.showMsgDialog(getStage(), "Error", "Download cancelled.");
+                        }
+
+                        @Override
+                        public void error(IOException ex) {
+                            Message.showMsgDialog(getStage(), "Error", "Download error: " + ex.getMessage());
+                        }
+                    });
+                } catch (FileNotFoundException | MalformedURLException e) {
+                    Message.showMsgDialog(getStage(), "Error", "Download error: " + e.getMessage());
+                }
+            }
+
+            @Override
+            public void canceled() {
+
+            }
+        });
+    }
+
+    @Override
+    protected void ok() {
+
+        final Stage stg = getStage();
+
+        Message.showMsg(stg, "Generating package...", true);
+
+        new Thread() {
+
+            @Override
+            public void run() {
+
+                String msg;
+
+                if (Ctx.project.getSelectedScene() == null) {
+                    msg = "There are no scenes in this chapter.";
+                    Message.showMsg(stg, msg, 3);
+                    return;
+                }
+
+                Ctx.project.getProjectConfig().removeProperty(Config.CHAPTER_PROP);
+                Ctx.project.getProjectConfig().removeProperty(Config.TEST_SCENE_PROP);
+                setCurrentVersion(version.getText());
+
+                try {
+                    Ctx.project.saveProject();
+                } catch (Exception ex) {
+                    msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName() + " - "
+                            + ex.getMessage();
+
+                    Message.showMsgDialog(stg, "Error", msg);
+                    return;
+                }
+
+                try {
+                    msg = packageAdv();
+                } catch (Exception e) {
+                    msg = "Error Generating package\n\n" + e.getMessage();
+                    e.printStackTrace();
+                }
+
+                Ctx.project.getEditorConfig().setProperty(ARCH_PROP, arch.getText());
+                Ctx.project.getEditorConfig().setProperty(DIR_PROP, dir.getText());
+
+                for (InputPanel i : options) {
+                    if (i.getText() != null)
+                        Ctx.project.getEditorConfig().setProperty("package." + i.getTitle(), i.getText());
+                }
+
+                // hide message
+                Message.hideMsg();
+
+                final String m = msg;
+                Message.showMsgDialog(stg, "Result", m);
+            }
+        }.start();
+
+    }
+
+    private String packageAdv() throws IOException, CompressorException, ArchiveException {
+        String msg = "Package generated SUCCESSFULLY";
+
+        String projectName = getAppName();
+        if (projectName == null)
+            Ctx.project.getProjectDir().getName();
+
+        String versionParam = "-Pversion=" + version.getText() + " ";
+        Ctx.project.getProjectConfig().setProperty(Config.VERSION_PROP, version.getText());
+
+        String customBuildParams = customBuildParameters.getText() == null ? "" : customBuildParameters.getText() + " ";
+
+        if (arch.getText().equals("desktop")) {
+            String error = createDesktop(projectName, versionParam, customBuildParams);
+            return error == null ? msg : error;
+        }
+
+        if (arch.getText().equals("android")) {
+            String error = createAndroid(projectName, versionParam, customBuildParams);
+            return error == null ? msg : error;
+        }
+
+        if (arch.getText().equals("ios")) {
+            String error = createIOS(projectName, customBuildParams);
+            return error == null ? msg : error;
+        }
+
+        return msg;
+    }
+
+    private String createIOS(String projectName, String customBuildParams) throws IOException {
+        if (!System.getProperty("os.name").toLowerCase().contains("mac")) {
+            return "You need a MacOSX computer with XCode installed to generate the IOS package.";
+        }
+
+        // UPDATE 'robovm.properties'
+        Properties p = new Properties();
+        p.load(new FileReader(Ctx.project.getProjectDir().getAbsolutePath() + "/ios/robovm.properties"));
+        p.setProperty("app.version", version.getText());
+        p.setProperty("app.build", versionCode.getText());
+        p.setProperty("app.name", Ctx.project.getTitle());
+        p.store(new FileOutputStream(new File(Ctx.project.getProjectDir().getAbsolutePath(), "/ios/robovm.properties")),
+                null);
+
+        List<String> params = new ArrayList<>();
+
+        if (iosSignIdentity.getText() != null)
+            params.add("-Probovm.iosSignIdentity=" + iosSignIdentity.getText());
+
+        if (iosProvisioningProfile.getText() != null)
+            params.add("-Probovm.iosProvisioningProfile=" + iosProvisioningProfile.getText());
+
+        if (customBuildParameters.getText() != null)
+            params.add(customBuildParams);
+
+        // Add clean target in IOS because the app. is not signing well if not cleaning.
+        params.add("ios:clean");
+
+        params.add("ios:createIPA");
+
+        if (RunProccess.runGradle(Ctx.project.getProjectDir(), params)) {
+
+            String apk = Ctx.project.getProjectDir().getAbsolutePath() + "/ios/build/robovm/IOSLauncher.ipa";
+
+            File f = new File(apk);
+            FileUtils.copyFile(f, new File(dir.getText(), projectName + "-" + version.getText() + ".ipa"));
+        } else {
+            return "Error Generating package";
+        }
+
+        return null;
+    }
+
+    private String createAndroid(String projectName, String versionParam, String customBuildParams)
+            throws IOException {
+        String params = versionParam + customBuildParams + "-PversionCode=" + versionCode.getText() + " "
+                + "-Pkeystore=\"" + androidKeyStore.getText() + "\" " + "-PstorePassword="
+                + androidKeyStorePassword.getText() + " " + "-Palias=" + androidKeyAlias.getText() + " "
+                + "-PkeyPassword=" + androidKeyAliasPassword.getText() + " ";
+
+        // UPDATE 'local.properties' with the android SDK location.
+        if (androidSDK.getText() != null && !androidSDK.getText().trim().isEmpty()) {
+            String sdk = androidSDK.getText();
+
+            Properties p = new Properties();
+            p.setProperty("sdk.dir", sdk);
+            p.store(new FileOutputStream(new File(Ctx.project.getProjectDir().getAbsolutePath(), "local.properties")),
+                    null);
+        }
+
+        if (!new File(Ctx.project.getProjectDir().getAbsolutePath(), "local.properties").exists()
+                && System.getenv("ANDROID_HOME") == null) {
+            return "You have to specify the Android SDK path or set the ANDROID_HOME environtment variable.";
+        }
+
+        boolean isAPK = androidType.getText().equals(ANDROID_TYPES[0]);
+
+        String task = "android:assembleFullRelease";
+        File pkgFile = new File(Ctx.project.getProjectDir().getAbsolutePath(),
+                "android/build/outputs/apk/full/release/android-full-release.apk");
+
+        File destPkgFile = new File(dir.getText(), projectName + "-" + version.getText() + ".apk");
+
+        boolean genExpansion = Boolean.parseBoolean(expansionFile.getText());
+
+        if (!isAPK) { // .aab
+            task = "android:bundleFullRelease";
+            pkgFile = new File(Ctx.project.getProjectDir().getAbsolutePath(),
+                    "android/build/outputs/bundle/fullRelease/android-full-release.aab");
+            destPkgFile = new File(dir.getText(), projectName + "-" + version.getText() + ".aab");
+            genExpansion = false;
+        }
+
+        boolean newProjectStructure = new File(Ctx.project.getProjectDir().getAbsolutePath() + "/assets/").exists();
+
+        if (!newProjectStructure && genExpansion)
+            return "You need to update your project to the new layout to generate expansion files.";
+
+        if (!newProjectStructure) {
+            task = "android:assembleRelease";
+            pkgFile = new File(Ctx.project.getProjectDir().getAbsolutePath(),
+                    "android/build/outputs/apk/android-release.apk");
+        }
+
+        if (genExpansion) {
+            task = "android:assembleExpansionRelease";
+            pkgFile = new File(Ctx.project.getProjectDir().getAbsolutePath(),
+                    "android/build/outputs/apk/expansion/release/android-expansion-release.apk");
+        }
+
+        if (!RunProccess.runGradle(Ctx.project.getProjectDir(), params + task)) {
+            return "Error Generating package";
+        }
+
+        FileUtils.copyFile(pkgFile, destPkgFile);
+
+        if (genExpansion) {
+            File fExp = findObb(Ctx.project.getProjectDir().getAbsolutePath() + "/android/build/distributions/",
+                    versionCode.getText());
+            FileUtils.copyFile(fExp, new File(dir.getText(), fExp.getName()));
+        }
+
+        return null;
+    }
+
+    private String createDesktop(String projectName, String versionParam, String customBuildParams)
+            throws IOException, CompressorException, ArchiveException {
+        String jarDir = Ctx.project.getProjectDir().getAbsolutePath() + "/desktop/build/libs/";
+        String jarName = "desktop-" + version.getText() + ".jar";
+
+        String error = genDesktopJar(projectName, versionParam, jarDir, jarName, customBuildParams);
+
+        if (error != null)
+            return error;
+
+        if (desktopType.getText().equals(DESKTOP_TYPES[0])) { // BUNDLE JRE
+            String launcher = getDesktopMainClass();
+
+            if (os.getText().equals("linux64")) {
+                packr(Platform.Linux64, linux64JRE.getText(), projectName, jarDir + jarName, launcher, dir.getText());
+            } else if (os.getText().equals("windows64")) {
+                packr(Platform.Windows64, winJRE64.getText(), projectName, jarDir + jarName, launcher, dir.getText());
+            } else if (os.getText().equals("macOS-x86")) {
+                packr(Platform.MacOS, osxJRE.getText(), projectName, jarDir + jarName, launcher, dir.getText());
+            }
+        }
+
+        return null;
+    }
+
+    private void archChanged() {
+        for (InputPanel ip : options) {
+            setVisible(ip, false);
+        }
+
+        setVisible(androidKeyStorePassword, false);
+        setVisible(androidKeyAliasPassword, false);
+
+        setVisible(version, true);
+
+        String a = arch.getText();
+        if (a.equals("desktop")) {
+            setVisible(desktopType, true);
+            desktopTypeChanged();
+        } else if (a.equals("android")) {
+            setVisible(androidType, true);
+            setVisible(versionCode, true);
+            setVisible(androidSDK, true);
+            setVisible(expansionFile, true);
+            setVisible(androidKeyStore, true);
+            setVisible(androidKeyAlias, true);
+            setVisible(androidKeyStorePassword, true);
+            setVisible(androidKeyAliasPassword, true);
+        } else if (a.equals("ios")) {
+            setVisible(versionCode, true);
+            setVisible(iosSignIdentity, true);
+            setVisible(iosProvisioningProfile, true);
+        }
+
+        setVisible(customBuildParameters, true);
+    }
+
+    private void desktopTypeChanged() {
+        if (desktopType.getText().equals(DESKTOP_TYPES[0])) {
+            setVisible(os, true);
+        } else {
+            setVisible(os, false);
+            setVisible(icon, false);
+        }
+
+        osChanged();
+    }
+
+    private void androidTypeChanged() {
+        setVisible(expansionFile, androidType.getText().equals(ANDROID_TYPES[0]));
+    }
+
+    private void osChanged() {
+        setVisible(icon, false);
+
+        if (os.isVisible() && (os.getText().equals("windows64"))) {
+            setVisible(winJRE64, true);
+        } else {
+            setVisible(icon, false);
+            setVisible(winJRE64, false);
+        }
+
+        setVisible(linux64JRE, os.isVisible() && (os.getText().equals("linux64")));
+
+        if (os.isVisible() && (os.getText().equals("macOS-x86"))) {
+            setVisible(osxJRE, true);
+            setVisible(icon, true);
+        } else {
+            setVisible(osxJRE, false);
+        }
+    }
+
+    @Override
+    protected boolean validateFields() {
+        boolean ok = dir.validateField();
+
+        for (InputPanel i : options) {
+            if (i.isVisible() && !i.validateField())
+                ok = false;
+        }
+
+        if (androidKeyStorePassword.isVisible() && !androidKeyStorePassword.validateField())
+            ok = false;
+
+        if (androidKeyAliasPassword.isVisible() && !androidKeyAliasPassword.validateField())
+            ok = false;
+
+        if (linux64JRE.isVisible()
+                && (!new File(linux64JRE.getText()).exists() || (!linux64JRE.getText().toLowerCase()
+                .endsWith(".zip") && !linux64JRE.getText().toLowerCase().endsWith(".tar.gz")))) {
+            linux64JRE.setError(true);
+            ok = false;
+        }
+
+        if (winJRE64.isVisible()
+                && (!new File(winJRE64.getText()).exists() || (!winJRE64.getText().toLowerCase()
+                .endsWith(".zip") && !winJRE64.getText().toLowerCase().endsWith(".tar.gz")))) {
+            winJRE64.setError(true);
+            ok = false;
+        }
+
+        if (osxJRE.isVisible()
+                && (!new File(osxJRE.getText()).exists() || (!osxJRE.getText().toLowerCase()
+                .endsWith(".zip") && !osxJRE.getText().toLowerCase().endsWith(".tar.gz")))) {
+            osxJRE.setError(true);
+            ok = false;
+        }
+
+        return ok;
+    }
+
+    private String genDesktopJar(String projectName, String versionParam, String jarDir, String jarName,
+                                 String customBuildParams) throws IOException {
+        String msg = null;
+
+        if (RunProccess.runGradle(Ctx.project.getProjectDir(), versionParam + customBuildParams + "desktop:dist")) {
+            File f = new File(jarDir + jarName);
+            FileUtils.copyFileToDirectory(f, new File(dir.getText()));
+
+            new File(jarDir, jarName).setExecutable(true);
+            new File(dir.getText(), jarName).setExecutable(true);
+        } else {
+            msg = "Error Generating package";
+        }
+
+        return msg;
+    }
+
+    private void packr(Platform platform, String jdk, String exe, String jar, String mainClass, String outDir)
+            throws IOException, CompressorException, ArchiveException {
+        String suffix = null;
+
+        switch (platform) {
+            case Linux64:
+                suffix = "lin64";
+                break;
+            case MacOS:
+                suffix = "mac.app";
+                break;
+            case Windows64:
+                suffix = "win64";
+                break;
+
+        }
+
+        PackrConfig config = new PackrConfig();
+        config.platform = platform;
+        config.jdk = jdk;
+        config.jrePath = "jre";
+        config.executable = exe;
+        config.classpath = Collections.singletonList(jar);
+        config.mainClass = mainClass.replace('/', '.');
+
+        if (platform.equals(Platform.MacOS)) {
+            config.vmArgs = Arrays.asList("-Xmx1G", "-Dsun.java2d.dpiaware=true", "-XstartOnFirstThread");
+        } else {
+            config.vmArgs = Arrays.asList("-Xmx1G", "-Dsun.java2d.dpiaware=true");
+        }
+
+        config.minimizeJre = "hard";
+
+        config.outDir = new File(outDir + "/" + exe + "-" + suffix);
+
+        new Packr().pack(config);
+
+        // COPY MAC OS ICON
+        if (platform == Platform.MacOS && icon.getText() != null && icon.getText().endsWith(".icns")) {
+            FileUtils.copyFile(new File(icon.getText()),
+                    new File(config.outDir.getAbsolutePath() + "/Contents/Resources/icons.icns"));
+        }
+    }
+
+    /**
+     * @return The appName from the file gradle.properties from the game
+     */
+    private String getAppName() {
+
+        try {
+            OrderedProperties prop = Ctx.project.getGradleProperties(Ctx.project.getProjectDir());
+            return prop.getProperty("appName");
+        } catch (IOException e) {
+            Message.showMsg(getStage(), "Error reading file 'gradle.properties' from the game.", 3);
+        }
+
+        return null;
+    }
+
+    /**
+     * @return The version from the file gradle.properties from the game
+     */
+    private String getCurrentVersion() {
+
+        try {
+            OrderedProperties prop = Ctx.project.getGradleProperties(Ctx.project.getProjectDir());
+            return prop.getProperty("version");
+        } catch (IOException e) {
+            Message.showMsg(getStage(), "Error reading file 'gradle.properties' from the game.", 3);
+        }
+
+        return null;
+    }
+
+    /**
+     * Saves the selected version
+     */
+    private void setCurrentVersion(String version) {
+
+        try {
+            OrderedProperties prop = Ctx.project.getGradleProperties(Ctx.project.getProjectDir());
+            prop.setProperty("version", version);
+            Ctx.project.saveGradleProperties(prop, Ctx.project.getProjectDir());
+        } catch (IOException e) {
+            Message.showMsg(getStage(), "Error reading file 'gradle.properties' from the game.", 3);
+        }
+    }
+
+    /**
+     * @return Search the desktop main class in the desktop folder
+     */
+    private String getDesktopMainClass() {
+
+        File result = search(new File(Ctx.project.getProjectDir().getAbsolutePath() + "/desktop"));
+
+        String absolutePath = result.getAbsolutePath().replace('\\', '/');
+
+        int cutIdx = absolutePath.indexOf("src/main/java/");
+
+        if (cutIdx != -1)
+            cutIdx += 14;
+        else
+            cutIdx = absolutePath.indexOf("src/") + 4;
+
+        return absolutePath.substring(cutIdx, absolutePath.length() - ".java".length());
+    }
+
+    private File search(File file) {
+        File result = null;
+
+        // do you have permission to read this directory?
+        if (file.canRead()) {
+            for (File temp : file.listFiles()) {
+                if (temp.isDirectory()) {
+                    result = search(temp);
+
+                    if (result != null)
+                        return result;
+                } else {
+                    if (temp.getName().equals(DESKTOP_LAUNCHER)) {
+                        return temp;
+                    }
+                }
+            }
+
+        }
+
+        return result;
+    }
+
+    private File findObb(String baseDir, final String versionCode) {
+        File dir = new File(baseDir);
+
+        File[] listFiles = dir.listFiles(new FilenameFilter() {
+
+            @Override
+            public boolean accept(File arg0, String arg) {
+                return arg.startsWith("main." + versionCode + ".") && arg.endsWith(".obb");
+            }
+
+        });
+
+        return listFiles == null || listFiles.length == 0 ? null : listFiles[0];
+    }
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ProjectPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ProjectPanel.java
similarity index 63%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ProjectPanel.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ProjectPanel.java
index 56fd95a47..40076b66d 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ProjectPanel.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ProjectPanel.java
@@ -20,47 +20,42 @@
 
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.ChapterDocument;
 import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.model.WorldDocument;
-import com.bladecoder.engineeditor.ui.components.HeaderPanel;
-import com.bladecoder.engineeditor.ui.components.TabPanel;
+import com.bladecoder.engineeditor.ui.panels.HeaderPanel;
+import com.bladecoder.engineeditor.ui.panels.TabPanel;
 
-public class ProjectPanel extends HeaderPanel  {
+public class ProjectPanel extends HeaderPanel {
 
 	private TabPanel tabPanel;
 	private SceneList sceneList;
-	private VerbList verbList;
 	private ChapterList chapterList;
-	
-	
+	private SoundList soundList;
+
 	public ProjectPanel(Skin skin) {
-		super(skin, "ADVENTURE");	
-		
+		super(skin, "ADVENTURE");
+
 		tabPanel = new TabPanel(skin);
 		sceneList = new SceneList(skin);
-		verbList = new VerbList(skin);
 		chapterList = new ChapterList(skin);
-	
+		soundList = new SoundList(skin);
+
 		setContent(tabPanel);
-		
+
 		tabPanel.addTab("Scenes", sceneList);
 		tabPanel.addTab("Chapters", chapterList);
-		tabPanel.addTab("Def. Verbs", verbList);
-		tabPanel.addTab("Properties", new WorldProps(skin));
-
+		tabPanel.addTab("Game Props", new WorldProps(skin));
+		tabPanel.addTab("Sounds", soundList);
+		tabPanel.addTab("Assets", new AssetsList(skin));
+		tabPanel.addTab("Resolutions", new ResolutionList(skin));
 
 		Ctx.project.addPropertyChangeListener(Project.NOTIFY_PROJECT_LOADED, new PropertyChangeListener() {
 			@Override
 			public void propertyChange(PropertyChangeEvent e) {
-				WorldDocument w = Ctx.project.getWorld();
-				ChapterDocument selectedChapter = Ctx.project.getSelectedChapter();
-				
-				sceneList.addElements(selectedChapter, selectedChapter.getElement(), "scene");
-				verbList.addElements(w, w.getElement(), "verb");
-				chapterList.addElements(w);
-				setTile("ADVENTURE - " + (Ctx.project.getTitle() != null? Ctx.project.getTitle():""));
+				chapterList.addElements();
+				setTile(Ctx.project.getTitle() != null
+						? Ctx.project.getTitle() + " (" + Ctx.project.getWorld().getScenes().size() + " scenes)"
+						: "ADVENTURE GAME");
 			}
-		});		
+		});
 	}
 }
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ProjectToolbar.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ProjectToolbar.java
new file mode 100644
index 000000000..a52c7e2de
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ProjectToolbar.java
@@ -0,0 +1,369 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.awt.Desktop;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.IOException;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Button.ButtonStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton.ImageButtonStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextTooltip;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+import com.badlogic.gdx.utils.Array;
+import com.bladecoder.engine.util.Config;
+import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.EditorUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.common.RunProccess;
+import com.bladecoder.engineeditor.model.Project;
+import com.kotcrab.vis.ui.widget.file.FileChooser;
+import com.kotcrab.vis.ui.widget.file.FileChooser.Mode;
+import com.kotcrab.vis.ui.widget.file.FileChooser.SelectionMode;
+import com.kotcrab.vis.ui.widget.file.FileChooser.ViewMode;
+import com.kotcrab.vis.ui.widget.file.FileChooserListener;
+
+public class ProjectToolbar extends Table {
+	private ImageButton newBtn;
+	private ImageButton loadBtn;
+	private ImageButton saveBtn;
+	private ImageButton packageBtn;
+	private ImageButton exitBtn;
+	private ImageButton playBtn;
+	private ImageButton assetsBtn;
+	private ImageButton atlasBtn;
+
+	private Skin skin;
+
+	private FileChooser fileChooser;
+
+	public ProjectToolbar(Skin skin) {
+		super(skin);
+		this.skin = skin;
+		left();
+		newBtn = new ImageButton(skin);
+		saveBtn = new ImageButton(skin);
+		loadBtn = new ImageButton(skin);
+		packageBtn = new ImageButton(skin);
+		exitBtn = new ImageButton(skin);
+		playBtn = new ImageButton(skin);
+		assetsBtn = new ImageButton(skin);
+		atlasBtn = new ImageButton(skin);
+
+		fileChooser = new FileChooser(Mode.OPEN);
+		fileChooser.setSize(Gdx.graphics.getWidth() * 0.7f, Gdx.graphics.getHeight() * 0.7f);
+		fileChooser.setViewMode(ViewMode.LIST);
+
+		addToolBarButton(skin, newBtn, "ic_new", "New", "Create a new project");
+		addToolBarButton(skin, loadBtn, "ic_load", "Load", "Load an existing project");
+		addToolBarButton(skin, saveBtn, "ic_save", "Save", "Save the current project");
+		addToolBarButton(skin, exitBtn, "ic_quit", "Exit", "Save changes and exits");
+		row();
+
+		addToolBarButton(skin, playBtn, "ic_play", "Play", "Play Adventure");
+		addToolBarButton(skin, packageBtn, "ic_package", "Package", "Package the game for distribution");
+		addToolBarButton(skin, assetsBtn, "ic_assets", "Assets", "Open assets folder");
+		addToolBarButton(skin, atlasBtn, "ic_atlases", "Atlas", "Create Atlas");
+
+		newBtn.setDisabled(false);
+		loadBtn.setDisabled(false);
+		exitBtn.setDisabled(false);
+
+		playBtn.setDisabled(true);
+		packageBtn.setDisabled(true);
+		atlasBtn.setDisabled(true);
+		assetsBtn.setDisabled(true);
+
+		newBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				saveProjectAndExecute(new Runnable() {
+
+					@Override
+					public void run() {
+						newProject();
+					}
+				});
+			}
+		});
+
+		loadBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				saveProjectAndExecute(new Runnable() {
+					@Override
+					public void run() {
+						loadProject();
+					}
+				});
+			}
+		});
+
+		exitBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				saveProjectAndExecute(new Runnable() {
+					@Override
+					public void run() {
+						exit();
+					}
+				});
+			}
+		});
+
+		saveBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				saveProject();
+			}
+		});
+
+		playBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				play();
+			}
+		});
+
+		packageBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				packageProject();
+			}
+		});
+
+		assetsBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				openAssetFolder();
+			}
+		});
+
+		atlasBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				createAtlas();
+			}
+		});
+
+		Ctx.project.addPropertyChangeListener(new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent e) {
+				saveBtn.setDisabled(!Ctx.project.isModified());
+			}
+		});
+
+		Ctx.project.addPropertyChangeListener(Project.NOTIFY_PROJECT_LOADED, new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent arg0) {
+				packageBtn.setDisabled(!Ctx.project.isLoaded());
+				playBtn.setDisabled(!Ctx.project.isLoaded());
+				assetsBtn.setDisabled(!Ctx.project.isLoaded());
+				atlasBtn.setDisabled(!Ctx.project.isLoaded());
+			}
+		});
+	}
+
+	private void addToolBarButton(Skin skin, ImageButton button, String icon, String text, String tooltip) {
+		ImageButtonStyle style = new ImageButtonStyle(skin.get(ButtonStyle.class));
+		TextureRegion image = Ctx.assetManager.getIcon(icon);
+		style.imageUp = new TextureRegionDrawable(image);
+
+		try {
+			TextureRegion imageDisabled = Ctx.assetManager.getIcon(icon + "_disabled");
+
+			if (imageDisabled != null)
+				style.imageDisabled = new TextureRegionDrawable(imageDisabled);
+		} catch (Exception e) {
+
+		}
+
+		button.setStyle(style);
+		// button.row();
+		// button.add(new Label(text, skin));
+
+		add(button);
+		button.setDisabled(true);
+		TextTooltip t = new TextTooltip(tooltip, skin);
+		t.getContainer().pad(DPIUtils.getSpacing() / 2);
+		button.addListener(t);
+	}
+
+	private void newProject() {
+		CreateProjectDialog dialog = new CreateProjectDialog(skin);
+		dialog.show(getStage());
+	}
+
+	@Override
+	public void act(float delta) {
+		super.act(delta);
+	}
+
+	private void loadProject() {
+		fileChooser.setSelectionMode(SelectionMode.DIRECTORIES);
+		getStage().addActor(fileChooser);
+
+		fileChooser.setListener(new FileChooserListener() {
+
+			@Override
+			public void selected(Array<FileHandle> files) {
+
+				final File f = files.get(0).file();
+
+				try {
+					EditorUtils.checkVersionAndLoadProject(f, getStage(), skin);
+				} catch (Exception e) {
+					EditorLogger.error("Error loading last project.", e);
+					Ctx.project.closeProject();
+				}
+
+			}
+
+			@Override
+			public void canceled() {
+			}
+		});
+	}
+
+	public void exit() {
+		Gdx.app.exit();
+	}
+
+	private void saveProject() {
+		File file = Ctx.project.getProjectDir();
+
+		if (file == null) {
+			String msg = "Please create a new project first.";
+			Message.showMsg(getStage(), msg, 3);
+			return;
+		}
+
+		try {
+			Ctx.project.saveProject();
+		} catch (Exception ex) {
+			String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName() + " - "
+					+ ex.getMessage();
+			Message.showMsgDialog(getStage(), "Error saving project", msg);
+		}
+	}
+
+	private void packageProject() {
+		saveProject();
+
+		new PackageDialog(skin).show(getStage());
+	}
+
+	private void play() {
+		saveProject();
+
+		new Thread(new Runnable() {
+			Stage stage = getStage();
+
+			@Override
+			public void run() {
+
+				if (Ctx.project.getSelectedScene() == null) {
+					String msg = "There are no scenes in this chapter.";
+					Message.showMsg(getStage(), msg, 3);
+					return;
+				}
+
+				Ctx.project.getProjectConfig().removeProperty(Config.CHAPTER_PROP);
+				Ctx.project.getProjectConfig().removeProperty(Config.TEST_SCENE_PROP);
+
+				try {
+					Ctx.project.saveProject();
+				} catch (Exception ex) {
+					String msg = "Something went wrong while saving the project.\n\n" + ex.getClass().getSimpleName()
+							+ " - " + ex.getMessage();
+					Message.showMsgDialog(getStage(), "Error", msg);
+					return;
+				}
+
+				Message.showMsg(stage, "Running scene...", 3);
+
+				try {
+					if (!RunProccess.runBladeEngine(Ctx.project.getProjectDir(), null, null,
+							Boolean.parseBoolean(
+									Ctx.project.getEditorConfig().getProperty("view.fullscreenPlay", "false"))))
+						Message.showMsg(getStage(), "There was a problem running the project", 3);
+				} catch (IOException e) {
+					Message.showMsgDialog(stage, "Error", "There was a problem running the project: " + e.getMessage());
+				}
+
+			}
+		}).start();
+
+	}
+
+	private void openAssetFolder() {
+		if (Desktop.isDesktopSupported()) {
+			try {
+				Desktop.getDesktop().open(new File(
+						Ctx.project.getAssetPath(Ctx.project.getProjectDir().getAbsoluteFile().getAbsolutePath())));
+			} catch (IOException e1) {
+				String msg = "Something went wrong while opening assets folder.\n\n" + e1.getClass().getSimpleName()
+						+ " - " + e1.getMessage();
+				Message.showMsgDialog(getStage(), "Error", msg);
+			}
+		}
+	}
+
+	private void createAtlas() {
+		new CreateAtlasDialog(skin).show(getStage());
+	}
+
+	private void saveProjectAndExecute(final Runnable task) {
+		if (Ctx.project.isLoaded() && Ctx.project.isModified()) {
+			new Dialog("Save Project", skin) {
+				protected void result(Object object) {
+					if (((Boolean) object).booleanValue()) {
+						try {
+							Ctx.project.saveProject();
+						} catch (IOException e1) {
+							String msg = "Something went wrong while saving the actor.\n\n"
+									+ e1.getClass().getSimpleName() + " - " + e1.getMessage();
+							Message.showMsgDialog(getStage(), "Error", msg);
+
+							EditorLogger.printStackTrace(e1);
+						}
+					}
+
+					task.run();
+				}
+			}.text("Save current project changes?").button("Yes", true).button("No", false).key(Keys.ENTER, true)
+					.key(Keys.ESCAPE, false).show(getStage());
+		} else {
+			task.run();
+		}
+	}
+
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ResolutionList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ResolutionList.java
similarity index 80%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ResolutionList.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ResolutionList.java
index f9f250fe7..330346edb 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ResolutionList.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ResolutionList.java
@@ -25,10 +25,12 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.DesktopUtils;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.Message;
 import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.CellRenderer;
-import com.bladecoder.engineeditor.ui.components.EditList;
-import com.bladecoder.engineeditor.utils.DesktopUtils;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.EditList;
 
 public class ResolutionList extends EditList<String> {
 
@@ -52,14 +54,14 @@ public void changed(ChangeEvent event, Actor actor) {
 				new PropertyChangeListener() {
 					@Override
 					public void propertyChange(PropertyChangeEvent arg0) {
-						toolbar.disableCreate(Ctx.project.getProjectDir() == null);
+						toolbar.disableCreate(!Ctx.project.isLoaded());
 						addResolutions();
 					}
 				});
 	}
 
 	private void addResolutions() {
-		if (Ctx.project.getProjectDir() != null) {
+		if (Ctx.project.isLoaded()) {
 
 			list.getItems().clear();
 
@@ -79,7 +81,7 @@ private void addResolutions() {
 			}
 		}
 
-		toolbar.disableCreate(Ctx.project.getProjectDir() == null);
+		toolbar.disableCreate(!Ctx.project.isLoaded());
 	}
 
 	@Override
@@ -102,14 +104,18 @@ public void edit() {
 	public void delete() {
 		int index = list.getSelectedIndex();
 		String r = list.getItems().get(index);
+		
+		if(r.equals("1")) {
+			Message.showMsg(getStage(),"Initial resolution cannot be deleted", 3);
+			
+			return;
+		}
 
-		removeDir(Ctx.project.getProjectDir() + "/" + Project.BACKGROUNDS_PATH
-				+ "/" + r);
-		removeDir(Ctx.project.getProjectDir() + "/" + Project.IMAGE_PATH
+		removeDir(Ctx.project.getAssetPath() + Project.IMAGE_PATH
 				+ "/" + r);
-		removeDir(Ctx.project.getProjectDir() + "/" + Project.UI_PATH + "/"
+		removeDir(Ctx.project.getAssetPath() + Project.UI_PATH + "/"
 				+ r);
-		removeDir(Ctx.project.getProjectDir() + "/" + Project.ATLASES_PATH
+		removeDir(Ctx.project.getAssetPath() + Project.ATLASES_PATH
 				+ "/" + r);
 
 		addResolutions();
@@ -121,8 +127,8 @@ private void removeDir(String dir) {
 		} catch (IOException e) {
 			String msg = "Something went wrong while deleting the resolution.\n\n"
 					+ e.getClass().getSimpleName() + " - " + e.getMessage();
-			Ctx.msg.show(getStage(),msg, 2);
-			e.printStackTrace();
+			Message.showMsg(getStage(),msg, 2);
+			EditorLogger.printStackTrace(e);
 		}
 	}
 	
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SceneList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SceneList.java
new file mode 100644
index 000000000..824da5dfe
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SceneList.java
@@ -0,0 +1,540 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.GL30;
+import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.graphics.glutils.FrameBuffer;
+import com.badlogic.gdx.graphics.glutils.GLFrameBuffer;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Event;
+import com.badlogic.gdx.scenes.scene2d.EventListener;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.ui.TextTooltip;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.ScreenUtils;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.ModelList;
+import com.bladecoder.engineeditor.undo.UndoDeleteScene;
+import com.bladecoder.engineeditor.undo.UndoOp;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class SceneList extends ModelList<World, Scene> {
+
+	private ImageButton initBtn;
+	private ImageButton reloadBtn;
+	private SelectBox<String> chapters;
+	private HashMap<String, TextureRegion> bgIconCache = new HashMap<>();
+	private boolean disposeBgCache = false;
+	private String filterText;
+
+	public SceneList(final Skin skin) {
+		super(skin, true);
+
+		HorizontalGroup chapterPanel = new HorizontalGroup();
+		chapterPanel.padRight(DPIUtils.MARGIN_SIZE);
+
+		chapters = new SelectBox<>(skin);
+		// chapters.setFillParent(true);
+		TextButton inkBtn = new TextButton("Ink", skin, "no-toggled");
+
+		TextTooltip t = new TextTooltip("Sets the Ink Story file", skin);
+		t.getContainer().pad(DPIUtils.getSpacing() / 2);
+		inkBtn.addListener(t);
+
+		inkBtn.addListener(new ClickListener() {
+			@Override
+			public void clicked(InputEvent event, float x, float y) {
+				EditInkDialog dialog = new EditInkDialog(skin);
+				dialog.show(getStage());
+			}
+		});
+
+		chapterPanel.addActor(new Label("CHAPTER ", skin, "big"));
+		chapterPanel.addActor(chapters);
+		chapterPanel.addActor(inkBtn);
+
+		clearChildren();
+
+		add(chapterPanel).expandX().fillX();
+		row();
+		add(toolbar).expandX().fillX();
+		row().fill();
+		add(container).expandY().fill();
+
+		initBtn = new ImageButton(skin);
+		toolbar.addToolBarButton(initBtn, "ic_check", "Set init scene", "Set init scene");
+
+		initBtn.setDisabled(true);
+
+		reloadBtn = new ImageButton(skin);
+		toolbar.addToolBarButton(reloadBtn, "ic_reload_small", "Reload Assets", "Reload current scene assets");
+
+		reloadBtn.setDisabled(true);
+
+		TextField tf = toolbar.addFilterBox(new EventListener() {
+
+			@Override
+			public boolean handle(Event e) {
+				if (((TextField) e.getTarget()).getText() != filterText) {
+					filterText = ((TextField) e.getTarget()).getText();
+
+					addFilteredElements();
+				}
+
+				return false;
+			}
+
+		});
+
+		filterText = tf.getText();
+
+		list.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				int pos = list.getSelectedIndex();
+
+				if (pos == -1) {
+					Ctx.project.setSelectedScene(null);
+				} else {
+					Scene s = list.getItems().get(pos);
+
+					Ctx.project.setSelectedScene(s);
+				}
+
+				toolbar.disableEdit(pos == -1);
+				initBtn.setDisabled(pos == -1);
+				reloadBtn.setDisabled(pos == -1);
+			}
+		});
+
+		list.setCellRenderer(listCellRenderer);
+
+		initBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				setDefault();
+			}
+
+		});
+
+		reloadBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				reloadAssets();
+			}
+
+		});
+
+		chapters.addListener(chapterListener);
+		chapters.getSelection().setProgrammaticChangeEvents(false);
+
+		Ctx.project.addPropertyChangeListener(new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+
+				EditorLogger.debug(evt.getPropertyName() + " NEW:" + evt.getNewValue() + " OLD:" + evt.getOldValue());
+
+				if (evt.getPropertyName().equals(Project.CHAPTER_PROPERTY)) {
+					addChapters();
+				} else if (evt.getPropertyName().equals(Project.NOTIFY_ELEMENT_DELETED)) {
+					if (evt.getNewValue() instanceof World) {
+						addChapters();
+					} else if (evt.getNewValue() instanceof Scene) {
+						addFilteredElements();
+					}
+				} else if (evt.getPropertyName().equals(Project.NOTIFY_PROJECT_LOADED)) {
+					toolbar.disableCreate(!Ctx.project.isLoaded());
+
+					disposeBgCache = true;
+					addChapters();
+				} else if (evt.getPropertyName().equals(Project.NOTIFY_ELEMENT_CREATED)) {
+					if (evt.getNewValue() instanceof Scene && !(evt.getSource() instanceof EditSceneDialog)) {
+						addFilteredElements();
+					}
+				}
+			}
+		});
+
+	}
+
+	ChangeListener chapterListener = new ChangeListener() {
+		@Override
+		public void changed(ChangeEvent event, Actor actor) {
+			String selChapter = chapters.getSelected();
+
+			if (selChapter != null) {
+
+				if (selChapter.equals(Ctx.project.getChapter().getId()))
+					return;
+
+				// Save the project when changing chapter
+				try {
+					Ctx.project.saveProject();
+				} catch (IOException e1) {
+					Message.showMsgDialog(getStage(), "Error saving project", e1.getMessage());
+					EditorLogger.error(e1.getMessage());
+				}
+
+				try {
+
+					if (selChapter != null)
+						Ctx.project.loadChapter(selChapter);
+
+					String init = Ctx.project.getEditorConfig().getProperty("project.selectedScene",
+							Ctx.project.getWorld().getInitScene());
+
+					addFilteredElements();
+
+					if (init != null) {
+						Scene s = Ctx.project.getWorld().getScenes().get(init);
+
+						if (s == null && Ctx.project.getWorld().getInitScene() != null)
+							s = Ctx.project.getWorld().getScenes().get(Ctx.project.getWorld().getInitScene());
+
+						if (s != null) {
+							int indexOf = list.getItems().indexOf(s, true);
+							list.setSelectedIndex(indexOf);
+						}
+					}
+				} catch (IOException e1) {
+					String msg = "Something went wrong while loading the project.\n\n"
+							+ e1.getClass().getSimpleName()
+							+ " - "
+							+ e1.getMessage();
+					Message.showMsg(getStage(), msg, 3);
+
+					EditorLogger.printStackTrace(e1);
+				}
+			} else {
+				addElements(null, null);
+			}
+		}
+	};
+
+	public void addChapters() {
+		Array<String> array = new Array<>();
+
+		if (Ctx.project.isLoaded()) {
+
+			String[] nl = Ctx.project.getChapter().getChapters();
+
+			for (int i = 0; i < nl.length; i++) {
+				array.add(nl[i]);
+			}
+
+			chapters.setItems(array);
+
+			String init = Ctx.project.getEditorConfig().getProperty("project.selectedChapter",
+					Ctx.project.getWorld().getInitChapter());
+
+			if (init != null) {
+				if (array.contains(init, false)) {
+					chapters.setSelected(init);
+				} else if (array.size > 0) {
+					chapters.setSelected(Ctx.project.getChapter().getInitChapter());
+				}
+			}
+		} else {
+			chapters.setItems(array);
+		}
+
+		chapterListener.changed(null, null);
+
+		invalidate();
+	}
+
+	private void addFilteredElements() {
+
+		List<Scene> filtered = new ArrayList<>();
+
+		for (Scene s : Ctx.project.getWorld().getScenes().values()) {
+			if (filterText == null || filterText.isEmpty() || s.getId().contains(filterText)) {
+				filtered.add(s);
+			}
+		}
+
+		addElements(Ctx.project.getWorld(), filtered);
+
+	}
+
+	private void setDefault() {
+
+		int pos = list.getSelectedIndex();
+
+		if (pos == -1)
+			return;
+
+		String id = list.getItems().get(pos).getId();
+		Ctx.project.getWorld().setInitScene(id);
+		Ctx.project.setModified();
+	}
+
+	private void reloadAssets() {
+		Ctx.project.setSelectedScene(list.getSelected());
+	}
+
+	@Override
+	protected void delete() {
+		Scene s = removeSelected();
+
+		parent.getScenes().remove(s.getId());
+
+		// delete init_scene attr if the scene to delete is the chapter
+		// init_scene
+		if (parent.getInitScene() != null && parent.getInitScene().equals(s.getId())) {
+			if (parent.getScenes().size() > 0)
+				parent.setInitScene(parent.getScenes().values().iterator().next().getId());
+			else
+				parent.setInitScene(null);
+		}
+
+		// TRANSLATIONS
+		Ctx.project.getI18N().putTranslationsInElement(s);
+
+		// UNDO
+		UndoOp undoOp = new UndoDeleteScene(s);
+		Ctx.project.getUndoStack().add(undoOp);
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void copy() {
+		Scene e = list.getSelected();
+
+		if (e == null)
+			return;
+
+		clipboard = (Scene) ElementUtils.cloneElement(e);
+		toolbar.disablePaste(false);
+
+		// TRANSLATIONS
+		Ctx.project.getI18N().putTranslationsInElement(clipboard);
+	}
+
+	@Override
+	protected void paste() {
+		Scene newElement = (Scene) ElementUtils.cloneElement(clipboard);
+
+		newElement.setId(ElementUtils.getCheckedId(newElement.getId(),
+				Ctx.project.getWorld().getScenes().keySet().toArray(new String[0])));
+
+		int pos = list.getSelectedIndex() + 1;
+
+		list.getItems().insert(pos, newElement);
+
+		Ctx.project.getWorld().addScene(newElement);
+		Ctx.project.getI18N().extractStrings(newElement);
+
+		if (parent.getInitScene() == null) {
+			parent.setInitScene(newElement.getId());
+		}
+
+		list.setSelectedIndex(pos);
+		list.invalidateHierarchy();
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected EditModelDialog<World, Scene> getEditElementDialogInstance(Scene e) {
+
+		EditSceneDialog dialog = new EditSceneDialog(skin, parent, e);
+
+		if (e != null) {
+			dialog.setListener(new ChangeListener() {
+				@Override
+				public void changed(ChangeEvent event, Actor actor) {
+					Ctx.project.setSelectedScene(list.getSelected());
+				}
+			});
+		}
+
+		return dialog;
+	}
+
+	public TextureRegion getBgIcon(String atlas, String region) {
+
+		// check here for dispose instead in project loading because the opengl
+		// context lost in new project thread
+		if (disposeBgCache) {
+			dispose();
+			disposeBgCache = false;
+		}
+
+		String s = atlas + "#" + region;
+		TextureRegion icon = bgIconCache.get(s);
+
+		if (icon == null) {
+			Batch batch = getStage().getBatch();
+
+			boolean wasDrawing = batch.isDrawing();
+
+			if (batch.isDrawing())
+				batch.end();
+
+			try {
+				icon = createBgIcon(atlas, region);
+			} catch (Exception e) {
+				EditorLogger.error("Error creating Background icon: " + atlas + "." + region);
+			}
+
+			if (icon == null) {
+				EditorLogger.error("Error creating Background icon: " + atlas + "." + region);
+				icon = Ctx.assetManager.getIcon("ic_no_scene");
+			}
+
+			bgIconCache.put(s, icon);
+
+			if (wasDrawing)
+				batch.begin();
+		}
+
+		return icon;
+	}
+
+	public void dispose() {
+		for (TextureRegion r : bgIconCache.values())
+			r.getTexture().dispose();
+
+		bgIconCache.clear();
+	}
+
+	private TextureRegion createBgIcon(String atlas, String region) {
+		TextureAtlas a = new TextureAtlas(
+				Gdx.files.absolute(Ctx.project.getAssetPath() + Project.ATLASES_PATH + "/1/" + atlas + ".atlas"));
+		AtlasRegion r = a.findRegion(region);
+
+		if (r == null) {
+			a.dispose();
+			return null;
+		}
+
+		GLFrameBuffer.FrameBufferBuilder frameBufferBuilder = new GLFrameBuffer.FrameBufferBuilder(200,
+				(int) (r.getRegionHeight() * 200f / r.getRegionWidth()));
+
+		frameBufferBuilder.addColorTextureAttachment(GL30.GL_RGBA8, GL30.GL_RGBA, GL30.GL_UNSIGNED_BYTE);
+		FrameBuffer fbo = frameBufferBuilder.build();
+
+		SpriteBatch fboBatch = new SpriteBatch();
+		fboBatch.setColor(Color.WHITE);
+		OrthographicCamera camera = new OrthographicCamera();
+		camera.setToOrtho(false, fbo.getWidth(), fbo.getHeight());
+		fboBatch.setProjectionMatrix(camera.combined);
+
+		Gdx.gl.glDisable(GL20.GL_SCISSOR_TEST);
+		fbo.begin();
+		fboBatch.begin();
+		fboBatch.draw(r, 0, 0, fbo.getWidth(), fbo.getHeight());
+		fboBatch.end();
+
+		TextureRegion tex = ScreenUtils.getFrameBufferTexture(0, 0, fbo.getWidth(), fbo.getHeight());
+		// tex.flip(false, true);
+
+		fbo.end();
+		Gdx.gl.glEnable(GL20.GL_SCISSOR_TEST);
+
+		fbo.dispose();
+		a.dispose();
+		fboBatch.dispose();
+
+		return tex;
+	}
+
+	// -------------------------------------------------------------------------
+	// ListCellRenderer
+	// -------------------------------------------------------------------------
+	private final CellRenderer<Scene> listCellRenderer = new CellRenderer<Scene>() {
+
+		@Override
+		protected String getCellTitle(Scene e) {
+			String name = e.getId();
+
+			// TODO SET INIT SCENE
+			String init = Ctx.project.getWorld().getInitScene();
+
+			if (name.equals(init))
+				name += " <init>";
+
+			return name;
+		}
+
+		@Override
+		protected String getCellSubTitle(Scene e) {
+			return e.getBackgroundAtlas();
+		}
+
+		@Override
+		public TextureRegion getCellImage(Scene e) {
+			String atlas = e.getBackgroundAtlas();
+			String region = e.getBackgroundRegionId();
+
+			TextureRegion r = null;
+
+			if (atlas != null && region != null && !atlas.isEmpty() && !region.isEmpty()) {
+				r = getBgIcon(atlas, region);
+			}
+
+			if (r == null)
+				r = Ctx.assetManager.getIcon("ic_no_scene");
+
+			return r;
+		}
+
+		@Override
+		protected boolean hasSubtitle() {
+			return true;
+		}
+
+		@Override
+		protected boolean hasImage() {
+			return true;
+		}
+	};
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ScenePanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ScenePanel.java
similarity index 61%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ScenePanel.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ScenePanel.java
index 14e9106cf..7f9a79ba6 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ScenePanel.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/ScenePanel.java
@@ -17,51 +17,56 @@
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-
-import org.w3c.dom.Element;
+import java.util.Arrays;
 
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.Scene;
 import com.bladecoder.engineeditor.Ctx;
-import com.bladecoder.engineeditor.model.ChapterDocument;
 import com.bladecoder.engineeditor.model.Project;
-import com.bladecoder.engineeditor.ui.components.HeaderPanel;
-import com.bladecoder.engineeditor.ui.components.TabPanel;
+import com.bladecoder.engineeditor.ui.panels.HeaderPanel;
+import com.bladecoder.engineeditor.ui.panels.TabPanel;
 
 public class ScenePanel extends HeaderPanel {
 	
 	private TabPanel tabPanel;
-	private VerbList verbList;	
+//	private VerbList verbList;	
 	private ActorList actorList;
-	private SceneProps sceneProps;
+	private LayerList layerList;
+//	private SceneProps sceneProps;
 	
 	public ScenePanel(Skin skin) {
 		super(skin, "SCENE");		
 		tabPanel = new TabPanel(skin);
-		verbList = new VerbList(skin);
+//		verbList = new VerbList(skin);
 		actorList = new ActorList(skin);
-		sceneProps = new SceneProps(skin);
+		layerList = new LayerList(skin);
+//		sceneProps = new SceneProps(skin);
 				
 		setContent(tabPanel);		
 		
 		tabPanel.addTab("Actors", actorList);
-		tabPanel.addTab("Verbs", verbList);
-		tabPanel.addTab("Properties", sceneProps);
+//		tabPanel.addTab("Verbs", verbList);
+		tabPanel.addTab("Layers", layerList);
+//		tabPanel.addTab("Scene Props", sceneProps);
 		
 		Ctx.project.addPropertyChangeListener(Project.NOTIFY_SCENE_SELECTED, new PropertyChangeListener() {
 			@Override
 			public void propertyChange(PropertyChangeEvent evt) {
-				ChapterDocument doc = Ctx.project.getSelectedChapter();
-				Element scn = Ctx.project.getSelectedScene();
+				Scene s = Ctx.project.getSelectedScene();
 				
-				if(scn != null) {								
-					setTile("SCENE " + doc.getId(scn));
+				if(s != null) {								
+					setTile("SCENE " + s.getId());
+					actorList.addElements(s, Arrays.asList(s.getActors().values().toArray(new BaseActor[0])));
+					layerList.addElements(s, s.getLayers());		
 				} else {
 					setTile("SCENE");
+					actorList.addElements(null, null);
+					layerList.addElements(null, null);		
 				}
 				
-				actorList.addElements(doc, scn, "actor");
-				verbList.addElements(doc, scn, "verb");		
-				sceneProps.setSceneDocument(doc, scn);
+//				verbList.addElements(doc, scn, "verb");	
+//				sceneProps.setSceneDocument(doc, scn);
 				
 			}
 		});	
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SceneProps.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SceneProps.java
similarity index 60%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SceneProps.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SceneProps.java
index 109c39cba..b992d69ae 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/SceneProps.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SceneProps.java
@@ -22,8 +22,8 @@
 import org.w3c.dom.Element;
 
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.bladecoder.engineeditor.model.ChapterDocument;
-import com.bladecoder.engineeditor.ui.components.PropertyTable;
+import com.bladecoder.engineeditor.model.Chapter;
+import com.bladecoder.engineeditor.ui.panels.PropertyTable;
 
 public class SceneProps extends PropertyTable {
 	public static final String MUSIC_PROP = "Music filename";
@@ -33,7 +33,7 @@ public class SceneProps extends PropertyTable {
 	public static final String INITIAL_MUSIC_DELAY_PROP = "Initial Music Delay";
 	public static final String REPEAT_MUSIC_DELAY_PROP = "Repeat Music Delay";
 	
-	ChapterDocument doc;
+	Chapter doc;
 	Element scn;
 	
 //	TableModelListener tableModelListener = new TableModelListener() {
@@ -59,41 +59,35 @@ public SceneProps(Skin skin) {
 		super(skin);
 	}
 
-	public void setSceneDocument(ChapterDocument doc, Element scn) {
+	public void setSceneDocument(Chapter doc, Element scn) {
 
-		this.scn = scn;
-		this.doc = doc;
-		
-		clear();
-
-		if (scn != null) {
-			addProperty(BACKGROUND_PROP, doc.getBackground(scn));
-			addProperty(LIGHTMAP_PROP, doc.getLightmap(scn));
-			addProperty(MUSIC_PROP, doc.getMusic(scn));
-			addProperty(LOOP_MUSIC_PROP, doc.getRootAttr(scn,"loop_music"), Types.BOOLEAN);
-			addProperty(INITIAL_MUSIC_DELAY_PROP, doc.getRootAttr(scn,"initial_music_delay"), Types.FLOAT);
-			addProperty(REPEAT_MUSIC_DELAY_PROP, doc.getRootAttr(scn,"repeat_music_delay"), Types.FLOAT);
-			
-			this.doc.addPropertyChangeListener("scene", propertyChangeListener);
-			
-			invalidateHierarchy();
-		}	
+//		this.scn = scn;
+//		this.doc = doc;
+//		
+//		clearProps();
+//
+//		if (scn != null) {
+//			addProperty(MUSIC_PROP, doc.getMusic(scn));
+//			addProperty(LOOP_MUSIC_PROP, doc.getRootAttr(scn,XMLConstants.LOOP_MUSIC_ATTR), Types.BOOLEAN);
+//			addProperty(INITIAL_MUSIC_DELAY_PROP, doc.getRootAttr(scn, XMLConstants.INITIAL_MUSIC_DELAY_ATTR), Types.FLOAT);
+//			addProperty(REPEAT_MUSIC_DELAY_PROP, doc.getRootAttr(scn, XMLConstants.REPEAT_MUSIC_DELAY_ATTR), Types.FLOAT);
+//			
+//			this.doc.addPropertyChangeListener("scene", propertyChangeListener);
+//			
+//			invalidateHierarchy();
+//		}	
 	}
 
 	@Override
 	protected void updateModel(String property, String value) {
-		if (property.equals(MUSIC_PROP)) {
-			doc.setRootAttr(scn,"music", value);
-		} else if (property.equals(LOOP_MUSIC_PROP)) {
-			doc.setRootAttr(scn,"loop_music", value);
-		} else if (property.equals(BACKGROUND_PROP)) {
-			doc.setBackground(scn,value);
-		} else if (property.equals(LIGHTMAP_PROP)) {
-			doc.setLightmap(scn,value);			
-		} else if (property.equals(INITIAL_MUSIC_DELAY_PROP)) {
-			doc.setRootAttr(scn,"initial_music_delay", value);
-		} else if (property.equals(REPEAT_MUSIC_DELAY_PROP)) {
-			doc.setRootAttr(scn,"repeat_music_delay", value);
-		}
+//		if (property.equals(MUSIC_PROP)) {
+//			doc.setRootAttr(scn,"music", value);
+//		} else if (property.equals(LOOP_MUSIC_PROP)) {
+//			doc.setRootAttr(scn, XMLConstants.LOOP_MUSIC_ATTR, value);		
+//		} else if (property.equals(INITIAL_MUSIC_DELAY_PROP)) {
+//			doc.setRootAttr(scn,XMLConstants.INITIAL_MUSIC_DELAY_ATTR, value);
+//		} else if (property.equals(REPEAT_MUSIC_DELAY_PROP)) {
+//			doc.setRootAttr(scn,XMLConstants.REPEAT_MUSIC_DELAY_ATTR, value);
+//		}
 	}
 }
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SoundList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SoundList.java
new file mode 100644
index 000000000..a974b5f56
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SoundList.java
@@ -0,0 +1,194 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+import com.bladecoder.engine.model.SoundDesc;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.ModelList;
+import com.bladecoder.engineeditor.undo.UndoDeleteSound;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Arrays;
+
+public class SoundList extends ModelList<World, SoundDesc> {
+
+    private ImageButton playBtn;
+    private Sound playingSound = null;
+
+    public SoundList(Skin skin) {
+        super(skin, true);
+
+        playBtn = new ImageButton(skin);
+        toolbar.addToolBarButton(playBtn, "ic_check", "Play Sound", "Plays the selected sound");
+        playBtn.setDisabled(true);
+
+        setCellRenderer(listCellRenderer);
+
+        Ctx.project.addPropertyChangeListener(Project.NOTIFY_CHAPTER_LOADED, new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                addElements(Ctx.project.getWorld(),
+                        Arrays.asList(Ctx.project.getWorld().getSounds().values().toArray(new SoundDesc[0])));
+            }
+        });
+
+        list.addListener(new ChangeListener() {
+
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                int pos = list.getSelectedIndex();
+
+                toolbar.disableEdit(pos == -1);
+                playBtn.setDisabled(pos == -1);
+            }
+        });
+
+        playBtn.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                SoundDesc selected = list.getSelected();
+
+                if (playingSound != null) {
+                    playingSound.stop();
+                    playingSound.dispose();
+                    playingSound = null;
+                }
+
+                try {
+                    playingSound = Gdx.audio.newSound(
+                            new FileHandle(
+                                    Ctx.project.getAssetPath() + Project.SOUND_PATH + "/" + selected.getFilename()));
+
+                    playingSound.play(selected.getVolume(), 1, selected.getPan());
+
+                    Timer.schedule(new Task() {
+
+                        @Override
+                        public void run() {
+                            if (playingSound != null) {
+                                playingSound.stop();
+                                playingSound.dispose();
+                                playingSound = null;
+                            }
+                        }
+                    }, 5);
+                } catch (Exception e) {
+                    Message.showMsg(getStage(), "Could not play sound: " + e.getMessage(), 4);
+                }
+            }
+        });
+    }
+
+    @Override
+    protected EditSoundDialog getEditElementDialogInstance(SoundDesc s) {
+        return new EditSoundDialog(skin, parent, s);
+    }
+
+    @Override
+    protected void delete() {
+
+        SoundDesc s = removeSelected();
+
+        parent.getSounds().remove(s.getId());
+
+        // UNDO
+        Ctx.project.getUndoStack().add(new UndoDeleteSound(s));
+        Ctx.project.setModified();
+    }
+
+    @Override
+    protected void copy() {
+        SoundDesc e = list.getSelected();
+
+        if (e == null)
+            return;
+
+        clipboard = (SoundDesc) ElementUtils.cloneElement(e);
+        toolbar.disablePaste(false);
+    }
+
+    @Override
+    protected void paste() {
+        SoundDesc newElement = (SoundDesc) ElementUtils.cloneElement(clipboard);
+
+        int pos = list.getSelectedIndex() + 1;
+
+        list.getItems().insert(pos, newElement);
+
+        String id = newElement.getId();
+
+        if (parent.getSounds() != null)
+            id = ElementUtils.getCheckedId(newElement.getId(),
+                    parent.getSounds().keySet().toArray(new String[parent.getSounds().size()]));
+
+        newElement.setId(id);
+
+        parent.getSounds().put(newElement.getId(), newElement);
+
+        list.setSelectedIndex(pos);
+        list.invalidateHierarchy();
+
+        Ctx.project.setModified();
+    }
+
+    // -------------------------------------------------------------------------
+    // ListCellRenderer
+    // -------------------------------------------------------------------------
+    private static final CellRenderer<SoundDesc> listCellRenderer = new CellRenderer<SoundDesc>() {
+
+        @Override
+        protected String getCellTitle(SoundDesc e) {
+            return e.getId();
+        }
+
+        StringBuilder sb = new StringBuilder();
+
+        @Override
+        protected String getCellSubTitle(SoundDesc e) {
+            sb.setLength(0);
+
+            String filename = e.getFilename();
+            if (filename != null && !filename.isEmpty())
+                sb.append("filename: ").append(filename);
+
+            sb.append(" loop: ").append(e.getLoop());
+            sb.append(" volume: ").append(e.getVolume());
+
+            return sb.toString();
+        }
+
+        @Override
+        protected boolean hasSubtitle() {
+            return true;
+        }
+    };
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SpriteList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SpriteList.java
new file mode 100644
index 000000000..dc0796119
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/SpriteList.java
@@ -0,0 +1,269 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Arrays;
+import java.util.HashMap;
+
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.anim.Tween.Type;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.common.Message;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.ModelList;
+import com.bladecoder.engineeditor.undo.UndoDeleteAnimation;
+
+public class SpriteList extends ModelList<SpriteActor, AnimationDesc> {
+
+	private ImageButton initBtn;
+	private ImageButton flipInitBtn;
+
+	public SpriteList(Skin skin) {
+		super(skin, true);
+
+		initBtn = new ImageButton(skin);
+		toolbar.addToolBarButton(initBtn, "ic_check", "Set init animation", "Set init animation");
+		initBtn.setDisabled(true);
+
+		flipInitBtn = new ImageButton(skin);
+		toolbar.addToolBarButton(flipInitBtn, "ic_flip", "Set init animation flipped", "Set init animation flipped");
+		flipInitBtn.setDisabled(true);
+
+		setCellRenderer(listCellRenderer);
+
+		list.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				int pos = list.getSelectedIndex();
+
+				String id = null;
+
+				if (pos != -1)
+					id = list.getItems().get(pos).id;
+
+				Ctx.project.setSelectedFA(id);
+
+				toolbar.disableEdit(pos == -1);
+				initBtn.setDisabled(pos == -1);
+				flipInitBtn.setDisabled(pos == -1);
+			}
+		});
+
+		initBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				setDefault();
+			}
+		});
+
+		flipInitBtn.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				flipInit();
+			}
+		});
+
+		Ctx.project.addPropertyChangeListener(Project.NOTIFY_ELEMENT_CREATED, new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+				if (evt.getNewValue() instanceof Dialog && !(evt.getSource() instanceof EditDialogDialog)
+						&& parent instanceof SpriteActor) {
+					HashMap<String, AnimationDesc> animations = ((AnimationRenderer) parent.getRenderer())
+							.getAnimations();
+					addElements(parent, Arrays.asList(animations.values().toArray(new AnimationDesc[0])));
+				}
+			}
+		});
+	}
+
+	private void setDefault() {
+		int pos = list.getSelectedIndex();
+
+		if (pos == -1)
+			return;
+
+		AnimationRenderer renderer = (AnimationRenderer) ((SpriteActor) Ctx.project.getSelectedActor()).getRenderer();
+
+		String id = list.getItems().get(pos).id;
+		String oldId = renderer.getInitAnimation();
+
+		renderer.setInitAnimation(id);
+
+		Ctx.project.setModified(this, "init_animation", oldId, id);
+	}
+
+	private void flipInit() {
+		int pos = list.getSelectedIndex();
+
+		if (pos == -1)
+			return;
+
+		AnimationRenderer renderer = (AnimationRenderer) ((SpriteActor) Ctx.project.getSelectedActor()).getRenderer();
+
+		String id = list.getItems().get(pos).id;
+
+		String newValue = AnimationRenderer.getFlipId(id);
+
+		renderer.setInitAnimation(newValue);
+
+		Ctx.project.setModified(this, "init_animation", id, newValue);
+	}
+
+	@Override
+	protected void delete() {
+		AnimationDesc d = removeSelected();
+
+		AnimationRenderer renderer = (AnimationRenderer) parent.getRenderer();
+
+		renderer.getAnimations().remove(d.id);
+
+		// UNDO
+		Ctx.project.getUndoStack().add(new UndoDeleteAnimation(parent, d));
+
+		// delete init_animation attr if the animation to delete is the chapter
+		// init_animation
+		if (d.id.equals(renderer.getInitAnimation())) {
+			HashMap<String, AnimationDesc> animations = renderer.getAnimations();
+			String newValue = null;
+
+			if (animations.size() > 0)
+				newValue = animations.keySet().iterator().next();
+
+			renderer.setInitAnimation(newValue);
+
+			Ctx.project.setModified(this, "init_animation", d.id, newValue);
+		}
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void copy() {
+		AnimationDesc e = list.getSelected();
+
+		if (e == null)
+			return;
+
+		clipboard = (AnimationDesc) ElementUtils.cloneElement(e);
+		toolbar.disablePaste(false);
+	}
+
+	@Override
+	protected void paste() {
+		AnimationDesc newElement = (AnimationDesc) ElementUtils.cloneElement(clipboard);
+
+		if (((AnimationRenderer) parent.getRenderer()).getAnimations().get(newElement.id) != null) {
+			Message.showMsg(getStage(), "Animation already exists.", 2);
+
+			return;
+		}
+
+		int pos = list.getSelectedIndex() + 1;
+
+		list.getItems().insert(pos, newElement);
+
+		((AnimationRenderer) parent.getRenderer()).addAnimation(newElement);
+
+		list.setSelectedIndex(pos);
+		list.invalidateHierarchy();
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected EditModelDialog<SpriteActor, AnimationDesc> getEditElementDialogInstance(AnimationDesc e) {
+		return new EditAnimationDialog(skin, parent, e);
+	}
+
+	// -------------------------------------------------------------------------
+	// ListCellRenderer
+	// -------------------------------------------------------------------------
+	private final CellRenderer<AnimationDesc> listCellRenderer = new CellRenderer<AnimationDesc>() {
+
+		@Override
+		protected String getCellTitle(AnimationDesc e) {
+			String name = e.id;
+			SpriteActor actor = (SpriteActor) Ctx.project.getSelectedActor();
+			AnimationRenderer renderer = (AnimationRenderer) actor.getRenderer();
+
+			String init = renderer.getInitAnimation();
+
+			if (init == null || init.isEmpty()) {
+				if (renderer.getAnimations().values().size() > 0)
+					init = renderer.getAnimations().values().iterator().next().id;
+				else
+					init = "";
+			}
+
+			if (init.equals(name) || AnimationRenderer.getFlipId(init).equals(name))
+				name += " <init>";
+
+			return name;
+		}
+
+		@Override
+		protected String getCellSubTitle(AnimationDesc e) {
+			StringBuilder sb = new StringBuilder();
+
+			if (e.source != null && !e.source.isEmpty())
+				sb.append("source: ").append(e.source);
+
+			sb.append(" speed: ").append(e.duration);
+			sb.append(" count: ").append(e.count);
+
+			return sb.toString();
+		}
+
+		@Override
+		public TextureRegion getCellImage(AnimationDesc a) {
+			String u = null;
+
+			if (a.animationType == Type.REPEAT) {
+				u = "ic_repeat";
+			} else if (a.animationType == Type.YOYO) {
+				u = "ic_yoyo";
+			} else {
+				u = "ic_sprite_actor";
+			}
+
+			return Ctx.assetManager.getIcon(u);
+		}
+
+		@Override
+		protected boolean hasSubtitle() {
+			return true;
+		}
+
+		@Override
+		protected boolean hasImage() {
+			return true;
+		}
+	};
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/VerbList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/VerbList.java
new file mode 100644
index 000000000..c3893020e
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/VerbList.java
@@ -0,0 +1,294 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.List;
+
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.model.VerbManager;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.CellRenderer;
+import com.bladecoder.engineeditor.ui.panels.EditModelDialog;
+import com.bladecoder.engineeditor.ui.panels.ModelList;
+import com.bladecoder.engineeditor.ui.panels.ScopePanel;
+import com.bladecoder.engineeditor.undo.UndoDeleteVerb;
+
+public class VerbList extends ModelList<VerbManager, Verb> {
+
+	public static final String VERBS[] = { "lookat", "pickup", "talkto", "use", "leave", "enter", "exit", "init",
+			"test", "custom" };
+
+	private ActionList actionList;
+
+	private ScopePanel scopePanel;
+
+	public VerbList(Skin skin) {
+		super(skin, true);
+
+		clearChildren();
+
+		scopePanel = new ScopePanel(skin) {
+
+			@Override
+			public void scopeChanged(String scope) {
+				if (WORLD_SCOPE.equals(scope)) {
+					addElements(Ctx.project.getWorld().getVerbManager(), Arrays
+							.asList(Ctx.project.getWorld().getVerbManager().getVerbs().values().toArray(new Verb[0])));
+				} else if (SCENE_SCOPE.equals(scope)) {
+					if (Ctx.project.getSelectedScene() != null)
+						addElements(Ctx.project.getSelectedScene().getVerbManager(), Arrays.asList(Ctx.project
+								.getSelectedScene().getVerbManager().getVerbs().values().toArray(new Verb[0])));
+					else
+						addElements(null, null);
+				} else if (ACTOR_SCOPE.equals(scope)) {
+					BaseActor a = Ctx.project.getSelectedActor();
+					if (a instanceof InteractiveActor) {
+						addElements(((InteractiveActor) a).getVerbManager(), Arrays.asList(
+								((InteractiveActor) a).getVerbManager().getVerbs().values().toArray(new Verb[0])));
+					} else {
+						addElements(null, null);
+					}
+				}
+			}
+		};
+
+		add(scopePanel).expandX().fillX();
+		row();
+		add(toolbar).expandX().fillX();
+		row().fill();
+		add(container).expandY().fill();
+
+		actionList = new ActionList(skin);
+
+		row();
+		add(actionList).expand().fill();
+
+		list.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				addActions();
+			}
+		});
+
+		list.setCellRenderer(listCellRenderer);
+		listCellRenderer.layout(list.getStyle());
+		container.minHeight(listCellRenderer.getItemHeight() * 5);
+		container.maxHeight(listCellRenderer.getItemHeight() * 5);
+
+		Ctx.project.addPropertyChangeListener(Project.NOTIFY_ELEMENT_CREATED, new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent evt) {
+				if (evt.getNewValue() instanceof Verb && !(evt.getSource() instanceof EditVerbDialog)) {
+					if (ScopePanel.WORLD_SCOPE.equals(scopePanel.getScope())) {
+						addElements(Ctx.project.getWorld().getVerbManager(), Arrays.asList(
+								Ctx.project.getWorld().getVerbManager().getVerbs().values().toArray(new Verb[0])));
+					} else if (ScopePanel.SCENE_SCOPE.equals(scopePanel.getScope())) {
+						addElements(Ctx.project.getSelectedScene().getVerbManager(), Arrays.asList(Ctx.project
+								.getSelectedScene().getVerbManager().getVerbs().values().toArray(new Verb[0])));
+					} else if (ScopePanel.ACTOR_SCOPE.equals(scopePanel.getScope())) {
+						BaseActor a = Ctx.project.getSelectedActor();
+						if (a instanceof InteractiveActor) {
+							addElements(((InteractiveActor) a).getVerbManager(), Arrays.asList(
+									((InteractiveActor) a).getVerbManager().getVerbs().values().toArray(new Verb[0])));
+						} else {
+							addElements(null, null);
+						}
+					}
+				}
+			}
+		});
+	}
+
+	public void changeActor() {
+		scopePanel.scopeChanged(scopePanel.getScope());
+	}
+
+	@Override
+	protected EditModelDialog<VerbManager, Verb> getEditElementDialogInstance(Verb e) {
+		return new EditVerbDialog(skin, scopePanel.getScope(), parent, e);
+	}
+
+	@Override
+	public void addElements(VerbManager vm, List<Verb> elements) {
+		super.addElements(vm, elements);
+		addActions();
+	}
+
+	@Override
+	protected void delete() {
+
+		Verb v = removeSelected();
+
+		parent.getVerbs().remove(v.getHashKey());
+
+		// TRANSLATIONS
+		if (scopePanel.getScope().equals(ScopePanel.WORLD_SCOPE))
+			Ctx.project.getI18N().putTranslationsInElement(v, true);
+		else
+			Ctx.project.getI18N().putTranslationsInElement(v, false);
+
+		// UNDO
+		Ctx.project.getUndoStack().add(new UndoDeleteVerb(parent, v));
+
+		// Clear actions here because change event doesn't call when deleting
+		// the last element
+		if (list.getSelectedIndex() == -1)
+			addActions();
+
+		Ctx.project.setModified();
+	}
+
+	@Override
+	protected void copy() {
+		Verb e = list.getSelected();
+
+		if (e == null)
+			return;
+
+		clipboard = (Verb) ElementUtils.cloneElement(e);
+		toolbar.disablePaste(false);
+
+		// TRANSLATIONS
+		if (scopePanel.getScope().equals(ScopePanel.WORLD_SCOPE))
+			Ctx.project.getI18N().putTranslationsInElement(clipboard, true);
+		else
+			Ctx.project.getI18N().putTranslationsInElement(clipboard, false);
+	}
+
+	@Override
+	protected void paste() {
+		Verb newElement = (Verb) ElementUtils.cloneElement(clipboard);
+
+		// Check for id duplicates
+		String[] keys = new String[parent.getVerbs().size()];
+		Verb[] values = parent.getVerbs().values().toArray(new Verb[0]);
+
+		for (int i = 0; i < keys.length; i++) {
+			keys[i] = values[i].getId();
+		}
+
+		newElement.setId(ElementUtils.getCheckedId(newElement.getId(), keys));
+
+		int pos = list.getSelectedIndex() + 1;
+
+		list.getItems().insert(pos, newElement);
+
+		parent.addVerb(newElement);
+
+		if (scopePanel.getScope().equals(ScopePanel.WORLD_SCOPE))
+			Ctx.project.getI18N().extractStrings(null, null, newElement);
+		else if (scopePanel.getScope().equals(ScopePanel.SCENE_SCOPE))
+			Ctx.project.getI18N().extractStrings(Ctx.project.getSelectedScene().getId(), null, newElement);
+		else
+			Ctx.project.getI18N().extractStrings(Ctx.project.getSelectedScene().getId(),
+					Ctx.project.getSelectedActor().getId(), newElement);
+
+		list.setSelectedIndex(pos);
+		list.invalidateHierarchy();
+
+		Ctx.project.setModified();
+	}
+
+	private void addActions() {
+		int pos = list.getSelectedIndex();
+
+		Verb v = null;
+
+		if (pos != -1) {
+			v = list.getItems().get(pos);
+			actionList.setScope(scopePanel.getScope());
+			actionList.addElements(v, v.getActions());
+		} else {
+			actionList.addElements(null, null);
+			actionList.setScope(null);
+		}
+	}
+
+	// -------------------------------------------------------------------------
+	// ListCellRenderer
+	// -------------------------------------------------------------------------
+	private final CellRenderer<Verb> listCellRenderer = new CellRenderer<Verb>() {
+
+		@Override
+		protected String getCellTitle(Verb e) {
+			return e.getId();
+		}
+
+		@Override
+		protected String getCellSubTitle(Verb e) {
+			String state = e.getState();
+			String target = e.getTarget();
+
+			StringBuilder sb = new StringBuilder();
+
+			if (state != null)
+				sb.append("when ").append(state);
+
+			if (target != null)
+				sb.append(" target: '").append(target).append("'");
+
+			if (e.getIcon() != null)
+				sb.append(" icon: '").append(e.getIcon()).append("'");
+
+			return sb.toString();
+		}
+
+		@Override
+		public TextureRegion getCellImage(Verb e) {
+			boolean custom = true;
+
+			String verbName = e.getId();
+			for (String v : VERBS) {
+				if (v.equals(verbName)) {
+					custom = false;
+					break;
+				}
+			}
+
+			String iconName = MessageFormat.format("ic_{0}", e.getId());
+			TextureRegion image = null;
+
+			if (!custom)
+				image = Ctx.assetManager.getIcon(iconName);
+			else
+				image = Ctx.assetManager.getIcon("ic_custom");
+
+			return image;
+		}
+
+		@Override
+		protected boolean hasSubtitle() {
+			return true;
+		}
+
+		@Override
+		protected boolean hasImage() {
+			return true;
+		}
+	};
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/WorldProps.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/WorldProps.java
new file mode 100644
index 000000000..213d3f20a
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/WorldProps.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Locale;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.util.Config;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+import com.bladecoder.engineeditor.ui.panels.PropertyTable;
+
+public class WorldProps extends PropertyTable {
+	public WorldProps(Skin skin) {
+		super(skin);
+
+		Ctx.project.addPropertyChangeListener(Project.NOTIFY_PROJECT_LOADED, new PropertyChangeListener() {
+			@Override
+			public void propertyChange(PropertyChangeEvent arg0) {
+				setProject();
+			}
+		});
+	}
+
+	@Override
+	protected void updateModel(String property, String value) {
+		if (property.equals(Project.WIDTH_PROPERTY)) {
+			Ctx.project.getWorld().setWidth(Integer.parseInt(value));
+		} else if (property.equals(Config.TITLE_PROP)) {
+			Ctx.project.getProjectConfig().setProperty(Config.TITLE_PROP, value);
+		} else if (property.equals(Project.HEIGHT_PROPERTY)) {
+			Ctx.project.getWorld().setHeight(Integer.parseInt(value));
+		} else if (property.equals(Config.INVENTORY_POS_PROP)) {
+			Ctx.project.getProjectConfig().setProperty(Config.INVENTORY_POS_PROP, value);
+		} else if (property.equals(Config.INVENTORY_AUTOSIZE_PROP)) {
+			Ctx.project.getProjectConfig().setProperty(Config.INVENTORY_AUTOSIZE_PROP, value);
+		} else if (property.equals(Config.UI_MODE)) {
+			Ctx.project.getProjectConfig().setProperty(Config.UI_MODE, value);
+		} else if (property.equals(Config.SINGLE_ACTION_INVENTORY)) {
+			Ctx.project.getProjectConfig().setProperty(Config.SINGLE_ACTION_INVENTORY, value);
+		} else if (property.equals(Config.FAST_LEAVE)) {
+			Ctx.project.getProjectConfig().setProperty(Config.FAST_LEAVE, value);
+		} else if (property.equals(Config.DEBUG_PROP)) {
+			Ctx.project.getProjectConfig().setProperty(Config.DEBUG_PROP, value);
+		} else if (property.equals(Config.CHARACTER_ICON_ATLAS)) {
+			Ctx.project.getProjectConfig().setProperty(Config.CHARACTER_ICON_ATLAS, value);
+		} else if (property.equals(Config.SHOW_DESC_PROP)) {
+			Ctx.project.getProjectConfig().setProperty(Config.SHOW_DESC_PROP, value);
+		} else if (property.equals(Config.AUTO_HIDE_TEXTS)) {
+			Ctx.project.getProjectConfig().setProperty(Config.AUTO_HIDE_TEXTS, value);
+		} else if (property.equals(Config.EXTEND_VIEWPORT_PROP)) {
+			Ctx.project.getProjectConfig().setProperty(Config.EXTEND_VIEWPORT_PROP, value);
+		} else if (property.equals(Config.SHOW_HOTSPOTS)) {
+			Ctx.project.getProjectConfig().setProperty(Config.SHOW_HOTSPOTS, value);
+		}
+
+		Ctx.project.setModified(); // TODO Add propertychange to Config
+	}
+
+	private void setProject() {
+		clearProps();
+
+		if (Ctx.project.isLoaded()) {
+			addProperty(Project.WIDTH_PROPERTY, Ctx.project.getWorld().getWidth());
+			addProperty(Project.HEIGHT_PROPERTY, Ctx.project.getWorld().getHeight());
+			addProperty(Config.TITLE_PROP, Ctx.project.getTitle());
+			addProperty(
+					Config.INVENTORY_POS_PROP, Ctx.project.getProjectConfig()
+							.getProperty(Config.INVENTORY_POS_PROP, "DOWN").toUpperCase(Locale.ENGLISH),
+					new String[] { "TOP", "DOWN", "LEFT", "RIGHT", "CENTER" });
+			addProperty(Config.INVENTORY_AUTOSIZE_PROP, Boolean
+					.parseBoolean(Ctx.project.getProjectConfig().getProperty(Config.INVENTORY_AUTOSIZE_PROP, "true")));
+			addProperty(Config.UI_MODE, Ctx.project.getProjectConfig().getProperty(Config.UI_MODE, "TWO_BUTTONS")
+					.toUpperCase(Locale.ENGLISH), new String[] { "TWO_BUTTONS", "PIE", "SINGLE_CLICK" });
+			addProperty(Config.SINGLE_ACTION_INVENTORY, Boolean
+					.parseBoolean(Ctx.project.getProjectConfig().getProperty(Config.SINGLE_ACTION_INVENTORY, "false")));
+			addProperty(Config.FAST_LEAVE,
+					Boolean.parseBoolean(Ctx.project.getProjectConfig().getProperty(Config.FAST_LEAVE, "false")));
+			addProperty(Config.DEBUG_PROP,
+					Boolean.parseBoolean(Ctx.project.getProjectConfig().getProperty(Config.DEBUG_PROP, "false")));
+			addProperty(Config.SHOW_DESC_PROP,
+					Boolean.parseBoolean(Ctx.project.getProjectConfig().getProperty(Config.SHOW_DESC_PROP, "true")));
+			addProperty(Config.AUTO_HIDE_TEXTS,
+					Boolean.parseBoolean(Ctx.project.getProjectConfig().getProperty(Config.AUTO_HIDE_TEXTS, "true")));
+			addProperty(Config.CHARACTER_ICON_ATLAS,
+					Ctx.project.getProjectConfig().getProperty(Config.CHARACTER_ICON_ATLAS, ""));
+			addProperty(Config.EXTEND_VIEWPORT_PROP, Boolean
+					.parseBoolean(Ctx.project.getProjectConfig().getProperty(Config.EXTEND_VIEWPORT_PROP, "false")));
+			addProperty(Config.SHOW_HOTSPOTS,
+					Boolean.parseBoolean(Ctx.project.getProjectConfig().getProperty(Config.SHOW_HOTSPOTS, "true")));
+		}
+
+		invalidateHierarchy();
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ActorAnimationInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ActorAnimationInputPanel.java
new file mode 100644
index 000000000..5b817feeb
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ActorAnimationInputPanel.java
@@ -0,0 +1,158 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.actions.ActorAnimationRef;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engineeditor.Ctx;
+
+public class ActorAnimationInputPanel extends InputPanel {
+	EditableSelectBox<String> animation;
+	EditableSelectBox<String> actor;
+	Table panel;
+
+	ActorAnimationInputPanel(Skin skin, String title, String desc,
+			boolean mandatory, String defaultValue) {
+		panel = new Table(skin);
+		animation = new EditableSelectBox<>(skin);
+		actor = new EditableSelectBox<>(skin);
+
+		panel.add(new Label(" Actor ", skin));
+		panel.add(actor);
+		panel.add(new Label("  Animation ", skin));
+		panel.add(animation);
+		
+
+		ArrayList<String> values = new ArrayList<String>();
+
+		// values.add("");
+
+		for (BaseActor a: Ctx.project.getSelectedScene().getActors().values()) {
+
+			if (a instanceof SpriteActor) {
+				values.add(a.getId());
+			}
+		}
+		
+		values.add(Scene.VAR_PLAYER);
+
+		actor.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				actorSelected();
+			}
+		});
+
+		init(skin, title, desc, panel, mandatory, defaultValue);
+		String[] array = values.toArray(new String[values.size()]);
+		Arrays.sort(array);
+		actor.setItems(array);
+
+		if (values.size() > 0) {
+			if (defaultValue != null)
+				setText(defaultValue);
+			else
+				actor.setSelected("");
+		}
+
+	}
+
+	private void actorSelected() {
+		String s = actor.getSelected();
+		SpriteActor a = null;
+		
+		if(Ctx.project.getSelectedActor() instanceof SpriteActor)
+			a = (SpriteActor) Ctx.project.getSelectedActor();
+		
+		ArrayList<String> values = new ArrayList<String>();
+
+		if (s != null && !s.isEmpty()) {
+			a = (SpriteActor)Ctx.project.getSelectedScene().getActor(s, false);
+		}
+
+		if (a != null && a.getRenderer() instanceof AnimationRenderer) {
+
+			 HashMap<String, AnimationDesc> animations = ((AnimationRenderer)a.getRenderer()).getAnimations();
+
+			if (!isMandatory()) {
+				values.add("");
+			}
+
+			for (AnimationDesc anim:animations.values()) {
+				values.add(anim.id);
+
+				String flipped = AnimationRenderer.getFlipId(anim.id);
+
+				if (!flipped.isEmpty()) {
+					values.add(flipped);
+				}
+			}
+		}
+		
+		String[] array = values.toArray(new String[values.size()]);
+		Arrays.sort(array);
+		animation.setItems(array);
+
+		if (values.size() > 0)
+			animation.setSelected("");
+
+	}
+
+	public String getText() {
+		
+		String selectedActor = !actor.getSelected().isEmpty() ? actor.getSelected():Ctx.project.getSelectedActor().getId();
+		
+		return (new ActorAnimationRef(selectedActor, animation.getSelected())).toString();
+	}
+
+	public void setText(String s) {
+		ActorAnimationRef aa = new ActorAnimationRef(s);
+			
+		actor.setSelected(aa.getActorId() == null?"":aa.getActorId());
+		actorSelected();
+		animation.setSelected(aa.getAnimationId());
+	}
+	
+	@Override
+	public boolean validateField() {
+		
+		ActorAnimationRef a = new ActorAnimationRef(getText());
+		
+		if(isMandatory()) {
+			if(a.getActorId() == null || a.getActorId().trim().isEmpty() || 
+					a.getAnimationId() == null || a.getAnimationId().trim().isEmpty()) {
+				setError(true);
+				return false;
+			}		
+		}
+		
+		setError(false);	
+		return true;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ActorInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ActorInputPanel.java
new file mode 100644
index 000000000..5e4e86af8
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ActorInputPanel.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.WalkZoneActor;
+import com.bladecoder.engineeditor.Ctx;
+
+public class ActorInputPanel extends EditableOptionsInputPanel<String> {
+
+	ActorInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue, Param.Type type) {
+		super(skin, title, desc, mandatory, defaultValue, getValues(mandatory, type));
+
+		if (mandatory)
+			if (type == Param.Type.ACTOR)
+				setText(Ctx.project.getSelectedActor().getId());
+			else
+				input.setSelectedIndex(0);
+	}
+
+	private static String[] getValues(boolean mandatory, Param.Type type) {
+
+		ArrayList<BaseActor> filteredActors = new ArrayList<>();
+
+		if (Ctx.project.getSelectedScene() != null) {
+			Map<String, BaseActor> actors = Ctx.project.getSelectedScene().getActors();
+
+			for (BaseActor a : actors.values()) {
+				if (type == Param.Type.CHARACTER_ACTOR) {
+					if (a instanceof CharacterActor)
+						filteredActors.add(a);
+				} else if (type == Param.Type.INTERACTIVE_ACTOR) {
+					if (a instanceof InteractiveActor)
+						filteredActors.add(a);
+				} else if (type == Param.Type.WALKZONE_ACTOR) {
+					if (a instanceof WalkZoneActor)
+						filteredActors.add(a);
+				} else if (type == Param.Type.SPRITE_ACTOR) {
+					if (a instanceof SpriteActor)
+						filteredActors.add(a);
+				} else {
+					filteredActors.add(a);
+				}
+			}
+		}
+
+		String[] result = null;
+
+		if (type != Param.Type.WALKZONE_ACTOR) {
+			// Add player variable to the list
+			result = new String[filteredActors.size() + 1];
+
+			result[0] = Scene.VAR_PLAYER;
+
+			for (int i = 0; i < filteredActors.size(); i++) {
+				result[i + 1] = filteredActors.get(i).getId();
+			}
+		} else {
+			result = new String[filteredActors.size()];
+
+			for (int i = 0; i < filteredActors.size(); i++) {
+				result[i] = filteredActors.get(i).getId();
+			}
+
+		}
+
+		Arrays.sort(result);
+		return result;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/BooleanInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/BooleanInputPanel.java
new file mode 100644
index 000000000..89bc7c462
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/BooleanInputPanel.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+
+public class BooleanInputPanel extends StringOptionsInputPanel {
+	private static final String[] booleanValues = {"true", "false"};
+
+	BooleanInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		super(skin, title, desc, mandatory, defaultValue, booleanValues);
+	}
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/CellRenderer.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/CellRenderer.java
similarity index 64%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/CellRenderer.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/CellRenderer.java
index 7de907621..7f95dfd73 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/CellRenderer.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/CellRenderer.java
@@ -13,101 +13,102 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
+package com.bladecoder.engineeditor.ui.panels;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
-import com.bladecoder.engineeditor.ui.components.CustomList.CustomListStyle;
+import com.bladecoder.engineeditor.ui.panels.CustomList.CustomListStyle;
 
 public class CellRenderer<T> {
 	private static final float MARGIN = 10;
-	
+
 	private CustomListStyle style;
 	private float itemHeight;
 	private float textOffsetX, textOffsetY;
 
-	public CellRenderer() {		
+	public CellRenderer() {
 	}
 
-	public void draw(Batch batch, float parentAlpha, T item, boolean selected, float x, float y, float width, float height) {
+	public void draw(Batch batch, float parentAlpha, T item, boolean selected, float x, float y, float width,
+			float height) {
 		BitmapFont font = style.font;
 		Drawable selectedDrawable = style.selection;
 		Color fontColorSelected = style.fontColorSelected;
 		Color fontColorUnselected = style.fontColorUnselected;
-		
-		
-		
+
 		if (selected) {
-			selectedDrawable.draw(batch, x,
-					y - height, width,
-					height);
-			font.setColor(fontColorSelected.r, fontColorSelected.g,
-					fontColorSelected.b, fontColorSelected.a * parentAlpha);
+			selectedDrawable.draw(batch, x, y - height, width, height);
+			font.setColor(fontColorSelected.r, fontColorSelected.g, fontColorSelected.b,
+					fontColorSelected.a * parentAlpha);
 		} else {
-			font.setColor(fontColorUnselected.r, fontColorUnselected.g, fontColorUnselected.b, fontColorUnselected.a * parentAlpha);			
+			font.setColor(fontColorUnselected.r, fontColorUnselected.g, fontColorUnselected.b,
+					fontColorUnselected.a * parentAlpha);
 		}
-		
-		if(hasImage()) {
+
+		if (hasImage()) {
 			TextureRegion r = getCellImage(item);
-			
+
 			float ih = r.getRegionHeight();
 			float iw = r.getRegionWidth();
-					
-			if(ih > getItemHeight() - MARGIN) {
+
+			if (ih > getItemHeight() - MARGIN) {
 				ih = getItemHeight() - MARGIN;
 				iw *= ih / r.getRegionHeight();
 			}
-			
-			batch.draw(r, x, y - ih - MARGIN/2, iw, ih);
+
+			batch.draw(r, x, y - ih - MARGIN / 2, iw, ih);
 			x += iw;
 		}
-		
-		
-		font.draw(batch, getCellTitle(item), x + textOffsetX,
-				y - textOffsetY);
-		
-		if(hasSubtitle()) {
-			if (selected) {
-				style.subtitleFont.setColor(fontColorSelected.r, fontColorSelected.g,
-						fontColorSelected.b, fontColorSelected.a * parentAlpha * 0.5f);
-			} else {
-				style.subtitleFont.setColor(fontColorUnselected.r, fontColorUnselected.g, fontColorUnselected.b, fontColorUnselected.a * parentAlpha * 0.5f);			
-			}			
-			
-			style.subtitleFont.draw(batch, getCellSubTitle(item), x + textOffsetX,
-					y - textOffsetY - (font.getCapHeight() - font.getDescent() * 2));
+
+		font.draw(batch, getCellTitle(item), x + textOffsetX, y - textOffsetY);
+
+		if (hasSubtitle()) {
+			String sub = getCellSubTitle(item);
+
+			if (sub != null) {
+				if (selected) {
+					style.subtitleFont.setColor(fontColorSelected.r, fontColorSelected.g, fontColorSelected.b,
+							fontColorSelected.a * parentAlpha * 0.5f);
+				} else {
+					style.subtitleFont.setColor(fontColorUnselected.r, fontColorUnselected.g, fontColorUnselected.b,
+							fontColorUnselected.a * parentAlpha * 0.5f);
+				}
+
+				style.subtitleFont.draw(batch, sub, x + textOffsetX,
+						y - textOffsetY - (font.getCapHeight() - font.getDescent() * 2));
+			}
 		}
 	}
-	
+
 	protected boolean hasSubtitle() {
 		return false;
 	}
-	
+
 	protected boolean hasImage() {
 		return false;
 	}
-	
+
 	public void layout(CustomListStyle style) {
 		this.style = style;
-		
+
 		BitmapFont font = style.font;
 		Drawable selectedDrawable = style.selection;
 
 		textOffsetX = selectedDrawable.getLeftWidth();
 		textOffsetY = selectedDrawable.getTopHeight() - font.getDescent();
-		
+
 		itemHeight = font.getCapHeight() - font.getDescent() * 2;
-		
-		if(hasSubtitle()) {
-			itemHeight += style.subtitleFont.getCapHeight() - style.subtitleFont.getDescent() * 2;;
+
+		if (hasSubtitle()) {
+			itemHeight += style.subtitleFont.getCapHeight() - style.subtitleFont.getDescent() * 2;
+			;
 		}
-		
-		itemHeight += selectedDrawable.getTopHeight()
-				+ selectedDrawable.getBottomHeight();
-	}		
+
+		itemHeight += selectedDrawable.getTopHeight() + selectedDrawable.getBottomHeight();
+	}
 
 	public float getItemHeight() {
 		return itemHeight;
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ChapterInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ChapterInputPanel.java
new file mode 100644
index 000000000..acd66cfd9
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ChapterInputPanel.java
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engineeditor.Ctx;
+
+public class ChapterInputPanel extends StringOptionsInputPanel {
+	ChapterInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		super(skin, title, desc, mandatory, defaultValue, Ctx.project.getChapter().getChapters());
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ColorInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ColorInputPanel.java
new file mode 100644
index 000000000..fc58eddf7
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ColorInputPanel.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.bladecoder.engine.actions.Param;
+import com.kotcrab.vis.ui.widget.color.ColorPicker;
+import com.kotcrab.vis.ui.widget.color.ColorPickerAdapter;
+
+public class ColorInputPanel extends InputPanel {
+	
+	private final static String SELECT_TEXT = "Select Color";
+
+	private ColorPicker colorPicker;
+	private TextButton button;
+	private Color selected;
+	
+	private TextButtonStyle buttonStyle;
+	private TextButtonStyle oldButtonStyle;
+
+	public ColorInputPanel(Skin skin, String title, String desc) {
+		this(skin, title, desc, false, null);
+	}
+
+	public ColorInputPanel(Skin skin, String title, String desc, boolean mandatory) {
+		this(skin, title, desc, mandatory, null);
+	}
+
+	public ColorInputPanel(Skin skin, String title, String desc, boolean mandatory, String current ) {
+		
+		Table t = new Table();
+		
+		oldButtonStyle = skin.get("no-toggled", TextButtonStyle.class);
+		buttonStyle = new TextButtonStyle(oldButtonStyle);
+		
+		buttonStyle.up = skin.newDrawable("white_pixel", Color.WHITE);
+		
+		button = new TextButton(SELECT_TEXT, buttonStyle);
+		
+		t.add(button);
+		
+		init(skin, title, desc, t,
+				mandatory, null);
+		
+		colorPicker = new ColorPicker(new ColorPickerAdapter() {
+		    @Override
+		    public void finished (Color newColor) {
+		    	setText(newColor.toString());
+		    }
+		});
+
+		
+		button.addListener(new ClickListener() {
+			public void clicked(InputEvent event, float x, float y) {
+				if(selected != null)
+					colorPicker.setColor(selected);
+				
+				//displaying picker with fade in animation
+		        getStage().addActor(colorPicker.fadeIn());
+			}
+		});
+		
+		setText(current);
+		
+		// Adds clear button if not mandatory
+		if(!mandatory) {
+			TextButton clearButton = new TextButton("Clear", skin, "no-toggled");
+			
+			clearButton.addListener(new ClickListener() {
+				public void clicked(InputEvent event, float x, float y) {
+					setText(null);
+				}
+			});
+			
+			t.add(clearButton);
+		}
+	}
+
+	@Override
+	public String getText() {
+		return selected==null?null:selected.toString();
+	}
+
+	@Override
+	public void setText(String text) {
+		selected = Param.parseColor(text);
+		
+		if(selected != null) {
+			button.setText(text);
+			button.setColor(selected);
+			button.setStyle(buttonStyle);
+		} else {
+			button.setText(SELECT_TEXT);
+			button.setColor(Color.WHITE);
+			button.setStyle(oldButtonStyle);
+		}
+	}
+
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/CustomList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/CustomList.java
similarity index 81%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/CustomList.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/CustomList.java
index 61319740a..811fe09cf 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/CustomList.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/CustomList.java
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
+package com.bladecoder.engineeditor.ui.panels;
+
+import java.util.Comparator;
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.InputListener;
@@ -52,7 +54,7 @@ public class CustomList<T> extends Widget implements Cullable {
 	public CustomList(Skin skin, CellRenderer<T> r) {
 		this(skin.get(CustomListStyle.class), r);
 	}
-	
+
 	public CustomList(Skin skin) {
 		this(skin.get(CustomListStyle.class), new CellRenderer<T>());
 	}
@@ -65,15 +67,14 @@ public CustomList(CustomListStyle style, CellRenderer<T> r) {
 		selection = new ArraySelection<T>(items);
 		selection.setActor(this);
 		selection.setRequired(true);
-		
+
 		cellRenderer = r;
 
 		setStyle(style);
 		setSize(getPrefWidth(), getPrefHeight());
 
 		addListener(new InputListener() {
-			public boolean touchDown(InputEvent event, float x, float y,
-					int pointer, int button) {
+			public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
 				if (pointer == 0 && button != 0)
 					return false;
 				if (selection.isDisabled())
@@ -85,16 +86,15 @@ public boolean touchDown(InputEvent event, float x, float y,
 	}
 
 	public void setCellRenderer(CellRenderer<T> r) {
-		cellRenderer = r;	
+		cellRenderer = r;
 	}
-	
+
 	void touchDown(float y) {
 		if (items.size == 0)
 			return;
 		float height = getHeight();
 		if (style.background != null) {
-			height -= style.background.getTopHeight()
-					+ style.background.getBottomHeight();
+			height -= style.background.getTopHeight() + style.background.getBottomHeight();
 			y -= style.background.getBottomHeight();
 		}
 		int index = (int) ((height - y) / cellRenderer.getItemHeight());
@@ -120,50 +120,57 @@ public CustomListStyle getStyle() {
 
 	public void layout() {
 		final BitmapFont font = style.font;
+		final BitmapFont subfont = style.subtitleFont;
 		final Drawable selectedDrawable = style.selection;
-		
+
 		cellRenderer.layout(style);
 
+		GlyphLayout textLayout = new GlyphLayout();
+
 		prefWidth = 0;
 		for (int i = 0; i < items.size; i++) {
-			TextBounds bounds = font.getBounds(cellRenderer.getCellTitle(items.get(i)));
-			prefWidth = Math.max(bounds.width, prefWidth);
-			
-			if(cellRenderer.hasSubtitle()) {
-				bounds = font.getBounds(cellRenderer.getCellSubTitle(items.get(i)));
-				prefWidth = Math.max(bounds.width, prefWidth);
-			}
+
+			textLayout.setText(font, cellRenderer.getCellTitle(items.get(i)));
+
+			prefWidth = Math.max(textLayout.width, prefWidth);
 			
-			if(cellRenderer.hasImage()) {
+			if (cellRenderer.hasImage()) {
 				TextureRegion r = cellRenderer.getCellImage(items.get(i));
-				
+
 				float ih = r.getRegionHeight();
 				float iw = r.getRegionWidth();
-						
-				if(ih > getItemHeight() - 10) {
+
+				if (ih > getItemHeight() - 10) {
 					ih = getItemHeight() - 10;
 					iw *= ih / r.getRegionHeight();
 				}
-				
-				prefWidth = Math.max(iw, prefWidth);
+
+				prefWidth = Math.max(iw + textLayout.width, prefWidth);
+			}
+
+			if (cellRenderer.hasSubtitle()) {
+				String subtitle = cellRenderer.getCellSubTitle(items.get(i));
+
+				if (subtitle != null) {
+					textLayout.setText(subfont, subtitle);
+					prefWidth = Math.max(textLayout.width, prefWidth);
+				}
 			}
 		}
 		
-		prefWidth += selectedDrawable.getLeftWidth()
-				+ selectedDrawable.getRightWidth();
-		
+		prefWidth += selectedDrawable.getLeftWidth() + selectedDrawable.getRightWidth();
+
 		prefHeight = items.size * cellRenderer.getItemHeight();
 
 		Drawable background = style.background;
 		if (background != null) {
 			prefWidth += background.getLeftWidth() + background.getRightWidth();
-			prefHeight += background.getTopHeight()
-					+ background.getBottomHeight();
+			prefHeight += background.getTopHeight() + background.getBottomHeight();
 		}
 	}
 
 	@Override
-	public void draw (Batch batch, float parentAlpha) {
+	public void draw(Batch batch, float parentAlpha) {
 		validate();
 
 		Color color = getColor();
@@ -182,18 +189,36 @@ public void draw (Batch batch, float parentAlpha) {
 		}
 
 		for (int i = 0; i < items.size; i++) {
-			if (cullingArea == null || (itemY - cellRenderer.getItemHeight() <= cullingArea.y + cullingArea.height && itemY >= cullingArea.y)) {
+			if (cullingArea == null || (itemY - cellRenderer.getItemHeight() <= cullingArea.y + cullingArea.height
+					&& itemY >= cullingArea.y)) {
 				T item = items.get(i);
 				boolean selected = selection.contains(item);
-				
-				cellRenderer.draw(batch, parentAlpha, item, selected, x, y + itemY, width, cellRenderer.getItemHeight());
-				
+
+				cellRenderer.draw(batch, parentAlpha, item, selected, x, y + itemY, width,
+						cellRenderer.getItemHeight());
+
 			} else if (itemY < cullingArea.y) {
 				break;
 			}
 			itemY -= cellRenderer.getItemHeight();
 		}
 	}
+	
+	public void sortByTitle() {
+		getItems().sort(new Comparator<T>() {
+			@Override
+			public int compare(T o1, T o2) {
+				String s1 = cellRenderer.getCellTitle(o1);
+				String s2 = cellRenderer.getCellTitle(o2);
+				
+				if(s1 == null) {
+					System.out.println("nul");
+				}
+				
+				return s1.compareTo(s2);
+			}
+		});
+	}
 
 	public ArraySelection<T> getSelection() {
 		return selection;
@@ -205,8 +230,8 @@ public T getSelected() {
 	}
 
 	/**
-	 * @return The index of the first selected item. The top item has an index of
-	 *         0. Nothing selected has an index of -1.
+	 * @return The index of the first selected item. The top item has an index
+	 *         of 0. Nothing selected has an index of -1.
 	 */
 	public int getSelectedIndex() {
 		ObjectSet<T> selected = selection.items();
@@ -216,26 +241,10 @@ public int getSelectedIndex() {
 	/** Sets the selection to only the selected index. */
 	public void setSelectedIndex(int index) {
 		if (index < -1 || index >= items.size)
-			throw new IllegalArgumentException("index must be >= -1 and < "
-					+ items.size + ": " + index);
+			throw new IllegalArgumentException("index must be >= -1 and < " + items.size + ": " + index);
 		selection.set(items.get(index));
 	}
 
-	public void setItems(T... newItems) {
-		if (newItems == null)
-			throw new IllegalArgumentException("newItems cannot be null.");
-
-		items.clear();
-		items.addAll(newItems);
-
-		if (selection.getRequired() && items.size > 0)
-			selection.set(items.first());
-		else
-			selection.clear();
-
-		invalidateHierarchy();
-	}
-
 	/**
 	 * Sets the current items, clearing the selection if it is no longer valid.
 	 * If a selection is {@link ArraySelection#getRequired()}, the first item is
@@ -299,8 +308,8 @@ static public class CustomListStyle {
 		public CustomListStyle() {
 		}
 
-		public CustomListStyle(BitmapFont font, Color fontColorSelected,
-				Color fontColorUnselected, Drawable selection) {
+		public CustomListStyle(BitmapFont font, Color fontColorSelected, Color fontColorUnselected,
+				Drawable selection) {
 			this.font = font;
 			this.fontColorSelected.set(fontColorSelected);
 			this.fontColorUnselected.set(fontColorUnselected);
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/DimPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/DimensionInputPanel.java
similarity index 72%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/DimPanel.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/DimensionInputPanel.java
index 665520021..cf5b4b823 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/DimPanel.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/DimensionInputPanel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
+package com.bladecoder.engineeditor.ui.panels;
 
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
@@ -22,19 +22,22 @@
 import com.badlogic.gdx.scenes.scene2d.ui.TextField;
 import com.bladecoder.engine.actions.Param;
 
-public class DimPanel extends Table {
-
+public class DimensionInputPanel extends InputPanel {
 	TextField width;
 	TextField height;
-
-	public DimPanel(Skin skin) {
+	Table dimPanel;
+	
+	DimensionInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		dimPanel = new Table(skin);
 		width = new TextField("", skin);
 		height = new TextField("", skin);
 
-		add(new Label(" width ", skin));
-		add(width);
-		add(new Label("  height ", skin));
-		add(height);
+		dimPanel.add(new Label(" width ", skin));
+		dimPanel.add(width);
+		dimPanel.add(new Label("  height ", skin));
+		dimPanel.add(height);
+
+		init(skin, title, desc, dimPanel, mandatory, defaultValue);
 	}
 
 	public String getText() {
@@ -57,13 +60,28 @@ public void setText(String s) {
 	}
 
 	public boolean validateField() {
+
+		String s = getText();
+		
+		if(s == null || s.trim().isEmpty()) {
+			if(isMandatory()) {
+				setError(true);
+				return false;
+			} else {
+				setError(false);
+				return true;
+			}
+		}
+		
 		try {
 			Integer.parseInt(width.getText());
 			Integer.parseInt(height.getText());
 		} catch (NumberFormatException e) {
+			setError(true);
 			return false;
 		}
 
+		setError(false);
 		return true;
 	}
 }
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditDialog.java
similarity index 78%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditDialog.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditDialog.java
index cb1950dff..7b6afc57a 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditDialog.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditDialog.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
+package com.bladecoder.engineeditor.ui.panels;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.InputListener;
 import com.badlogic.gdx.scenes.scene2d.ui.Cell;
@@ -26,7 +27,6 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
 import com.badlogic.gdx.scenes.scene2d.ui.Widget;
-import com.bladecoder.engineeditor.utils.EditorLogger;
 
 public abstract class EditDialog extends Dialog {
 
@@ -45,18 +45,22 @@ public EditDialog(String title, Skin skin) {
 		this.skin = skin;
 
 		setResizable(false);
+		setKeepWithinStage(false);
 
 		infoLbl = new Label("", skin);
 		infoLbl.setWrap(true);
 		centerPanel = new Table(skin);
-		infoCell = getContentTable().add((Widget) infoLbl).prefWidth(200);
-		getContentTable().add(new ScrollPane(centerPanel, skin))
-				.maxHeight(Gdx.graphics.getHeight() * 0.8f)
-				.maxWidth(Gdx.graphics.getWidth() * 0.7f);
-		
+		infoCell = getContentTable().add((Widget) infoLbl).prefWidth(200).height(Gdx.graphics.getHeight() * 0.5f);
+		getContentTable().add(new ScrollPane(centerPanel, skin)).maxHeight(Gdx.graphics.getHeight() * 0.8f)
+				.maxWidth(Gdx.graphics.getWidth() * 0.7f).minHeight(Gdx.graphics.getHeight() * 0.5f)
+				.minWidth(Gdx.graphics.getWidth() * 0.5f);
+
+		getContentTable().setHeight(Gdx.graphics.getHeight() * 0.7f);
+
 		centerPanel.addListener(new InputListener() {
 			@Override
-			public void enter(InputEvent event, float x, float y, int pointer,  com.badlogic.gdx.scenes.scene2d.Actor fromActor) {
+			public void enter(InputEvent event, float x, float y, int pointer,
+					com.badlogic.gdx.scenes.scene2d.Actor fromActor) {
 //				EditorLogger.debug("ENTER - X: " + x + " Y: " + y);
 				getStage().setScrollFocus(centerPanel);
 			}
@@ -64,32 +68,34 @@ public void enter(InputEvent event, float x, float y, int pointer,  com.badlogic
 
 		button("OK", true);
 		button("Cancel", false);
-		key(Keys.ENTER, true);
+		// DISABLE the enter key because conflicts when newline in TextFields
+//		key(Keys.ENTER, true);
 		key(Keys.ESCAPE, false);
 
 		padBottom(10);
 		padLeft(10);
 		padRight(10);
 	}
-	
+
 	public void addInputPanel(InputPanel i) {
 		getCenterPanel().row().fill().expandX();
 		getCenterPanel().add(i);
 	}
-	
+
 	public void setVisible(InputPanel i, boolean v) {
 		i.setVisible(v);
-		Cell<InputPanel> c = getCenterPanel().getCell(i);	
-		
-		if(v) {
+		Cell<InputPanel> c = getCenterPanel().getCell(i);
+
+		if (v) {
 			c.height(i.getPrefHeight());
 		} else {
 			c.height(1);
 		}
-		
+
 		i.invalidateHierarchy();
-	}	
+	}
 
+	@Override
 	public Skin getSkin() {
 		return skin;
 	}
@@ -102,19 +108,20 @@ public void setInfo(String text) {
 		infoLbl.setText(text);
 	}
 
-	public void setInfoWidget(Widget c) {
+	public void setInfoWidget(Actor c) {
 		infoCell.setActor(null);
 		infoCell.setActor(c).fill();
 	}
 
 	public void setTitle(String title) {
-		super.setTitle(title);
+		getTitleLabel().setText(title);
 	}
 
 	public boolean isCancel() {
 		return cancelled;
 	}
 
+	@Override
 	protected void result(Object object) {
 		if (((boolean) object) == true) {
 			if (validateFields()) {
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditList.java
similarity index 94%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditList.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditList.java
index 80cc423de..89c953bc5 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditList.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditList.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
+package com.bladecoder.engineeditor.ui.panels;
 
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
@@ -24,7 +24,6 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.badlogic.gdx.utils.Array;
-import com.bladecoder.engineeditor.utils.EditorLogger;
 
 public abstract class EditList<T> extends Table {
 	
@@ -47,13 +46,15 @@ public EditList(Skin skin) {
 		ScrollPane scrollPane = new ScrollPane(list, skin);
 		container = new Container<ScrollPane>(scrollPane);
 		container.fill();
-		container.prefHeight(100);
+		container.prefHeight(1000);
+		
+		scrollPane.setFadeScrollBars(false);
 		
 		toolbar = new EditToolbar(skin);
 //		debug();
 		add(toolbar).expandX().fillX();
-		row().fill();
-		add(container).expandY().fill();
+		row();
+		add(container).expand().fill();
 		
 		toolbar.addCreateListener(new ChangeListener() {
 
@@ -104,6 +105,8 @@ public void enter(InputEvent event, float x, float y, int pointer,  com.badlogic
 		});
     }
 	
+	
+	
 	public void setCellRenderer(CellRenderer<T> r) {
 		list.setCellRenderer(r);	
 	}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditModelDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditModelDialog.java
new file mode 100644
index 000000000..10f718404
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditModelDialog.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent;
+import com.bladecoder.engineeditor.common.EditorLogger;
+import com.bladecoder.engineeditor.common.Message;
+
+public abstract class EditModelDialog<PARENT, T> extends EditDialog {
+
+	protected T e;
+	protected PARENT parent;
+	protected InputPanel[] i;
+
+	protected ChangeListener listener;
+
+	public EditModelDialog(Skin skin) {
+		super("", skin);
+	}
+
+	protected void init(PARENT parent, T e, InputPanel[] inputs) {
+		this.e = e;
+		this.parent = parent;
+		this.i = inputs;
+
+		getCenterPanel().clear();
+
+		for (InputPanel i : inputs) {
+			addInputPanel(i);
+		}
+
+		if (e == null) {
+			setTitle("CREATE OBJECT");
+		} else {		
+			setTitle("EDITING " + e.getClass().getSimpleName());
+			
+			try{
+				modelToInputs();
+			} catch (Exception e1) {
+				EditorLogger.error(e1.getMessage(), e1);
+			}			
+		}
+
+		// TODO Set focus to the 1st element
+		// if(inputs.length > 0) {
+		// getStage().setKeyboardFocus(inputs[0].getField());
+		// }
+	}
+
+	@Override
+	protected void ok() {
+		try{
+			inputsToModel(e==null);
+		} catch (Exception e1) {
+			Message.showMsg(getStage(), "Error getting fields " + e1.getMessage(), 4);
+			EditorLogger.printStackTrace(e1);
+		}
+
+		if (listener != null)
+			listener.changed(new ChangeEvent(), this);
+	}
+
+	public void setListener(ChangeListener l) {
+		listener = l;
+	}
+
+	protected abstract void inputsToModel(boolean create);
+
+	protected abstract void modelToInputs();
+
+	public T getElement() {
+		return e;
+	}
+
+	@Override
+	protected boolean validateFields() {
+		for (InputPanel p : i) {
+			if (p.isVisible() && !p.validateField())
+				return false;
+		}
+
+		return true;
+	}
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditToolbar.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditToolbar.java
similarity index 62%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditToolbar.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditToolbar.java
index fbfe3c186..34627166a 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditToolbar.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditToolbar.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
+package com.bladecoder.engineeditor.ui.panels;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.EventListener;
@@ -22,80 +22,100 @@
 import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
 import com.badlogic.gdx.scenes.scene2d.ui.ImageButton.ImageButtonStyle;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.ui.TextTooltip;
 import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+import com.bladecoder.engine.util.DPIUtils;
 import com.bladecoder.engineeditor.Ctx;
 
 public class EditToolbar extends HorizontalGroup {
-	
-    private ImageButton createBtn;
-    private ImageButton deleteBtn;
-    private ImageButton editBtn;
-    private ImageButton copyBtn;	
-    private ImageButton pasteBtn;	
-    
-    private Skin skin;
-	
+
+	private ImageButton createBtn;
+	private ImageButton deleteBtn;
+	private ImageButton editBtn;
+	private ImageButton copyBtn;
+	private ImageButton pasteBtn;
+
+	private Skin skin;
+
 	public EditToolbar(Skin skin) {
 		super();
-		
+
 		this.skin = skin;
 		pad(0);
-		
-        createBtn = new ImageButton(skin);
-        editBtn = new ImageButton(skin);
-        deleteBtn = new ImageButton(skin);
-        copyBtn = new ImageButton(skin);
-        pasteBtn = new ImageButton(skin);
-		
-        addToolBarButton(createBtn, "ic_add","New", "Create a new Element");
-        addToolBarButton(editBtn, "ic_edit","Edit", "Edit the selected Element");
-        addToolBarButton(deleteBtn, "ic_delete","Delete", "Delete and put in the clipboard"); 
-        addToolBarButton(copyBtn, "ic_copy","Copy", "Copy to the clipboard");
-        addToolBarButton(pasteBtn, "ic_paste","Paste", "Paste from the clipboard");
-    }
-	
+
+		createBtn = new ImageButton(skin);
+		editBtn = new ImageButton(skin);
+		deleteBtn = new ImageButton(skin);
+		copyBtn = new ImageButton(skin);
+		pasteBtn = new ImageButton(skin);
+
+		addToolBarButton(createBtn, "ic_add", "New", "Create a new Element");
+		addToolBarButton(editBtn, "ic_edit", "Edit", "Edit the selected Element");
+		addToolBarButton(deleteBtn, "ic_delete", "Delete", "Delete and put in the clipboard");
+		addToolBarButton(copyBtn, "ic_copy", "Copy", "Copy to the clipboard");
+		addToolBarButton(pasteBtn, "ic_paste", "Paste", "Paste from the clipboard");
+	}
+
 	public void hideCopyPaste() {
 		copyBtn.setVisible(false);
 		pasteBtn.setVisible(false);
 	}
-    
+
 	public void disableCreate(boolean v) {
 		createBtn.setDisabled(v);
 	}
-	
+
 	public void disableEdit(boolean v) {
 		deleteBtn.setDisabled(v);
 		editBtn.setDisabled(v);
 		copyBtn.setDisabled(v);
 	}
-	
+
 	public void disablePaste(boolean v) {
 		pasteBtn.setDisabled(v);
 	}
-	
+
 	public void addToolBarButton(ImageButton button, String icon, String text, String tooltip) {
-		
+
 		TextureRegion image = Ctx.assetManager.getIcon(icon);
 		TextureRegion imageDisabled = Ctx.assetManager.getIcon(icon + "_disabled");
-		
+
 		ImageButtonStyle style = new ImageButtonStyle(skin.get("plain", ButtonStyle.class));
 		style.imageUp = new TextureRegionDrawable(image);
-		style.imageDisabled = new TextureRegionDrawable(imageDisabled);
+
+		if (imageDisabled != null)
+			style.imageDisabled = new TextureRegionDrawable(imageDisabled);
 		button.setStyle(style);
-//		button.pad(4, 2, 4, 2);
-        addActor(button);
-        button.setDisabled(true);
+		button.pad(6, 3, 6, 3);
+		addActor(button);
+		button.setDisabled(true);
+		TextTooltip t = new TextTooltip(tooltip, skin);
+		t.getContainer().pad(DPIUtils.getSpacing() / 2);
+		button.addListener(t);
+	}
+
+	public TextField addFilterBox(EventListener e) {
+		TextField tf = new TextField("", skin);
+		addActor(tf);
+
+		TextTooltip t = new TextTooltip("Filter list", skin);
+		t.getContainer().pad(DPIUtils.getSpacing() / 2);
+		tf.addListener(t);
+
+		tf.addListener(e);
+
+		return tf;
 	}
-	
-	
+
 	public void addCreateListener(EventListener e) {
 		createBtn.addListener(e);
-	}	
-	
+	}
+
 	public void addEditListener(EventListener e) {
 		editBtn.addListener(e);
 	}
-	
+
 	public void addDeleteListener(EventListener e) {
 		deleteBtn.addListener(e);
 	}
@@ -103,7 +123,7 @@ public void addDeleteListener(EventListener e) {
 	public void addCopyListener(EventListener e) {
 		copyBtn.addListener(e);
 	}
-	
+
 	public void addPasteListener(EventListener e) {
 		pasteBtn.addListener(e);
 	}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditTree.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditTree.java
similarity index 83%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditTree.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditTree.java
index 23c3aab42..541292b2f 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/EditTree.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditTree.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
+package com.bladecoder.engineeditor.ui.panels;
 
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.Container;
@@ -25,13 +25,14 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Tree.Node;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.badlogic.gdx.scenes.scene2d.utils.Selection;
+import com.badlogic.gdx.utils.Array;
 
 public abstract class EditTree extends Table {
 	
 	protected EditToolbar toolbar;
     protected Tree tree;
     protected Skin skin;
-    protected Container container;
+    protected Container<ScrollPane> container;
     
 	private ImageButton upBtn;
 	private ImageButton downBtn;
@@ -50,9 +51,9 @@ public EditTree(Skin skin) {
 		tree = new Tree(skin);
 			
 		ScrollPane scrollPane = new ScrollPane(tree, skin);
-		container = new Container(scrollPane);
+		container = new Container<ScrollPane>(scrollPane);
 		container.fill();
-		container.prefHeight(100);
+		container.prefHeight(1000);
 		
 		toolbar = new EditToolbar(skin);
 //		debug();
@@ -143,7 +144,7 @@ public void changed(ChangeEvent event, Actor actor) {
 			public void changed(ChangeEvent event, Actor actor) {				
 				Selection<Node> selection = tree.getSelection();
 
-				if (selection.size() == 0) {
+				if (selection.isEmpty()) {
 					upBtn.setDisabled(true);
 					downBtn.setDisabled(true);
 
@@ -151,14 +152,17 @@ public void changed(ChangeEvent event, Actor actor) {
 					rightBtn.setDisabled(true);
 				} else {
 
-					Node nodeSel = selection.getLastSelected();
+					Node nodeSel = selection.first();
+					
+					int level = nodeSel.getLevel();
+					Array<Node> siblings = getSiblings(); 
+					
 
-					upBtn.setDisabled(nodeSel.getParent() == null || nodeSel.getParent().getChildren().get(0) == nodeSel);
-					downBtn.setDisabled(nodeSel.getParent() == null || nodeSel.getParent().getChildren().get(
-							nodeSel.getParent().getChildren().size - 1) == nodeSel);
+					upBtn.setDisabled(siblings.get(0) == nodeSel);
+					downBtn.setDisabled(siblings.get(siblings.size - 1) == nodeSel);
 
-					leftBtn.setDisabled(nodeSel.getParent() != null);
-					rightBtn.setDisabled(nodeSel.getParent() == null || nodeSel.getParent().getChildren().get(0) == nodeSel);
+					leftBtn.setDisabled(level==1);
+					rightBtn.setDisabled(siblings.get(0) == nodeSel);
 				}
 				
 				toolbar.disableEdit(selection == null);
@@ -167,6 +171,16 @@ public void changed(ChangeEvent event, Actor actor) {
 		});
     }
 	
+	public Array<Node> getSiblings() {
+		Selection<Node> selection = tree.getSelection();
+		Node nodeSel = selection.first();
+		
+		int level = nodeSel.getLevel();
+		Array<Node> siblings = (level == 1) ? tree.getRootNodes(): nodeSel.getParent().getChildren(); 
+		
+		return siblings;
+	}
+	
 	abstract protected void create();
 	abstract protected void edit();
 	abstract protected void delete();
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditableOptionsInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditableOptionsInputPanel.java
new file mode 100644
index 000000000..511e6e85a
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditableOptionsInputPanel.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+
+public class EditableOptionsInputPanel<T> extends InputPanel implements OptionsInputPanel {
+	protected final EditableSelectBox<T> input;
+
+	EditableOptionsInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue, T[] options) {
+		input = new EditableSelectBox<>(skin);
+		init(skin, title, desc, input, mandatory, defaultValue);
+
+		if(options != null)
+			input.setItems(options);
+	}
+
+	public String getText() {
+		if(input.getSelected().isEmpty())
+			return null;
+		
+		return input.getSelected();
+	}
+
+	@Override
+	public void setText(String s) {
+		if(s == null)
+			return;
+
+		input.setSelected(s);
+	}
+
+	@Override
+	public int getSelectedIndex() {
+		return input.getSelectedIndex();
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditableSelectBox.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditableSelectBox.java
new file mode 100644
index 000000000..1ec8f51ac
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EditableSelectBox.java
@@ -0,0 +1,395 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
+
+import java.util.ArrayList;
+
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.math.Interpolation;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.InputListener;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.Touchable;
+import com.badlogic.gdx.scenes.scene2d.actions.Actions;
+import com.badlogic.gdx.scenes.scene2d.ui.List;
+import com.badlogic.gdx.scenes.scene2d.ui.List.ListStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
+import com.badlogic.gdx.scenes.scene2d.ui.SelectBox.SelectBoxStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.bladecoder.engineeditor.common.EditorLogger;
+
+public class EditableSelectBox<T> extends Table {
+	static final Vector2 temp = new Vector2();
+
+	private TextField input;
+	private TextButton showListButton;
+	private SelectList<T> selectList;
+
+	private T[] items;
+
+	private boolean disabled;
+
+	public EditableSelectBox(Skin skin) {
+		super(skin);
+
+		input = new TextField("", skin);
+		showListButton = new TextButton(">", skin);
+		selectList = new SelectList<>(skin, input);
+
+		add(input);
+		add(showListButton);
+
+		addListener(new ClickListener() {
+			@Override
+			public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
+				if (pointer == 0 && button != 0)
+					return false;
+
+				if (disabled)
+					return false;
+
+//				if (selectList.getStage() == null)
+				showList();
+
+				return true;
+			}
+
+			@Override
+			public boolean keyUp(InputEvent event, int keycode) {
+				if (keycode == Keys.ENTER) {
+					setSelectedIndex(selectList.list.getSelectedIndex());
+					hideList();
+					input.setCursorPosition(input.getText().length());
+				} else if (keycode == Keys.UP) {
+					int idx = selectList.list.getSelectedIndex();
+
+					if (idx > 0)
+						selectList.list.setSelectedIndex(idx - 1);
+
+					return true;
+				} else if (keycode == Keys.DOWN) {
+					int idx = selectList.list.getSelectedIndex();
+
+					if (idx < selectList.list.getItems().size - 1)
+						selectList.list.setSelectedIndex(idx + 1);
+
+					return true;
+				} else {
+					if (selectList.getStage() == null && selectList.list.getItems().size > 0) {
+						showList();
+					}
+
+					filterItems(input.getText());
+				}
+
+				return false;
+			}
+		});
+
+		// selectList.getList().addListener(new ChangeListener() {
+		// @Override
+		// public void changed(ChangeEvent event, Actor actor) {
+		// fire(event);
+		// }
+		// });
+
+		input.setProgrammaticChangeEvents(true);
+		input.addListener(new ChangeListener() {
+
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				fire(event);
+			}
+		});
+	}
+
+	public String getSelected() {
+		return input.getText();
+	}
+
+	public void setSelected(String str) {
+		input.setText(str);
+	}
+
+	public int getSelectedIndex() {
+		return selectList.list.getSelectedIndex();
+	}
+
+	public void setSelectedIndex(int idx) {
+		if (selectList.list.getItems().size == 0)
+			return;
+
+		input.setText(selectList.list.getItems().get(idx).toString());
+	}
+
+	public TextField getInput() {
+		return input;
+	}
+
+	public final void setItems(T[] newItems) {
+
+		items = newItems;
+
+		setListItems(items);
+	}
+
+	private final void setListItems(T[] newItems) {
+		if (newItems == null)
+			throw new IllegalArgumentException("newItems cannot be null.");
+
+		float oldPrefWidth = getPrefWidth();
+
+		selectList.list.setItems(newItems);
+		if (newItems.length > 0)
+			selectList.list.setSelectedIndex(0);
+		else
+			selectList.list.setSelectedIndex(-1);
+
+		invalidate();
+		if (oldPrefWidth != getPrefWidth())
+			invalidateHierarchy();
+	}
+
+	public void showList() {
+		if (selectList.list.getItems().size == 0)
+			return;
+
+		if (selectList.list.getSelectedIndex() >= selectList.list.getItems().size)
+			selectList.list.setSelectedIndex(selectList.list.getItems().size - 1);
+
+		selectList.show(getStage());
+	}
+
+	public void hideList() {
+		selectList.hide();
+		setListItems(items);
+	}
+
+	@SuppressWarnings("unchecked")
+	private void filterItems(String s) {
+
+		if (s == null || s.isEmpty()) {
+			setListItems(items);
+		} else {
+
+			ArrayList<T> filtered = new ArrayList<>();
+
+			String sl = s.toLowerCase();
+
+			for (T item : items) {
+				if (item.toString().toLowerCase().contains(sl))
+					filtered.add(item);
+			}
+
+			setListItems((T[]) filtered.toArray(new String[filtered.size()]));
+		}
+
+		selectList.hide();
+		selectList.invalidate();
+		showList();
+	}
+
+	protected void onShow(Actor selectBoxList, boolean below) {
+		selectBoxList.getColor().a = 0;
+		selectBoxList.addAction(fadeIn(0.3f, Interpolation.fade));
+	}
+
+	static class SelectList<T> extends ScrollPane {
+		private final TextField selectBox;
+		private int selectedIndex;
+		int maxListCount;
+		private final Vector2 screenPosition = new Vector2();
+		final List<T> list;
+		private InputListener hideListener;
+		private Actor previousScrollFocus;
+
+		public SelectList(Skin skin, final TextField inputBox) {
+			super(null, skin.get(SelectBoxStyle.class).scrollStyle);
+			this.selectBox = inputBox;
+
+			setOverscroll(false, false);
+			setFadeScrollBars(false);
+
+			ListStyle listStyle = skin.get(SelectBoxStyle.class).listStyle;
+
+			list = new List<>(listStyle);
+			list.setTouchable(Touchable.disabled);
+			setActor(list);
+
+			list.addListener(new ClickListener() {
+				@Override
+				public void clicked(InputEvent event, float x, float y) {
+					selectBox.setText(list.getSelected().toString());
+					selectedIndex = list.getSelectedIndex();
+					hide();
+				}
+
+				@Override
+				public boolean mouseMoved(InputEvent event, float x, float y) {
+					list.setSelectedIndex(
+							Math.min(list.getItems().size - 1, (int) ((list.getHeight() - y) / list.getItemHeight())));
+					return true;
+				}
+			});
+
+			addListener(new InputListener() {
+				@Override
+				public void exit(InputEvent event, float x, float y, int pointer, Actor toActor) {
+					if (toActor == null || !isAscendantOf(toActor))
+						if (selectedIndex < list.getItems().size)
+							list.setSelectedIndex(selectedIndex);
+						else
+							EditorLogger.error("EditableSelectBox:exit selectedIndex outOfBounds: " + selectedIndex);
+				}
+			});
+
+			hideListener = new InputListener() {
+				@Override
+				public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
+					Actor target = event.getTarget();
+					if (isAscendantOf(target))
+						return false;
+
+					if (selectedIndex < list.getItems().size)
+						list.setSelectedIndex(selectedIndex);
+					else
+						EditorLogger.error("EditableSelectBox:touchDown selectedIndex outOfBounds: " + selectedIndex);
+
+					hide();
+					return false;
+				}
+
+				@Override
+				public boolean keyDown(InputEvent event, int keycode) {
+					if (keycode == Keys.ESCAPE)
+						hide();
+					return false;
+				}
+			};
+		}
+
+		public void show(Stage stage) {
+			if (list.isTouchable())
+				return;
+
+			stage.removeCaptureListener(hideListener);
+			stage.addCaptureListener(hideListener);
+			stage.addActor(this);
+
+			selectBox.localToStageCoordinates(screenPosition.set(0, 0));
+
+			// Show the list above or below the select box, limited to a number
+			// of items and the available height in the stage.
+			float itemHeight = list.getItemHeight();
+			float height = itemHeight
+					* (maxListCount <= 0 ? list.getItems().size : Math.min(maxListCount, list.getItems().size));
+			Drawable scrollPaneBackground = getStyle().background;
+			if (scrollPaneBackground != null)
+				height += scrollPaneBackground.getTopHeight() + scrollPaneBackground.getBottomHeight();
+			Drawable listBackground = list.getStyle().background;
+			if (listBackground != null)
+				height += listBackground.getTopHeight() + listBackground.getBottomHeight();
+
+			float heightBelow = screenPosition.y;
+			float heightAbove = stage.getCamera().viewportHeight - screenPosition.y - selectBox.getHeight();
+			boolean below = true;
+			if (height > heightBelow) {
+				if (heightAbove > heightBelow) {
+					below = false;
+					height = Math.min(height, heightAbove);
+				} else
+					height = heightBelow;
+			}
+
+			if (below)
+				setY(screenPosition.y - height);
+			else
+				setY(screenPosition.y + selectBox.getHeight());
+			setX(screenPosition.x);
+			setSize(Math.max(getPrefWidth(), selectBox.getWidth()), height);
+
+			validate();
+			scrollTo(0, list.getHeight() - selectedIndex * itemHeight - itemHeight / 2, 0, 0, true, true);
+			updateVisualScroll();
+
+			previousScrollFocus = null;
+			Actor actor = stage.getScrollFocus();
+			if (actor != null && !actor.isDescendantOf(this))
+				previousScrollFocus = actor;
+			stage.setScrollFocus(this);
+
+			list.setTouchable(Touchable.enabled);
+			clearActions();
+			// getColor().a = 0;
+			// addAction(fadeIn(0.3f, Interpolation.fade));
+		}
+
+		public void hide() {
+			if (!list.isTouchable() || !hasParent())
+				return;
+			list.setTouchable(Touchable.disabled);
+
+			Stage stage = getStage();
+			if (stage != null) {
+				stage.removeCaptureListener(hideListener);
+				if (previousScrollFocus != null && previousScrollFocus.getStage() == null)
+					previousScrollFocus = null;
+				Actor actor = stage.getScrollFocus();
+				if (actor == null || isAscendantOf(actor))
+					stage.setScrollFocus(previousScrollFocus);
+			}
+
+			clearActions();
+			getColor().a = 1;
+			addAction(sequence(fadeOut(0.15f, Interpolation.fade), Actions.removeActor()));
+		}
+
+		@Override
+		public void draw(Batch batch, float parentAlpha) {
+			selectBox.localToStageCoordinates(temp.set(0, 0));
+			if (!temp.equals(screenPosition))
+				hide();
+			super.draw(batch, parentAlpha);
+		}
+
+		@Override
+		public void act(float delta) {
+			super.act(delta);
+			toFront();
+		}
+
+		public List<T> getList() {
+			return list;
+		}
+
+		public int getSelectedIndex() {
+			return list.getSelectedIndex();
+		}
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EnumOptionsInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EnumOptionsInputPanel.java
new file mode 100644
index 000000000..d127ceeaa
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/EnumOptionsInputPanel.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.utils.Array;
+
+public class EnumOptionsInputPanel extends InputPanel {
+	private enum Empty {
+		EMPTY;
+
+		@Override
+		public String toString() {
+			return "";
+		}
+	}
+
+	private final SelectBox<Enum<?>> input;
+
+	EnumOptionsInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue, Enum<?>[] options) {
+		input = new SelectBox<>(skin);
+
+		int l = options.length;
+		if(!mandatory) l++;
+		Enum<?>[] values = new Enum[l];
+
+		if(!mandatory) {
+			values[0] = Empty.EMPTY;
+		}
+
+		System.arraycopy(options, 0, values, mandatory ? 0 : 1, options.length);
+
+		input.setItems(values);
+
+		init(skin, title, desc, input, mandatory, defaultValue);
+	}
+
+	public String getText() {
+		final Enum<?> selected = input.getSelected();
+		return selected == Empty.EMPTY ? "" : selected.name();
+	}
+
+	public void setText(String s) {
+		if(s == null)
+			return;
+
+		if ("".equals(s) && !isMandatory()) {
+			input.setSelectedIndex(0);
+		}
+		Array<Enum<?>> items = input.getItems();
+		for (Enum<?> item : items) {
+			if (item != Empty.EMPTY && item.name().equalsIgnoreCase(s)) {
+				input.setSelected(item);
+			}
+		}
+	}
+	
+	public int getSelectedIndex() {
+    	return input.getSelectedIndex();
+    }
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/FileInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/FileInputPanel.java
new file mode 100644
index 000000000..83bd80002
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/FileInputPanel.java
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import java.io.File;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.utils.Array;
+import com.bladecoder.engineeditor.Ctx;
+import com.kotcrab.vis.ui.widget.file.FileChooser;
+import com.kotcrab.vis.ui.widget.file.FileChooser.Mode;
+import com.kotcrab.vis.ui.widget.file.FileChooser.SelectionMode;
+import com.kotcrab.vis.ui.widget.file.FileChooser.ViewMode;
+import com.kotcrab.vis.ui.widget.file.FileChooserListener;
+import com.kotcrab.vis.ui.widget.file.FileTypeFilter;
+
+public class FileInputPanel extends InputPanel {
+	public enum DialogType {
+		OPEN_FILE, SAVE_FILE, DIRECTORY
+	}
+
+	private File cd;
+	private File selected;
+	private TextButton button;
+
+	private final static String FILE_TEXT = "Select file";
+	private final static String DIR_TEXT = "Select folder";
+	private FileChooser fileChooser;
+
+	public FileInputPanel(Skin skin, String title, String desc, DialogType dialogType) {
+		this(skin, title, desc, Ctx.project.getProjectDir() != null ? Ctx.project.getProjectDir() : new File("."),
+				dialogType, true);
+	}
+
+	public FileInputPanel(Skin skin, String title, String desc, DialogType dialogType, boolean mandatory) {
+		this(skin, title, desc, Ctx.project.getProjectDir() != null ? Ctx.project.getProjectDir() : new File("."),
+				dialogType, mandatory);
+	}
+
+	public FileInputPanel(Skin skin, String title, String desc, File current, final DialogType dialogType,
+			boolean mandatory) {
+		Table t = new Table();
+		button = new TextButton(dialogType == DialogType.DIRECTORY ? DIR_TEXT : FILE_TEXT, skin, "no-toggled");
+		
+		t.add(button);
+		
+		init(skin, title, desc, t,
+				mandatory, null);
+
+		switch (dialogType) {
+		case DIRECTORY: 
+			fileChooser = new FileChooser(Mode.OPEN);
+			fileChooser.setSelectionMode(SelectionMode.DIRECTORIES);
+			break;
+		case OPEN_FILE:
+			fileChooser = new FileChooser(Mode.OPEN);
+			fileChooser.setSelectionMode(SelectionMode.FILES);
+			break;
+		case SAVE_FILE:
+			fileChooser = new FileChooser(Mode.SAVE);
+			fileChooser.setSelectionMode(SelectionMode.FILES);
+			break;
+		default:
+			break;
+		}
+		
+		fileChooser.setSize(Gdx.graphics.getWidth() * 0.7f, Gdx.graphics.getHeight() * 0.7f);
+		fileChooser.setViewMode(ViewMode.LIST);
+
+		button.addListener(new ClickListener() {
+			public void clicked(InputEvent event, float x, float y) {
+				if(cd != null)
+					fileChooser.setDirectory(cd);
+					
+				getStage().addActor(fileChooser);
+
+				fileChooser.setListener(new FileChooserListener() {
+
+					@Override
+					public void selected(Array<FileHandle> files) {
+						selected = files.get(0).file();
+
+						button.setText(selected.getAbsolutePath());
+					}
+
+					@Override
+					public void canceled() {
+					}
+				});
+			}
+		});
+		
+		// Adds clear button if not mandatory
+		if(!mandatory) {
+			TextButton clearButton = new TextButton("Clear", skin, "no-toggled");
+			
+			clearButton.addListener(new ClickListener() {
+				public void clicked(InputEvent event, float x, float y) {
+					button.setText(dialogType == DialogType.DIRECTORY ? DIR_TEXT : FILE_TEXT);
+					selected = null;
+				}
+			});
+			
+			t.add(clearButton);
+		}
+	}
+
+	public File getFile() {
+		return selected;
+	}
+
+	@Override
+	public String getText() {
+		if (selected != null)
+			return selected.getAbsolutePath();
+		else
+			return "";
+	}
+
+	@Override
+	public void setText(String text) {
+		button.setText(text);
+		selected = new File(text);
+		cd = new File(text);
+	}
+	
+	public void setFileTypeFilter(FileTypeFilter ftf) {
+		fileChooser.setFileTypeFilter(ftf);
+	}
+
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/FilteredSelectBox.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/FilteredSelectBox.java
new file mode 100644
index 000000000..e8d45dea0
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/FilteredSelectBox.java
@@ -0,0 +1,705 @@
+package com.bladecoder.engineeditor.ui.panels;
+
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.removeActor;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
+
+import java.util.ArrayList;
+
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.math.Interpolation;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.InputListener;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.Touchable;
+import com.badlogic.gdx.scenes.scene2d.ui.List;
+import com.badlogic.gdx.scenes.scene2d.ui.List.ListStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane.ScrollPaneStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField.TextFieldStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.Widget;
+import com.badlogic.gdx.scenes.scene2d.utils.ArraySelection;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener.ChangeEvent;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Disableable;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.ObjectSet;
+import com.badlogic.gdx.utils.Pool;
+import com.badlogic.gdx.utils.Pools;
+
+/**
+ * A select box (aka a drop-down list) allows a user to choose one of a number
+ * of values from a list. When inactive, the selected value is displayed. When
+ * activated, it shows the list of values that may be selected.
+ * <p>
+ * {@link ChangeEvent} is fired when the selectbox selection changes.
+ * <p>
+ * The preferred size of the select box is determined by the maximum text bounds
+ * of the items and the size of the {@link FilteredSelectBoxStyle#background}.
+ * 
+ * @author mzechner
+ * @author Nathan Sweet
+ * @author Rafael García
+ */
+public class FilteredSelectBox<T> extends Widget implements Disableable {
+
+	static final Vector2 temp = new Vector2();
+
+	FilteredSelectBoxStyle style;
+	final Array<T> items = new Array<>();
+	final ArraySelection<T> selection = new ArraySelection<>(items);
+	SelectBoxList<T> selectBoxList;
+	private float prefWidth, prefHeight;
+	private ClickListener clickListener;
+	boolean disabled;
+	private int alignment = Align.left;
+
+	public FilteredSelectBox(Skin skin) {
+		this(skin.get(FilteredSelectBoxStyle.class));
+	}
+
+	public FilteredSelectBox(Skin skin, String styleName) {
+		this(skin.get(styleName, FilteredSelectBoxStyle.class));
+	}
+
+	public FilteredSelectBox(FilteredSelectBoxStyle style) {
+		setStyle(style);
+		setSize(getPrefWidth(), getPrefHeight());
+
+		selection.setActor(this);
+		selection.setRequired(true);
+
+		selectBoxList = new SelectBoxList<>(this);
+
+		addListener(clickListener = new ClickListener() {
+			@Override
+			public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
+				if (pointer == 0 && button != 0)
+					return false;
+				if (disabled)
+					return false;
+				if (selectBoxList.hasParent())
+					hideList();
+				else
+					showList();
+				return true;
+			}
+		});
+
+	}
+
+	/**
+	 * Set the max number of items to display when the select box is opened. Set to
+	 * 0 (the default) to display as many as fit in the stage height.
+	 */
+	public void setMaxListCount(int maxListCount) {
+		selectBoxList.maxListCount = maxListCount;
+	}
+
+	/**
+	 * @return Max number of items to display when the box is opened, or <= 0 to
+	 *         display them all.
+	 */
+	public int getMaxListCount() {
+		return selectBoxList.maxListCount;
+	}
+
+	@Override
+	protected void setStage(Stage stage) {
+		if (stage == null)
+			selectBoxList.hide();
+		super.setStage(stage);
+	}
+
+	public void setStyle(FilteredSelectBoxStyle style) {
+		if (style == null)
+			throw new IllegalArgumentException("style cannot be null.");
+		this.style = style;
+		if (selectBoxList != null) {
+			selectBoxList.setStyle(style.scrollStyle);
+			selectBoxList.list.setStyle(style.listStyle);
+		}
+		invalidateHierarchy();
+	}
+
+	/**
+	 * Returns the select box's style. Modifying the returned style may not have an
+	 * effect until {@link #setStyle(FilteredSelectBoxStyle)} is called.
+	 */
+	public FilteredSelectBoxStyle getStyle() {
+		return style;
+	}
+
+	/**
+	 * Set the backing Array that makes up the choices available in the SelectBox
+	 */
+	@SuppressWarnings("unchecked")
+	public void setItems(T... newItems) {
+		if (newItems == null)
+			throw new IllegalArgumentException("newItems cannot be null.");
+		float oldPrefWidth = getPrefWidth();
+
+		items.clear();
+		items.addAll(newItems);
+		selection.validate();
+		selectBoxList.list.setItems(items);
+
+		invalidate();
+		if (oldPrefWidth != getPrefWidth())
+			invalidateHierarchy();
+	}
+
+	/** Sets the items visible in the select box. */
+	public void setItems(Array<T> newItems) {
+		if (newItems == null)
+			throw new IllegalArgumentException("newItems cannot be null.");
+		float oldPrefWidth = getPrefWidth();
+
+		items.clear();
+		items.addAll(newItems);
+		selection.validate();
+		selectBoxList.list.setItems(items);
+
+		invalidate();
+		if (oldPrefWidth != getPrefWidth())
+			invalidateHierarchy();
+	}
+
+	public void clearItems() {
+		if (items.size == 0)
+			return;
+		items.clear();
+		selection.clear();
+		invalidateHierarchy();
+	}
+
+	/**
+	 * Returns the internal items array. If modified, {@link #setItems(Array)} must
+	 * be called to reflect the changes.
+	 */
+	public Array<T> getItems() {
+		return items;
+	}
+
+	@Override
+	public void layout() {
+		Drawable bg = style.background;
+		BitmapFont font = style.font;
+
+		if (bg != null) {
+			prefHeight = Math.max(
+					bg.getTopHeight() + bg.getBottomHeight() + font.getCapHeight() - font.getDescent() * 2,
+					bg.getMinHeight());
+		} else
+			prefHeight = font.getCapHeight() - font.getDescent() * 2;
+
+		float maxItemWidth = 0;
+		Pool<GlyphLayout> layoutPool = Pools.get(GlyphLayout.class);
+		GlyphLayout layout = layoutPool.obtain();
+		for (int i = 0; i < items.size; i++) {
+			layout.setText(font, toString(items.get(i)));
+			maxItemWidth = Math.max(layout.width, maxItemWidth);
+		}
+		layoutPool.free(layout);
+
+		prefWidth = maxItemWidth;
+		if (bg != null)
+			prefWidth += bg.getLeftWidth() + bg.getRightWidth();
+
+		ListStyle listStyle = style.listStyle;
+		ScrollPaneStyle scrollStyle = style.scrollStyle;
+		float listWidth = maxItemWidth + listStyle.selection.getLeftWidth() + listStyle.selection.getRightWidth();
+		if (scrollStyle.background != null)
+			listWidth += scrollStyle.background.getLeftWidth() + scrollStyle.background.getRightWidth();
+		if (selectBoxList == null || !selectBoxList.isScrollingDisabledY())
+			listWidth += Math.max(style.scrollStyle.vScroll != null ? style.scrollStyle.vScroll.getMinWidth() : 0,
+					style.scrollStyle.vScrollKnob != null ? style.scrollStyle.vScrollKnob.getMinWidth() : 0);
+		prefWidth = Math.max(prefWidth, listWidth);
+	}
+
+	@Override
+	public void draw(Batch batch, float parentAlpha) {
+		validate();
+
+		Drawable background;
+		if (disabled && style.backgroundDisabled != null)
+			background = style.backgroundDisabled;
+		else if (selectBoxList.hasParent() && style.backgroundOpen != null)
+			background = style.backgroundOpen;
+		else if (clickListener.isOver() && style.backgroundOver != null)
+			background = style.backgroundOver;
+		else if (style.background != null)
+			background = style.background;
+		else
+			background = null;
+		BitmapFont font = style.font;
+		Color fontColor = (disabled && style.disabledFontColor != null) ? style.disabledFontColor : style.fontColor;
+
+		Color color = getColor();
+		float x = getX(), y = getY();
+		float width = getWidth(), height = getHeight();
+
+		batch.setColor(color.r, color.g, color.b, color.a * parentAlpha);
+		if (background != null)
+			background.draw(batch, x, y, width, height);
+
+		T selected = selection.first();
+		if (selected != null) {
+			if (background != null) {
+				width -= background.getLeftWidth() + background.getRightWidth();
+				height -= background.getBottomHeight() + background.getTopHeight();
+				x += background.getLeftWidth();
+				y += (int) (height / 2 + background.getBottomHeight() + font.getData().capHeight / 2);
+			} else {
+				y += (int) (height / 2 + font.getData().capHeight / 2);
+			}
+			font.setColor(fontColor.r, fontColor.g, fontColor.b, fontColor.a * parentAlpha);
+			drawItem(batch, font, selected, x, y, width);
+		}
+	}
+
+	protected GlyphLayout drawItem(Batch batch, BitmapFont font, T item, float x, float y, float width) {
+		String string = toString(item);
+		return font.draw(batch, string, x, y, 0, string.length(), width, alignment, false, "...");
+	}
+
+	/**
+	 * Sets the alignment of the selected item in the select box. See
+	 * {@link #getList()} and {@link List#setAlignment(int)} to set the alignment in
+	 * the list shown when the select box is open.
+	 * 
+	 * @param alignment See {@link Align}.
+	 */
+	public void setAlignment(int alignment) {
+		this.alignment = alignment;
+	}
+
+	/**
+	 * Get the set of selected items, useful when multiple items are selected
+	 * 
+	 * @return a Selection object containing the selected elements
+	 */
+	public ArraySelection<T> getSelection() {
+		return selection;
+	}
+
+	/**
+	 * Returns the first selected item, or null. For multiple selections use
+	 * {@link SelectBox#getSelection()}.
+	 */
+	public T getSelected() {
+		return selection.first();
+	}
+
+	/**
+	 * Sets the selection to only the passed item, if it is a possible choice, else
+	 * selects the first item.
+	 */
+	public void setSelected(T item) {
+//			T item = (T)i;
+		if (items.contains(item, false))
+			selection.set(item);
+		else if (items.size > 0)
+			selection.set(items.first());
+		else
+			selection.clear();
+	}
+
+	/**
+	 * @return The index of the first selected item. The top item has an index of 0.
+	 *         Nothing selected has an index of -1.
+	 */
+	public int getSelectedIndex() {
+		ObjectSet<T> selected = selection.items();
+		return selected.size == 0 ? -1 : items.indexOf(selected.first(), false);
+	}
+
+	/** Sets the selection to only the selected index. */
+	public void setSelectedIndex(int index) {
+		selection.set(items.get(index));
+	}
+
+	@Override
+	public void setDisabled(boolean disabled) {
+		if (disabled && !this.disabled)
+			hideList();
+		this.disabled = disabled;
+	}
+
+	@Override
+	public boolean isDisabled() {
+		return disabled;
+	}
+
+	@Override
+	public float getPrefWidth() {
+		validate();
+		return prefWidth;
+	}
+
+	@Override
+	public float getPrefHeight() {
+		validate();
+		return prefHeight;
+	}
+
+	protected String toString(T item) {
+		return item.toString();
+	}
+
+	public void showList() {
+		if (items.size == 0)
+			return;
+		selectBoxList.show(getStage());
+	}
+
+	public void hideList() {
+		selectBoxList.hide();
+	}
+
+	/** Returns the list shown when the select box is open. */
+	public List<T> getList() {
+		return selectBoxList.list;
+	}
+
+	/** Disables scrolling of the list shown when the select box is open. */
+	public void setScrollingDisabled(boolean y) {
+		selectBoxList.setScrollingDisabled(true, y);
+		invalidateHierarchy();
+	}
+
+	/**
+	 * Returns the scroll pane containing the list that is shown when the select box
+	 * is open.
+	 */
+	public ScrollPane getScrollPane() {
+		return selectBoxList;
+	}
+
+	protected void onShow(Actor selectBoxList, boolean below) {
+		selectBoxList.getColor().a = 0;
+		selectBoxList.addAction(fadeIn(0.3f, Interpolation.fade));
+	}
+
+	protected void onHide(Actor selectBoxList) {
+		selectBoxList.getColor().a = 1;
+		selectBoxList.addAction(sequence(fadeOut(0.15f, Interpolation.fade), removeActor()));
+	}
+
+	/** @author Nathan Sweet */
+	final class SelectBoxList<T2> extends ScrollPane {
+		private final FilteredSelectBox<T> selectBox;
+		int maxListCount;
+		private final Vector2 screenPosition = new Vector2();
+		final List<T> list;
+		private InputListener hideListener;
+		private Actor previousScrollFocus;
+		private TextField filterField;
+
+		public SelectBoxList(final FilteredSelectBox<T> selectBox) {
+			super(null, selectBox.style.scrollStyle);
+			this.selectBox = selectBox;
+
+			setOverscroll(false, false);
+			setFadeScrollBars(false);
+			setScrollingDisabled(true, false);
+
+			list = new List<T>(selectBox.style.listStyle) {
+				@Override
+				public String toString(T obj) {
+					return selectBox.toString(obj);
+				}
+			};
+
+			list.setTouchable(Touchable.disabled);
+			setActor(list);
+
+			filterField = new TextField("", selectBox.style.textFieldStyle);
+
+			list.addListener(new ClickListener() {
+				@Override
+				public void clicked(InputEvent event, float x, float y) {
+					selectBox.selection.choose(list.getSelected());
+					hide();
+				}
+
+				@Override
+				public boolean mouseMoved(InputEvent event, float x, float y) {
+					list.setSelectedIndex(
+							Math.min(list.getItems().size - 1, (int) ((list.getHeight() - y) / list.getItemHeight())));
+					return true;
+				}
+			});
+
+			addListener(new InputListener() {
+				@Override
+				public void exit(InputEvent event, float x, float y, int pointer, Actor toActor) {
+					if (toActor == null || !isAscendantOf(toActor))
+						list.getSelection().set(selectBox.getSelected());
+				}
+			});
+
+			hideListener = new InputListener() {
+				@Override
+				public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
+					Actor target = event.getTarget();
+					if (isAscendantOf(target))
+						return false;
+					list.getSelection().set(selectBox.getSelected());
+					hide();
+					return false;
+				}
+
+				@Override
+				public boolean keyDown(InputEvent event, int keycode) {
+					if (keycode == Keys.ESCAPE)
+						hide();
+					return false;
+				}
+			};
+
+			filterField.addListener(new InputListener() {
+				@Override
+				public boolean keyUp(InputEvent event, int keycode) {
+					if (keycode == Keys.ENTER) {
+						setSelected(list.getSelected());
+						hideList();
+						filterField.setCursorPosition(filterField.getText().length());
+					} else if (keycode == Keys.UP) {
+						int idx = list.getSelectedIndex();
+
+						if (idx > 0)
+							list.setSelectedIndex(idx - 1);
+
+						return true;
+					} else if (keycode == Keys.DOWN) {
+						int idx = list.getSelectedIndex();
+
+						if (idx < list.getItems().size - 1)
+							list.setSelectedIndex(idx + 1);
+
+						return true;
+					} else {
+						if (getStage() == null && list.getItems().size > 0) {
+							showList();
+						}
+
+						filterItems(filterField.getText());
+					}
+
+					return false;
+				}
+			});
+		}
+
+		@SuppressWarnings("unchecked")
+		private void filterItems(String s) {
+
+			if (s == null || s.isEmpty()) {
+				setListItems(items.toArray());
+			} else {
+
+				ArrayList<T> filtered = new ArrayList<>();
+
+				String sl = s.toLowerCase();
+
+				for (T item : items.toArray()) {
+					if (item.toString().toLowerCase().contains(sl))
+						filtered.add(item);
+				}
+
+				setListItems((T[]) filtered.toArray(new String[filtered.size()]));
+			}
+
+//				hideList();
+			invalidate();
+//				showList();
+		}
+
+		private final void setListItems(T[] newItems) {
+			if (newItems == null)
+				throw new IllegalArgumentException("newItems cannot be null.");
+
+			float oldPrefWidth = getPrefWidth();
+
+			list.setItems(newItems);
+			if (newItems.length > 0)
+				list.setSelectedIndex(0);
+			else
+				list.setSelectedIndex(-1);
+
+			invalidate();
+			if (oldPrefWidth != getPrefWidth())
+				invalidateHierarchy();
+		}
+
+		public void show(Stage stage) {
+			if (list.isTouchable())
+				return;
+
+			stage.removeCaptureListener(hideListener);
+			stage.addCaptureListener(hideListener);
+			stage.addActor(this);
+			stage.addActor(filterField);
+
+			selectBox.localToStageCoordinates(screenPosition.set(0, 0));
+
+			// Show the list above or below the select box, limited to a number of items and
+			// the available height in the stage.
+			float itemHeight = list.getItemHeight();
+			float height = itemHeight
+					* (maxListCount <= 0 ? selectBox.items.size : Math.min(maxListCount, selectBox.items.size));
+			Drawable scrollPaneBackground = getStyle().background;
+			if (scrollPaneBackground != null)
+				height += scrollPaneBackground.getTopHeight() + scrollPaneBackground.getBottomHeight();
+			Drawable listBackground = list.getStyle().background;
+			if (listBackground != null)
+				height += listBackground.getTopHeight() + listBackground.getBottomHeight();
+
+			float heightBelow = screenPosition.y - itemHeight;
+			float heightAbove = stage.getCamera().viewportHeight - screenPosition.y - selectBox.getHeight();
+			boolean below = true;
+			if (height > heightBelow) {
+				if (heightAbove > heightBelow) {
+					below = false;
+					height = Math.min(height, heightAbove);
+				} else
+					height = heightBelow;
+			}
+
+			if (below)
+				setY(screenPosition.y - height);
+			else
+				setY(screenPosition.y + selectBox.getHeight());
+			setX(screenPosition.x);
+			setHeight(height);
+			validate();
+			float width = Math.max(getPrefWidth(), selectBox.getWidth());
+			if (getPrefHeight() > height && !isScrollingDisabledY())
+				width += getScrollBarWidth();
+			setWidth(width);
+
+			filterField.setX(getX());
+			filterField.setWidth(getWidth());
+			filterField.setHeight(filterField.getPrefHeight());
+			filterField.setY(getY() + getHeight() - filterField.getHeight());
+			stage.setKeyboardFocus(filterField);
+			filterField.validate();
+			setY(getY() - filterField.getHeight());
+
+			validate();
+			scrollTo(0, list.getHeight() - selectBox.getSelectedIndex() * itemHeight - itemHeight / 2, 0, 0, true,
+					true);
+			updateVisualScroll();
+
+			previousScrollFocus = null;
+			Actor actor = stage.getScrollFocus();
+			if (actor != null && !actor.isDescendantOf(this))
+				previousScrollFocus = actor;
+			stage.setScrollFocus(this);
+
+			list.getSelection().set(selectBox.getSelected());
+			list.setTouchable(Touchable.enabled);
+			clearActions();
+			selectBox.onShow(this, below);
+
+			filterField.setText("");
+			setListItems(items.toArray());
+		}
+
+		public void hide() {
+			if (!list.isTouchable() || !hasParent())
+				return;
+			list.setTouchable(Touchable.disabled);
+
+			Stage stage = getStage();
+			if (stage != null) {
+				stage.removeCaptureListener(hideListener);
+				if (previousScrollFocus != null && previousScrollFocus.getStage() == null)
+					previousScrollFocus = null;
+				Actor actor = stage.getScrollFocus();
+				if (actor == null || isAscendantOf(actor))
+					stage.setScrollFocus(previousScrollFocus);
+			}
+
+			clearActions();
+			selectBox.onHide(this);
+			filterField.remove();
+		}
+
+		@Override
+		public void draw(Batch batch, float parentAlpha) {
+			selectBox.localToStageCoordinates(temp.set(0, 0));
+			if (!temp.equals(screenPosition))
+				hide();
+			super.draw(batch, parentAlpha);
+		}
+
+		@Override
+		public void act(float delta) {
+			super.act(delta);
+			toFront();
+			filterField.toFront();
+		}
+	}
+
+	/**
+	 * The style for a select box, see {@link SelectBox}.
+	 * 
+	 * @author mzechner
+	 * @author Nathan Sweet
+	 */
+	static public class FilteredSelectBoxStyle {
+		public BitmapFont font;
+		public Color fontColor = new Color(1, 1, 1, 1);
+		/** Optional. */
+		public Color disabledFontColor;
+		/** Optional. */
+		public Drawable background;
+		public ScrollPaneStyle scrollStyle;
+		public ListStyle listStyle;
+		public TextFieldStyle textFieldStyle;
+		/** Optional. */
+		public Drawable backgroundOver, backgroundOpen, backgroundDisabled;
+
+		public FilteredSelectBoxStyle() {
+		}
+
+		public FilteredSelectBoxStyle(BitmapFont font, Color fontColor, Drawable background,
+				ScrollPaneStyle scrollStyle, ListStyle listStyle, TextFieldStyle textFieldStyle) {
+			this.font = font;
+			this.fontColor.set(fontColor);
+			this.background = background;
+			this.scrollStyle = scrollStyle;
+			this.listStyle = listStyle;
+			this.textFieldStyle = textFieldStyle;
+		}
+
+		public FilteredSelectBoxStyle(FilteredSelectBoxStyle style) {
+			this.font = style.font;
+			this.fontColor.set(style.fontColor);
+			if (style.disabledFontColor != null)
+				this.disabledFontColor = new Color(style.disabledFontColor);
+			this.background = style.background;
+			this.backgroundOver = style.backgroundOver;
+			this.backgroundOpen = style.backgroundOpen;
+			this.backgroundDisabled = style.backgroundDisabled;
+			this.scrollStyle = new ScrollPaneStyle(style.scrollStyle);
+			this.listStyle = new ListStyle(style.listStyle);
+			this.textFieldStyle = new TextFieldStyle(style.textFieldStyle);
+		}
+	}
+
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditDialogDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/FloatInputPanel.java
similarity index 51%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditDialogDialog.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/FloatInputPanel.java
index 24f9c28f9..efb856d60 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/EditDialogDialog.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/FloatInputPanel.java
@@ -13,32 +13,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui;
-
-import org.w3c.dom.Element;
+package com.bladecoder.engineeditor.ui.panels;
 
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
-import com.bladecoder.engineeditor.model.BaseDocument;
-import com.bladecoder.engineeditor.ui.components.EditElementDialog;
-import com.bladecoder.engineeditor.ui.components.InputPanel;
 
-public class EditDialogDialog extends EditElementDialog {
-	public static final String INFO = "Actors can have several dialogs defined. Dialogs have a tree of options to choose";
+public class FloatInputPanel extends StringInputPanel {
 	
-	private InputPanel[] inputs; 
-
-	String attrs[] = { "id"};	
-
-	public EditDialogDialog(Skin skin,  BaseDocument doc, Element parent, Element e) {
-		super(skin);
+	FloatInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		super(skin, title, desc, mandatory, defaultValue);
+	}
+	
+	@Override
+	public boolean validateField() {
+		String s = getText();
 		
-		inputs = new InputPanel[1];
+		if(s == null || s.trim().isEmpty()) {
+			if(isMandatory()) {
+				setError(true);
+				return false;
+			} else {
+				setError(false);
+				return true;
+			}
+		}
 		
-		inputs[0] = new InputPanel(skin, "Dialog ID",
-				"Select the dialog id to create.", true);
-
-		setInfo(INFO);
+		try {
+			Float.parseFloat(s);
+		} catch (NumberFormatException e) {
+			setError(true);
+			return false;
+		}
 
-		init(inputs, attrs, doc, parent, "dialog", e);
+		setError(false);
+		return true;
 	}
 }
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/HeaderPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/HeaderPanel.java
similarity index 82%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/HeaderPanel.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/HeaderPanel.java
index e5ebbc32f..c66625d57 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/HeaderPanel.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/HeaderPanel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
+package com.bladecoder.engineeditor.ui.panels;
 
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
@@ -23,9 +23,9 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.utils.Align;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.Scaling;
 import com.bladecoder.engineeditor.Ctx;
 
@@ -37,6 +37,7 @@ public class HeaderPanel extends Table {
 	private Image collapseImg;
 	private Cell<Actor> contentCell;
 
+	@SuppressWarnings("unchecked")
 	public HeaderPanel(Skin skin, String title) {
 		titleLbl = new Label(title, skin);
 		north = new HorizontalGroup();
@@ -53,16 +54,18 @@ public HeaderPanel(Skin skin, String title) {
 		north.addActor(titleLbl);
 		north.align(Align.left);
 		north.fill();
+		north.wrap(true);
+		north.rowAlign(Align.left);
 		add(north).expandX().fillX();
 		row();
 		Image image = new Image(skin.getDrawable("white_pixel"));
-		image.setColor(skin.getColor("holo-blue"));
+		image.setColor(skin.getColor("separator-color"));
 		add(image).height(2).padBottom(4f).expandX().fill();
 		row().top().left();
 		contentCell = add().expand().fill();
 		
 
-		if (collapsable)
+		if (collapsable) {
 			titleLbl.addListener(new ClickListener() {
 				@Override
 				public void clicked(InputEvent event, float x, float y) {
@@ -70,6 +73,17 @@ public void clicked(InputEvent event, float x, float y) {
 					invalidateHierarchy();
 				}
 			});
+			
+			collapseImg.addListener(new ClickListener() {
+				@Override
+				public void clicked(InputEvent event, float x, float y) {
+					toggleCollapse();
+					invalidateHierarchy();
+				}
+			});
+		}
+		
+//		setDebug(true);
 	}
 
 	public void setTile(String title) {
@@ -77,8 +91,7 @@ public void setTile(String title) {
 	}
 
 	public void setContent(Actor center) {
-		removeActor(this.content);
-		
+		this.contentCell.clearActor();
 		this.content = center;
 		this.contentCell.setActor(center);
 		
@@ -98,12 +111,15 @@ public void setCollapsable(boolean c) {
 	public void toggleCollapse() {
 		if (collapsable) {
 			if (contentCell.getActor() != null) {
-				removeActor(this.content);
+//			if (this.content.isVisible()) {
+//				this.content.setVisible(false);
+				this.contentCell.clearActor();
 				invalidateHierarchy();
 
 				collapseImg.setDrawable(new TextureRegionDrawable(Ctx.assetManager.getIcon("ic_closed")));
 			} else {
-				this.contentCell.setActor(content);				
+				this.contentCell.setActor(content);	
+//				this.content.setVisible(true);				
 				invalidateHierarchy();
 
 				collapseImg.setDrawable(new TextureRegionDrawable(Ctx.assetManager.getIcon("ic_open")));
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanel.java
new file mode 100644
index 000000000..31dd717b1
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanel.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextTooltip;
+import com.bladecoder.engine.util.DPIUtils;
+
+public abstract class InputPanel extends Table {
+	private static final boolean USE_TOOLTIPS = true;
+
+	protected Actor field;
+	private Label title;
+	private Label desc;
+	private boolean mandatory = false;
+
+	InputPanel() {
+	}
+
+	protected void init(Skin skin, String title, String desc, Actor c, boolean mandatory, String defaultValue) {
+		// debug();
+
+		this.mandatory = mandatory;
+
+		this.setSkin(skin);
+		LabelStyle style = new LabelStyle(skin.get(LabelStyle.class));
+		this.title = new Label(title, style);
+
+		this.desc = new Label(desc, skin, "subtitle");
+		this.desc.setWrap(false);
+
+		this.field = c;
+
+		// row().expand();
+		float titleWidth = this.title.getStyle().font.getSpaceXadvance() * 35;
+		add(this.title).width(titleWidth).left().top();
+		this.title.setWidth(titleWidth);
+		this.title.setWrap(true);
+		// row().expand();
+		add(field).expandX().left().top();
+
+		if (USE_TOOLTIPS) {
+			TextTooltip t = new TextTooltip(desc, skin);
+			t.getContainer().pad(DPIUtils.getSpacing() / 2);
+			this.title.addListener(t);
+			this.field.addListener(t);
+		} else {
+			row().expand();
+			add(this.desc).colspan(2).left();
+		}
+
+		if (defaultValue != null)
+			setText(defaultValue);
+	}
+
+	public void setMandatory(boolean value) {
+		mandatory = value;
+	}
+
+	public boolean isMandatory() {
+		return mandatory;
+	}
+
+	public void setError(boolean value) {
+		if (value)
+			title.getStyle().fontColor = Color.RED;
+		else
+			title.getStyle().fontColor = Color.WHITE;
+	}
+
+	public abstract String getText();
+
+	public abstract void setText(String text);
+
+	public String getTitle() {
+		return title.getText().toString();
+	}
+
+	public Actor getField() {
+		return field;
+	}
+
+	public boolean validateField() {
+
+		String s = getText();
+
+		if (mandatory) {
+			if (s == null || s.trim().isEmpty()) {
+				setError(true);
+				return false;
+			}
+		}
+
+		setError(false);
+		return true;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanelFactory.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanelFactory.java
new file mode 100644
index 000000000..47fa7481b
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/InputPanelFactory.java
@@ -0,0 +1,228 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+public class InputPanelFactory extends Table {
+	public static InputPanel createInputPanel(Skin skin, String title, String desc, String[] options,
+			boolean mandatory) {
+		return createInputPanel(skin, title, desc, Type.OPTION, mandatory, null, options);
+	}
+
+	public static InputPanel createInputPanel(Skin skin, String title, String desc, Enum<?>[] options,
+			boolean mandatory) {
+		return createInputPanel(skin, title, desc, Type.OPTION, mandatory, null, options);
+	}
+
+	public static InputPanel createInputPanel(Skin skin, String title, String desc) {
+		return createInputPanel(skin, title, desc, Type.STRING, false, null);
+	}
+
+	public static InputPanel createInputPanel(Skin skin, String title, String desc, boolean mandatory) {
+		return createInputPanel(skin, title, desc, Type.STRING, mandatory, null);
+	}
+
+	public static InputPanel createInputPanel(Skin skin, String title, String desc, boolean mandatory,
+			String defaultValue) {
+		return createInputPanel(skin, title, desc, Type.STRING, mandatory, defaultValue);
+	}
+
+	public static InputPanel createInputPanel(Skin skin, String title, String desc, Param.Type type,
+			boolean mandatory) {
+		return createInputPanel(skin, title, desc, type, mandatory, null, (String[]) null);
+	}
+
+	public static InputPanel createInputPanel(Skin skin, String title, String desc, Param.Type type, boolean mandatory,
+			String defaultValue) {
+		return createInputPanel(skin, title, desc, type, mandatory, defaultValue, (String[]) null);
+	}
+
+	public static InputPanel createInputPanel(Skin skin, String title, String desc, Param.Type type, boolean mandatory,
+			String defaultValue, Enum<?>[] options) {
+		return createInputPanel(skin, title, desc, type, mandatory, defaultValue, (Object[]) options);
+	}
+
+	public static InputPanel createInputPanel(Skin skin, String title, String desc, Param.Type type, boolean mandatory,
+			String defaultValue, String[] options) {
+		return createInputPanel(skin, title, desc, type, mandatory, defaultValue, (Object[]) options);
+	}
+
+	private static InputPanel createInputPanel(Skin skin, String title, String desc, Param.Type type, boolean mandatory,
+			String defaultValue, Object[] options) {
+		switch (type) {
+		case ACTOR:
+		case CHARACTER_ACTOR:
+		case INTERACTIVE_ACTOR:
+		case SPRITE_ACTOR:
+		case WALKZONE_ACTOR:
+			return new ActorInputPanel(skin, title, desc, mandatory, defaultValue, type);
+		case LAYER:
+			return new LayerInputPanel(skin, title, desc, mandatory, defaultValue);
+		case BOOLEAN:
+			return new BooleanInputPanel(skin, title, desc, mandatory, defaultValue);
+		case CHAPTER:
+			return new ChapterInputPanel(skin, title, desc, mandatory, defaultValue);
+		case DIMENSION:
+			return new DimensionInputPanel(skin, title, desc, mandatory, defaultValue);
+		case FLOAT:
+			return new FloatInputPanel(skin, title, desc, mandatory, defaultValue);
+		case INTEGER:
+			return new IntegerInputPanel(skin, title, desc, mandatory, defaultValue);
+		case SCENE:
+			return new SceneInputPanel(skin, title, desc, mandatory, defaultValue);
+		case COLOR:
+			return new ColorInputPanel(skin, title, desc, mandatory, defaultValue);
+		case SOUND:
+			return new SoundInputPanel(skin, title, desc, mandatory, defaultValue);
+		case VOICE:
+		case TEXT_STYLE:
+		case STRING:
+			if (options != null)
+				return getReadOnlyOptionsInputPanel(skin, title, desc, mandatory, defaultValue, options);
+
+			return new StringInputPanel(skin, title, desc, mandatory, defaultValue);
+		case VECTOR2:
+			return new Vector2InputPanel(skin, title, desc, mandatory, defaultValue);
+		case OPTION:
+			return getReadOnlyOptionsInputPanel(skin, title, desc, mandatory, defaultValue, options);
+		case EDITABLE_OPTION:
+			return new EditableOptionsInputPanel<>(skin, title, desc, mandatory, defaultValue, options);
+		case SCENE_ACTOR:
+		case SCENE_CHARACTER_ACTOR:
+		case SCENE_INTERACTIVE_ACTOR:
+		case SCENE_SPRITE_ACTOR:
+		case SCENE_WALKZONE_ACTOR:
+			return new SceneActorInputPanel(skin, title, desc, mandatory, defaultValue, type);
+		case ACTOR_ANIMATION:
+			return new ActorAnimationInputPanel(skin, title, desc, mandatory, defaultValue);
+		case VECTOR3:
+			break;
+		case FILE:
+			break;
+		case TEXT:
+			return new TextInputPanel(skin, title, desc, mandatory, defaultValue);
+		case BIG_TEXT:
+			TextInputPanel i = new TextInputPanel(skin, title, desc, mandatory, defaultValue);
+			i.setRows(20);
+			return i;
+		case SMALL_TEXT:
+			TextInputPanel i2 = new TextInputPanel(skin, title, desc, mandatory, defaultValue);
+			i2.setRows(5);
+			return i2;
+
+		case ATLAS_ASSET:
+		case MUSIC_ASSET:
+		case SOUND_ASSET:
+		case PARTICLE_ASSET:
+		case FONT_ASSET:
+			return getReadOnlyOptionsInputPanel(skin, title, desc, mandatory, defaultValue, getAssetList(type));
+		case NOT_SET:
+			break;
+		default:
+			break;
+		}
+
+		return new StringInputPanel(skin, title, desc, mandatory, defaultValue);
+	}
+
+	private static InputPanel getReadOnlyOptionsInputPanel(Skin skin, String title, String desc, boolean mandatory,
+			String defaultValue, Object[] options) {
+		if (options instanceof Enum[]) {
+			return new EnumOptionsInputPanel(skin, title, desc, mandatory, defaultValue, (Enum[]) options);
+		} else if (options instanceof String[]) {
+			return new StringOptionsInputPanel(skin, title, desc, mandatory, defaultValue, (String[]) options);
+		} else {
+			throw new RuntimeException("Unknown type of options: " + options.getClass());
+		}
+	}
+
+	private static String[] getAssetList(Param.Type type) {
+		String path = null;
+		final String exts[];
+		boolean cutExt = false;
+
+		if (type == Type.ATLAS_ASSET) {
+			path = Ctx.project.getAssetPath() + Project.ATLASES_PATH + "/" + Ctx.project.getResDir();
+			exts = new String[1];
+			exts[0] = EngineAssetManager.ATLAS_EXT;
+			cutExt = true;
+		} else if (type == Type.MUSIC_ASSET) {
+			path = Ctx.project.getAssetPath() + Project.MUSIC_PATH + "/";
+			exts = new String[2];
+			exts[0] = ".ogg";
+			exts[1] = ".mp3";
+		} else if (type == Type.SOUND_ASSET) {
+			path = Ctx.project.getAssetPath() + Project.SOUND_PATH + "/";
+			exts = new String[2];
+			exts[0] = ".ogg";
+			exts[1] = ".mp3";
+		} else if (type == Type.PARTICLE_ASSET) {
+			path = Ctx.project.getAssetPath() + Project.PARTICLE_PATH + "/";
+			exts = null;
+		} else if (type == Type.FONT_ASSET) {
+			path = Ctx.project.getAssetPath() + Project.FONT_PATH + "/";
+			exts = new String[1];
+			exts[0] = ".ttf";
+			cutExt = true;	
+		} else {
+			exts = null;
+		}
+
+		File f = new File(path);
+
+		String list[] = f.list(new FilenameFilter() {
+
+			@Override
+			public boolean accept(File arg0, String arg1) {
+				if (exts == null)
+					return true;
+
+				for (String ext : exts)
+					if (arg1.endsWith(ext))
+						return true;
+
+				return false;
+			}
+		});
+
+		if(list == null) {
+			return new String[0];
+		}
+			
+		Arrays.sort(list);
+
+		if (cutExt) {
+			for (int i = 0; i < list.length; i++) {
+				int idx = list[i].lastIndexOf('.');
+				if (idx != -1)
+					list[i] = list[i].substring(0, idx);
+			}
+		}
+
+		return list;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/IntegerInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/IntegerInputPanel.java
new file mode 100644
index 000000000..19bda2c9a
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/IntegerInputPanel.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+
+public class IntegerInputPanel extends StringInputPanel {
+	
+	IntegerInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		super(skin, title, desc, mandatory, defaultValue);
+	}
+	
+	@Override
+	public boolean validateField() {
+		String s = getText();
+		
+		if(s == null || s.trim().isEmpty()) {
+			if(isMandatory()) {
+				setError(true);
+				return false;
+			} else {
+				setError(false);
+				return true;
+			}
+		}
+		
+		try {
+			Integer.parseInt(s);
+		} catch (NumberFormatException e) {
+			setError(true);
+			return false;
+		}
+
+		setError(false);
+		return true;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/LayerInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/LayerInputPanel.java
new file mode 100644
index 000000000..a319aeff0
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/LayerInputPanel.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import java.util.List;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.model.SceneLayer;
+import com.bladecoder.engineeditor.Ctx;
+
+public class LayerInputPanel extends EditableOptionsInputPanel<String> {
+	LayerInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		super(skin, title, desc, mandatory, defaultValue, getValues(mandatory));
+	}
+
+	private static String[] getValues(boolean mandatory) {
+		List<SceneLayer> layers = Ctx.project.getSelectedScene().getLayers();
+		
+		String[] result = new String[layers.size()];
+
+		
+		for(int i = 0; i < layers.size(); i++) {
+			result[i] = layers.get(i).getName();
+		}
+		
+		return result;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ModelList.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ModelList.java
new file mode 100644
index 000000000..6830c434d
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ModelList.java
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import java.util.List;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+
+public abstract class ModelList<PARENT, T> extends EditList<T> {
+
+	protected T clipboard;
+	protected PARENT parent;
+
+	private boolean sorted;
+
+	public ModelList(Skin skin, boolean sorted) {
+		super(skin);
+
+		list.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				int pos = list.getSelectedIndex();
+
+				toolbar.disableEdit(pos == -1);
+			}
+		});
+
+		this.sorted = sorted;
+	}
+
+	public void addElements(PARENT parent, List<T> elements) {
+
+		this.parent = parent;
+		list.getItems().clear();
+		list.getSelection().clear();
+
+		if (elements != null) {
+
+			for (T e : elements) {
+				addItem(e);
+			}
+		}
+
+		toolbar.disableEdit(list.getSelectedIndex() < 0);
+
+		if (sorted) {
+			list.sortByTitle();
+		}
+
+		if (getItems().size > 0)
+			list.getSelection().choose(list.getItems().get(0));
+
+		toolbar.disableCreate(parent == null);
+		// container.prefHeight(list.getItemHeight() * (list.getItems().size >
+		// 3?list.getItems().size:3));
+		list.invalidateHierarchy();
+	}
+
+	@Override
+	protected void create() {
+		EditModelDialog<PARENT, T> dialog = getEditElementDialogInstance(null);
+
+		dialog.show(getStage());
+		dialog.setListener(new ChangeListener() {
+			@SuppressWarnings("unchecked")
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				T e = ((EditModelDialog<PARENT, T>) actor).getElement();
+
+				if (getItems().indexOf(e, true) == -1) {
+					addItem(e);
+				}
+
+				if (sorted) {
+					list.sortByTitle();
+				}
+
+				int i = getItems().indexOf(e, true);
+				list.setSelectedIndex(i);
+				list.invalidateHierarchy();
+			}
+		});
+	}
+
+	@Override
+	protected void edit() {
+		T e = list.getSelected();
+
+		if (e == null)
+			return;
+
+		EditModelDialog<PARENT, T> dialog = getEditElementDialogInstance(e);
+		dialog.show(getStage());
+	}
+
+	protected abstract EditModelDialog<PARENT, T> getEditElementDialogInstance(T e);
+
+	protected T removeSelected() {
+		int pos = list.getSelectedIndex();
+
+		if (pos == -1)
+			return null;
+
+		T e = list.getItems().removeIndex(pos);
+
+		clipboard = e;
+
+		if (pos > 0)
+			list.setSelectedIndex(pos - 1);
+		else if (pos == 0 && list.getItems().size > 0)
+			list.setSelectedIndex(0);
+		else
+			list.getSelection().clear();
+
+		toolbar.disablePaste(false);
+
+		return e;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/OptionsInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/OptionsInputPanel.java
new file mode 100644
index 000000000..ad9f1ca0b
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/OptionsInputPanel.java
@@ -0,0 +1,5 @@
+package com.bladecoder.engineeditor.ui.panels;
+
+public interface OptionsInputPanel {
+	int getSelectedIndex();
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/PropertyTable.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/PropertyTable.java
new file mode 100644
index 000000000..5a35a88e8
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/PropertyTable.java
@@ -0,0 +1,172 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Container;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField.TextFieldListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.FocusListener;
+import com.badlogic.gdx.utils.SnapshotArray;
+import com.bladecoder.engineeditor.common.EditorLogger;
+
+public class PropertyTable extends Container<Table> {
+	private static final String[] BOOLEAN_VALUES = { "", "true", "false" };
+
+	Skin skin;
+	Table table;
+
+	public enum Types {
+		INTEGER, BOOLEAN, FLOAT, STRING, OPTIONS
+	}
+
+	public PropertyTable(Skin skin) {
+		// super(skin);
+		table = new Table(skin);
+		this.skin = skin;
+		top().left();
+		table.top().left();
+
+		table.add(new Label("Name", skin));
+		table.add(new Label("Value", skin));
+		table.setFillParent(true);
+
+		fill();
+		prefHeight(1000);
+
+		setActor(table);
+	}
+
+	public void addProperty(String name, String value, Types type) {
+
+		table.row();
+		table.add(new Label(name, skin)).expandX().left();
+
+		if (type == Types.BOOLEAN) {
+			SelectBox<String> sb = new SelectBox<String>(skin);
+			sb.setItems(BOOLEAN_VALUES);
+			if (value != null)
+				sb.setSelected(value);
+			sb.setName(name);
+			table.add(sb).expandX().left();
+
+			sb.addListener(new ChangeListener() {
+
+				@SuppressWarnings("unchecked")
+				@Override
+				public void changed(ChangeEvent event, Actor actor) {
+					updateModel(actor.getName(), ((SelectBox<String>) actor).getSelected());
+
+				}
+			});
+		} else {
+			TextField tf = new TextField(value == null ? "" : value, skin);
+			tf.setName(name);
+			table.add(tf).expandX().left();
+
+			if (type == Types.INTEGER)
+				tf.setTextFieldFilter(new TextField.TextFieldFilter.DigitsOnlyFilter());
+
+			tf.setTextFieldListener(new TextFieldListener() {
+				@Override
+				public void keyTyped(TextField actor, char c) {
+					if (c == 13) { // ENTER KEY
+						updateModel(actor.getName(), ((TextField) actor).getText());
+						EditorLogger.debug("Updating property: " + actor.getName());
+					}
+				}
+			});
+
+			tf.addListener(new FocusListener() {
+
+				@Override
+				public void keyboardFocusChanged(FocusEvent event, Actor actor, boolean focused) {
+					if (!focused) {
+						updateModel(actor.getName(), ((TextField) actor).getText());
+						EditorLogger.debug("Updating property: " + actor.getName());
+					}
+				}
+			});
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	public void setProperty(String name, String value) {
+		SnapshotArray<Actor> actors = table.getChildren();
+
+		for (Actor a : actors) {
+			if (name.equals(a.getName())) {
+				if (a instanceof SelectBox<?>) {
+					((SelectBox<String>) a).setSelected(value == null ? "" : value);
+				} else {
+					((TextField) a).setText(value == null ? "" : value);
+				}
+
+				return;
+			}
+		}
+	}
+
+	public void addProperty(String name, int value) {
+		addProperty(name, Integer.toString(value), Types.INTEGER);
+	}
+
+	public void addProperty(String name, float value) {
+		addProperty(name, Float.toString(value), Types.FLOAT);
+	}
+
+	public void addProperty(String name, String value) {
+		addProperty(name, value, Types.STRING);
+	}
+
+	public void addProperty(String name, boolean value) {
+		addProperty(name, Boolean.toString(value), Types.BOOLEAN);
+	}
+
+	public void addProperty(String name, String selected, String[] value) {
+		table.row();
+		table.add(new Label(name, skin)).expandX().left();
+
+		SelectBox<String> sb = new SelectBox<String>(skin);
+		sb.setItems(value);
+		if (selected != null)
+			sb.setSelected(selected);
+		sb.setName(name);
+		table.add(sb).expandX().left();
+
+		sb.addListener(new ChangeListener() {
+
+			@SuppressWarnings("unchecked")
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				updateModel(actor.getName(), ((SelectBox<String>) actor).getSelected());
+			}
+		});
+	}
+
+	protected void updateModel(String property, String value) {
+
+	}
+
+	protected void clearProps() {
+		table.clear();
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/SceneActorInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/SceneActorInputPanel.java
new file mode 100644
index 000000000..99d7410b0
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/SceneActorInputPanel.java
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.actions.SceneActorRef;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.WalkZoneActor;
+import com.bladecoder.engineeditor.Ctx;
+
+public class SceneActorInputPanel extends InputPanel {
+	FilteredSelectBox<String> scene;
+	EditableSelectBox<String> actor;
+	Table panel;
+	
+	private final Param.Type type; 
+	
+
+	SceneActorInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue, Param.Type type) {
+		
+		this.type = type;
+		
+		panel = new Table(skin);
+		scene = new FilteredSelectBox<>(skin);
+		actor = new EditableSelectBox<>(skin);
+
+		panel.add(new Label(" Scene ", skin));
+		panel.add(scene);
+		panel.add(new Label("  Actor ", skin));
+		panel.add(actor);
+
+		Scene[] scenes = Ctx.project.getWorld().getScenes().values().toArray(new Scene[0]);
+		
+		int l = scenes.length + 1;
+		
+		String values[] = new String[l];
+
+		values[0] = "";
+
+		for (int i = 0; i < scenes.length; i++) {
+			values[i + 1] = scenes[i].getId();
+		}
+		
+		Arrays.sort(values);
+		
+		scene.addListener(new ChangeListener() {
+			@Override
+			public void changed(ChangeEvent event, Actor actor) {
+				sceneSelected();
+			}
+		});		
+
+		init(skin, title, desc, panel, mandatory, defaultValue);
+		
+		scene.setItems(values);
+
+		if (values.length > 0) {
+			if (defaultValue != null)
+				setText(defaultValue);
+			else
+				scene.setSelectedIndex(0);
+		}
+		
+		
+	}
+	
+	private void sceneSelected() {
+		String s = scene.getSelected();
+		
+		if(s == null || s.isEmpty()) {
+			s = Ctx.project.getSelectedScene().getId();
+		}
+		
+		Scene scn = Ctx.project.getWorld().getScene(s);
+		
+		actor.setItems(getActorValues(scn));	
+	}
+	
+	public String getText() {
+		if(actor.getSelected().isEmpty())
+			return null;
+		
+		return (new SceneActorRef(scene.getSelected(), actor.getSelected())).toString();
+	}
+
+	public void setText(String s) {	
+		SceneActorRef aa = new SceneActorRef(s);
+		
+		scene.setSelected(aa.getSceneId() == null?"":aa.getSceneId());
+		sceneSelected();
+		actor.setSelected(aa.getActorId());
+	}
+	
+	private String[] getActorValues(Scene scn) {
+		Map<String, BaseActor> actors = scn.getActors();
+		
+		ArrayList<BaseActor> filteredActors = new ArrayList<BaseActor>();
+		
+		for(BaseActor a: actors.values()) {
+			if(type == Param.Type.SCENE_CHARACTER_ACTOR) {
+				if(a instanceof CharacterActor)
+					filteredActors.add(a);
+			} else if(type == Param.Type.SCENE_INTERACTIVE_ACTOR) {
+				if(a instanceof InteractiveActor)
+					filteredActors.add(a);
+			} else if(type == Param.Type.SCENE_SPRITE_ACTOR) {
+				if(a instanceof SpriteActor)
+					filteredActors.add(a);
+			} else if(type == Param.Type.SCENE_WALKZONE_ACTOR) {
+				if(a instanceof WalkZoneActor)
+					filteredActors.add(a);				
+			} else {
+				filteredActors.add(a);
+			}
+		}
+		
+		String[] result = null;
+		
+		if (type != Param.Type.SCENE_WALKZONE_ACTOR) {
+			// Add player variable to the list
+			result = new String[filteredActors.size() + 1];
+
+			result[0] = Scene.VAR_PLAYER;
+
+			for (int i = 0; i < filteredActors.size(); i++) {
+				result[i + 1] = filteredActors.get(i).getId();
+			}
+		} else {
+			result = new String[filteredActors.size()];
+			
+			for (int i = 0; i < filteredActors.size(); i++) {
+				result[i] = filteredActors.get(i).getId();
+			}
+		}
+		
+		Arrays.sort(result);
+		
+		return result;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/SceneInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/SceneInputPanel.java
new file mode 100644
index 000000000..b83cb1b30
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/SceneInputPanel.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engineeditor.Ctx;
+
+public class SceneInputPanel extends StringOptionsInputPanel {
+	SceneInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		super(skin, title, desc, mandatory, defaultValue, getValues(mandatory));
+	}
+
+	private static String[] getValues(boolean mandatory) {
+		Map<String, Scene> scenes = Ctx.project.getWorld().getScenes();
+		
+		String[] result = new String[scenes.size() + 1];
+		
+		Scene[] v = scenes.values().toArray(new Scene[scenes.size()]);
+		
+		for(int i = 0; i < scenes.size(); i++) {
+			result[i] = v[i].getId();
+		}
+		
+		result[scenes.size()] = "$" + World.WorldProperties.PREVIOUS_SCENE.toString();
+		
+		Arrays.sort(result);
+		
+		return result;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ScopePanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ScopePanel.java
new file mode 100644
index 000000000..5709f2a44
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/ScopePanel.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.ui.ButtonGroup;
+import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.Array;
+
+abstract public class ScopePanel extends Table {
+	public static String WORLD_SCOPE = "World";
+	public static String SCENE_SCOPE = "Scene";
+	public static String ACTOR_SCOPE = "Actor";
+	
+	private ButtonGroup<TextButton> buttonGroup;
+	private HorizontalGroup hPanel;
+	private Skin skin;
+	
+	public ScopePanel(Skin skin) {
+		super(skin);
+		this.skin = skin;
+		buttonGroup = new ButtonGroup<TextButton>();
+		hPanel = new HorizontalGroup();
+		hPanel.wrap(true);
+		hPanel.rowAlign(Align.left);
+		
+		buttonGroup.setMaxCheckCount(1);
+		buttonGroup.setMinCheckCount(1);
+		buttonGroup.setUncheckLast(true);
+		
+		hPanel.addActor(new Label("Scope: ", skin));
+		
+		addButton(WORLD_SCOPE);
+		addButton(SCENE_SCOPE);
+		addButton(ACTOR_SCOPE);
+		
+		add(hPanel).expandX().fillX().center();
+		
+		buttonGroup.getButtons().get(2).setChecked(true);
+	}
+	
+	private void addButton(String name) {
+		TextButton button = new TextButton(name, skin);
+		buttonGroup.add(button);
+		hPanel.addActor(button);
+		
+		button.addListener(new ClickListener() {
+			
+			@Override
+			public void clicked (InputEvent event, float x, float y) {
+				changeScope((TextButton)event.getListenerActor());
+			}
+		});
+	}
+	
+	public int getSelectedIndex() {
+		for(int i=0; i < buttonGroup.getButtons().size; i++) {
+			if(buttonGroup.getButtons().get(i) == buttonGroup.getChecked())
+				return i;
+		}
+		
+		return -1;
+	}
+	
+	public void changeScope(TextButton b) {		
+		b.setChecked(true);
+		
+		scopeChanged(b.getText().toString());
+	}
+	
+	abstract public void scopeChanged(String scope);
+	
+	public String getScope() {
+		return buttonGroup.getChecked().getText().toString();
+	}
+	
+	public void clear() {
+		Array<TextButton> buttons = buttonGroup.getButtons();
+		
+		buttons.clear();		
+		hPanel.clear();
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/SoundInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/SoundInputPanel.java
new file mode 100644
index 000000000..a45f62497
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/SoundInputPanel.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.bladecoder.engine.model.SoundDesc;
+import com.bladecoder.engineeditor.Ctx;
+
+public class SoundInputPanel extends StringOptionsInputPanel {
+	SoundInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		super(skin, title, desc, mandatory, defaultValue, getValues(mandatory));
+	}
+
+	private static String[] getValues(boolean mandatory) {
+		Map<String, SoundDesc> sounds = Ctx.project.getWorld().getSounds();
+		
+		String[] result = new String[sounds.size()];
+		
+		SoundDesc[] v = sounds.values().toArray(new SoundDesc[sounds.size()]);
+		
+		for(int i = 0; i < sounds.size(); i++) {
+			result[i] = v[i].getId();
+		}
+		
+		Arrays.sort(result);
+		
+		return result;
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/StringInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/StringInputPanel.java
new file mode 100644
index 000000000..2f7c6d887
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/StringInputPanel.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.TextField;
+
+public class StringInputPanel extends InputPanel {
+	TextField input;
+	
+	StringInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		input = new TextField("", skin);
+		init(skin, title, desc, input, mandatory, defaultValue);
+	}
+
+	public String getText() {
+		String text = ((TextField)field).getText();
+		return text.isEmpty()?null:text;
+	}
+
+	public void setText(String s) {
+		((TextField)field).setText(s);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/StringOptionsInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/StringOptionsInputPanel.java
new file mode 100644
index 000000000..68aee808c
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/StringOptionsInputPanel.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+
+public class StringOptionsInputPanel extends InputPanel implements OptionsInputPanel {
+	private final FilteredSelectBox<String> input;
+	
+	StringOptionsInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue, String[] options) {
+		input = new FilteredSelectBox<String>(skin);
+		
+		int l = options.length;
+		if(!mandatory) l++;
+		String values[] = new String[l];
+		
+		if(!mandatory) {
+			values[0] = "";
+		}
+
+		System.arraycopy(options, 0, values, mandatory ? 0 : 1, options.length);
+
+		input.setItems(values);
+		
+		init(skin, title, desc, input, mandatory, defaultValue);
+	}
+	
+	@Override
+	public String getText() {
+		if(input.getSelected()==null)
+			return null;
+		
+		return input.getSelected().isEmpty()?null:input.getSelected();
+	}
+
+	@Override
+	public void setText(String s) {
+		if(s == null)
+			return;
+		
+		int idx = input.getItems().indexOf(s, false);
+		if(idx != -1)
+			input.setSelectedIndex(idx);
+	}
+
+	@Override
+	public int getSelectedIndex() {
+    	return input.getSelectedIndex();
+    }
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/TabPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/TabPanel.java
similarity index 89%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/TabPanel.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/TabPanel.java
index 4b5e73e8e..f915aff25 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/TabPanel.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/TabPanel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
+package com.bladecoder.engineeditor.ui.panels;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,11 +28,11 @@
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
-import com.badlogic.gdx.scenes.scene2d.utils.Layout;
+import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.Array;
 
 public class TabPanel extends Table {
-	private ButtonGroup buttonGroup;
+	private ButtonGroup<Button> buttonGroup;
 	private HorizontalGroup header;
 	private Container<Actor> body;
 	private List<Tab> tabs;
@@ -51,7 +51,7 @@ public Tab(Button b, Actor c) {
 	public TabPanel(Skin skin) {
 		super(skin);
 		this.skin = skin;
-		buttonGroup = new ButtonGroup();
+		buttonGroup = new ButtonGroup<Button>();
 		header = new HorizontalGroup();
 		body = new Container<Actor>();
 		tabs = new ArrayList<Tab>();
@@ -59,13 +59,14 @@ public TabPanel(Skin skin) {
 		buttonGroup.setMaxCheckCount(1);
 		buttonGroup.setMinCheckCount(1);
 		buttonGroup.setUncheckLast(true);
-//		top().left();
-//		
+		
+		header.wrap(true);
+		header.rowAlign(Align.left);
+		
 		add(header).expandX().fillX().left();
 		row();
 		add(body).expand().fill();
 
-		body.size(0);
 		body.fill();
 	}
 	
@@ -116,15 +117,9 @@ public String getTitleAt(int i) {
 	public void setTab(int i) {		
 		Actor panel = tabs.get(i).content;
 		tabs.get(i).button.setChecked(true);
+		body.setActor(null);
 		body.clear();
 		body.setActor(panel);
-
-		if(panel instanceof Layout)
-			body.prefHeight(((Layout)panel).getPrefHeight());
-		else
-			body.prefHeight(panel.getHeight());
-		
-		invalidateHierarchy();
 	}
 	
 	public void clear() {
@@ -133,6 +128,7 @@ public void clear() {
 		buttons.clear();		
 		header.clear();
 		tabs.clear();
+		body.setActor(null);
 		body.clear();
 	}
 }
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/TextInputPanel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/TextInputPanel.java
new file mode 100644
index 000000000..9119837a6
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/TextInputPanel.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engineeditor.ui.panels;
+
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.TextArea;
+
+public class TextInputPanel extends InputPanel {
+	private TextArea input;
+	private float prefRows = 10;
+	
+	private ScrollPane scroll;
+	
+	TextInputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		input = new TextArea("", skin) {
+			@Override
+			public float getPrefHeight () {
+				
+				calculateOffsets();
+				
+				float prefHeight =  Math.max(prefRows, getLines()) * textHeight;
+				
+				if (getStyle().background != null) {
+					prefHeight = Math.max(prefHeight + getStyle().background.getBottomHeight() + getStyle().background.getTopHeight(),
+							getStyle().background.getMinHeight());
+				}
+				return prefHeight;
+			}
+			
+			@Override
+			public void moveCursorLine (int line) {
+				super.moveCursorLine(line);
+				
+				scroll.setScrollPercentY((line)/(float)input.getLines());
+			}
+        };
+        
+        
+		input.setPrefRows(prefRows);
+		
+		scroll = new ScrollPane(input, skin);
+		
+		scroll.setFadeScrollBars(false);
+		
+		init(skin, title, desc, scroll, mandatory, defaultValue);
+		
+		getCell(scroll).maxHeight(input.getStyle().font.getLineHeight() * prefRows + input.getStyle().background.getBottomHeight() + input.getStyle().background.getTopHeight());
+	}
+
+	public String getText() {
+		return input.getText();
+	}
+
+	public void setText(String s) {
+		if (s == null) s = "";
+		input.setText(s.replace("\\n", "\n"));
+		
+		scroll.invalidate();
+	}
+	
+	public void setRows(float rows) {
+		prefRows = rows;
+		input.setPrefRows(rows);
+		
+		getCell(scroll).maxHeight(input.getStyle().font.getLineHeight() * prefRows + input.getStyle().background.getBottomHeight() + input.getStyle().background.getTopHeight());
+	}
+}
diff --git a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/Vector2Panel.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/Vector2InputPanel.java
similarity index 65%
rename from adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/Vector2Panel.java
rename to adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/Vector2InputPanel.java
index 1d4db59e9..cea3e4c89 100644
--- a/adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/components/Vector2Panel.java
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/panels/Vector2InputPanel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engineeditor.ui.components;
+package com.bladecoder.engineeditor.ui.panels;
 
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
@@ -22,49 +22,67 @@
 import com.badlogic.gdx.scenes.scene2d.ui.TextField;
 import com.bladecoder.engine.actions.Param;
 
-public class Vector2Panel extends Table {
-	
+public class Vector2InputPanel extends InputPanel {
 	TextField x;
 	TextField y;
+	Table dimPanel;
 	
-	public Vector2Panel(Skin skin) {
+	Vector2InputPanel(Skin skin, String title, String desc, boolean mandatory, String defaultValue) {
+		dimPanel = new Table(skin);
 		x = new TextField("", skin);
 		y = new TextField("", skin);
-		
-    	add(new Label(" x ", skin));
-    	add(x);
-    	add(new Label(" y ", skin));
-    	add(y);
+
+		dimPanel.add(new Label(" x ", skin));
+		dimPanel.add(x);
+		dimPanel.add(new Label("  y ", skin));
+		dimPanel.add(y);
+
+		init(skin, title, desc, dimPanel, mandatory, defaultValue);
 	}
-	
+
 	public String getText() {
-		
-		if(x.getText().isEmpty() && y.getText().isEmpty())
+		if (x.getText().trim().isEmpty()
+				|| y.getText().trim().isEmpty())
 			return "";
-		
+
 		return x.getText() + "," + y.getText();
 	}
-	
+
 	public void setText(String s) {
-		Vector2 v = Param.parseVector2(s);
-		
-		if(v != null) {
-			x.setText(Float.toString(v.x));
-			y.setText(Float.toString(v.y));
-		} else {
+		if (s == null || s.isEmpty()) {
 			x.setText("");
 			y.setText("");
+		} else {
+			Vector2 v = Param.parseVector2(s);
+			x.setText(Float.toString(v.x));
+			y.setText(Float.toString(v.y));
 		}
 	}
 
+	@Override
 	public boolean validateField() {
+
+		String s = getText();
+		
+		if(s == null || s.trim().isEmpty()) {
+			if(isMandatory()) {
+				setError(true);
+				return false;
+			} else {
+				setError(false);
+				return true;
+			}
+		}			
+		
 		try {
 			Float.parseFloat(x.getText());
 			Float.parseFloat(y.getText());
 		} catch (NumberFormatException e) {
+			setError(true);
 			return false;
 		}
-		
+
+		setError(false);
 		return true;
 	}
 }
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoBboxPointPos.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoBboxPointPos.java
new file mode 100644
index 000000000..1d05659a3
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoBboxPointPos.java
@@ -0,0 +1,29 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engineeditor.Ctx;
+
+
+public class UndoBboxPointPos implements UndoOp {
+	private BaseActor a;
+	private Vector2 pos;
+	private int i;
+	
+	public UndoBboxPointPos(BaseActor a, int i, Vector2 pos) {
+		this.pos = pos;
+		this.a = a;
+		this.i = i;
+	}
+	
+	@Override
+	public void undo() {
+		
+		float verts[] = a.getBBox().getVertices();
+		verts[i] = pos.x;
+		verts[i + 1] = pos.y;
+		a.getBBox().dirty();
+		
+		Ctx.project.setModified();
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoCreateActor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoCreateActor.java
new file mode 100644
index 000000000..bc9017c9f
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoCreateActor.java
@@ -0,0 +1,23 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoCreateActor implements UndoOp {
+	private Scene scn;
+	private BaseActor a;
+	
+	public UndoCreateActor(Scene s, BaseActor a) {
+		scn = s;
+		this.a = a;
+	}
+	
+	@Override
+	public void undo() {
+		scn.getActors().remove(a.getId());
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_DELETED, null, a);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoCreateScene.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoCreateScene.java
new file mode 100644
index 000000000..329257a87
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoCreateScene.java
@@ -0,0 +1,20 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoCreateScene implements UndoOp {
+	private Scene scn;
+	
+	public UndoCreateScene(Scene s) {
+		scn = s;
+	}
+	
+	@Override
+	public void undo() {
+		Ctx.project.getWorld().getScenes().remove(scn.getId());
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_DELETED, null, scn);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoCreateSound.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoCreateSound.java
new file mode 100644
index 000000000..b9da1ab23
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoCreateSound.java
@@ -0,0 +1,20 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.SoundDesc;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoCreateSound implements UndoOp {
+	private SoundDesc s;
+	
+	public UndoCreateSound(SoundDesc s) {
+		this.s = s;
+	}
+	
+	@Override
+	public void undo() {
+		Ctx.project.getWorld().getSounds().remove(s.getFilename());
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_DELETED, null, s);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteAction.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteAction.java
new file mode 100644
index 000000000..73c718442
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteAction.java
@@ -0,0 +1,25 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoDeleteAction implements UndoOp {
+	private Verb v;
+	private Action a;
+	private int idx;
+	
+	public UndoDeleteAction(Verb v, Action a, int idx) {
+		this.v = v;
+		this.a = a;
+		this.idx = idx;
+	}
+	
+	@Override
+	public void undo() {
+		v.getActions().add(idx, a);
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, a);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteActor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteActor.java
new file mode 100644
index 000000000..caac29484
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteActor.java
@@ -0,0 +1,23 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoDeleteActor implements UndoOp {
+	private BaseActor a;
+	private Scene s;
+	
+	public UndoDeleteActor(Scene s, BaseActor a) {
+		this.s = s;
+		this.a = a;
+	}
+	
+	@Override
+	public void undo() {
+		s.addActor(a);
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, a);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteAnimation.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteAnimation.java
new file mode 100644
index 000000000..6a4e9ef58
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteAnimation.java
@@ -0,0 +1,24 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoDeleteAnimation implements UndoOp {
+	private SpriteActor a;
+	private AnimationDesc anim;
+	
+	public UndoDeleteAnimation(SpriteActor a, AnimationDesc anim) {
+		this.anim = anim;
+		this.a = a;
+	}
+	
+	@Override
+	public void undo() {
+		((AnimationRenderer)a.getRenderer()).addAnimation(anim);
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, anim);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteDialog.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteDialog.java
new file mode 100644
index 000000000..e68ca52af
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteDialog.java
@@ -0,0 +1,23 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoDeleteDialog implements UndoOp {
+	private CharacterActor a;
+	private Dialog d;
+	
+	public UndoDeleteDialog(CharacterActor a, Dialog d) {
+		this.d = d;
+		this.a = a;
+	}
+	
+	@Override
+	public void undo() {
+		a.addDialog(d);
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, d);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteOption.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteOption.java
new file mode 100644
index 000000000..4453742ac
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteOption.java
@@ -0,0 +1,25 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.DialogOption;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoDeleteOption implements UndoOp {
+	private Dialog d;
+	private DialogOption o;
+	private int idx;
+	
+	public UndoDeleteOption(Dialog d, DialogOption o, int idx) {
+		this.d = d;
+		this.o = o;
+		this.idx = idx;
+	}
+	
+	@Override
+	public void undo() {
+		d.getOptions().add(idx, o);
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, o);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteScene.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteScene.java
new file mode 100644
index 000000000..44979ebb9
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteScene.java
@@ -0,0 +1,20 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoDeleteScene implements UndoOp {
+	private Scene scn;
+	
+	public UndoDeleteScene(Scene s) {
+		scn = s;
+	}
+	
+	@Override
+	public void undo() {
+		Ctx.project.getWorld().addScene(scn);
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, scn);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteSound.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteSound.java
new file mode 100644
index 000000000..045576419
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteSound.java
@@ -0,0 +1,22 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.SoundDesc;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.common.ElementUtils;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoDeleteSound implements UndoOp {
+	private SoundDesc s;
+	
+	public UndoDeleteSound(SoundDesc s) {
+		this.s = s;
+	}
+	
+	@Override
+	public void undo() {
+		s.setId(ElementUtils.getCheckedId(s.getFilename(), Ctx.project.getWorld().getSounds().keySet().toArray(new String[ Ctx.project.getWorld().getSounds().size()]))); 
+		Ctx.project.getWorld().getSounds().put(s.getId(), s);
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, s);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteVerb.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteVerb.java
new file mode 100644
index 000000000..253eac9da
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDeleteVerb.java
@@ -0,0 +1,22 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.model.VerbManager;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+public class UndoDeleteVerb implements UndoOp {
+	private VerbManager vm;
+	private Verb v;
+
+	public UndoDeleteVerb(VerbManager vm, Verb v) {
+		this.vm = vm;
+		this.v = v;
+	}
+
+	@Override
+	public void undo() {
+		vm.addVerb(v);
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, v);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDepthVector.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDepthVector.java
new file mode 100644
index 000000000..02166289f
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoDepthVector.java
@@ -0,0 +1,33 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engineeditor.Ctx;
+
+
+public class UndoDepthVector implements UndoOp {
+	private Vector2 pos;
+	private Scene s;
+	
+	public UndoDepthVector(Scene s, Vector2 pos) {
+		this.pos = pos;
+		this.s = s;
+	}
+	
+	@Override
+	public void undo() {
+		s.getDepthVector().set(pos.x, pos.y);
+		Ctx.project.setModified();
+		updateFakeDepth();
+	}
+	
+	private void updateFakeDepth() {
+		for (BaseActor a : s.getActors().values()) {
+			if (a instanceof SpriteActor) {
+				a.setPosition(a.getX(), a.getY());
+			}
+		}
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoEditActor.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoEditActor.java
new file mode 100644
index 000000000..b40327bf2
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoEditActor.java
@@ -0,0 +1,21 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoEditActor implements UndoOp {
+	private Scene scn;
+	
+	public UndoEditActor(Scene s) {
+		scn = s;
+	}
+	
+	@Override
+	public void undo() {
+		// TODO restore attributes
+//		Ctx.project.getWorld().getScenes().remove(scn);
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, scn);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoEditScene.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoEditScene.java
new file mode 100644
index 000000000..a3fb73d11
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoEditScene.java
@@ -0,0 +1,21 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoEditScene implements UndoOp {
+	private Scene scn;
+	
+	public UndoEditScene(Scene s) {
+		scn = s;
+	}
+	
+	@Override
+	public void undo() {
+		// TODO restore attributes
+//		Ctx.project.getWorld().getScenes().remove(scn);
+		Ctx.project.setModified(this, Project.NOTIFY_ELEMENT_CREATED, null, scn);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoOp.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoOp.java
new file mode 100644
index 000000000..1168247d2
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoOp.java
@@ -0,0 +1,5 @@
+package com.bladecoder.engineeditor.undo;
+
+public interface UndoOp {
+	void undo();
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoPosition.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoPosition.java
new file mode 100644
index 000000000..79d7ec0a3
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoPosition.java
@@ -0,0 +1,23 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engineeditor.Ctx;
+import com.bladecoder.engineeditor.model.Project;
+
+
+public class UndoPosition implements UndoOp {
+	private BaseActor a;
+	private Vector2 pos;
+	
+	public UndoPosition(BaseActor a, Vector2 pos) {
+		this.pos = pos;
+		this.a = a;
+	}
+	
+	@Override
+	public void undo() {
+		a.setPosition(pos.x, pos.y);
+		Ctx.project.setModified(this, Project.POSITION_PROPERTY, null, a);
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoRefPosition.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoRefPosition.java
new file mode 100644
index 000000000..d32c9e8e7
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoRefPosition.java
@@ -0,0 +1,22 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engineeditor.Ctx;
+
+
+public class UndoRefPosition implements UndoOp {
+	private InteractiveActor a;
+	private Vector2 pos;
+	
+	public UndoRefPosition(InteractiveActor a, Vector2 pos) {
+		this.pos = pos;
+		this.a = a;
+	}
+	
+	@Override
+	public void undo() {
+		a.setRefPoint(pos.x, pos.y);
+		Ctx.project.setModified();
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoRotation.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoRotation.java
new file mode 100644
index 000000000..9f1f451ac
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoRotation.java
@@ -0,0 +1,21 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engineeditor.Ctx;
+
+
+public class UndoRotation implements UndoOp {
+	private SpriteActor a;
+	private float rot;
+	
+	public UndoRotation(SpriteActor a, float rot) {
+		this.rot = rot;
+		this.a = a;
+	}
+	
+	@Override
+	public void undo() {
+		a.setRot(rot);
+		Ctx.project.setModified();
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoScale.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoScale.java
new file mode 100644
index 000000000..eac48a5f4
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoScale.java
@@ -0,0 +1,22 @@
+package com.bladecoder.engineeditor.undo;
+
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engineeditor.Ctx;
+
+
+public class UndoScale implements UndoOp {
+	private SpriteActor a;
+	private Vector2 scale;
+	
+	public UndoScale(SpriteActor a, Vector2 scale) {
+		this.scale = scale;
+		this.a = a;
+	}
+	
+	@Override
+	public void undo() {
+		a.setScale(scale.x, scale.y);
+		Ctx.project.setModified();
+	}
+}
diff --git a/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoStack.java b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoStack.java
new file mode 100644
index 000000000..97421f7b6
--- /dev/null
+++ b/adventure-editor/src/main/java/com/bladecoder/engineeditor/undo/UndoStack.java
@@ -0,0 +1,27 @@
+package com.bladecoder.engineeditor.undo;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+import com.bladecoder.engineeditor.common.EditorLogger;
+
+public class UndoStack {
+	Deque<UndoOp> stack = new ArrayDeque<UndoOp>();
+
+	public void add(UndoOp op) {
+		stack.push(op);
+	}
+
+	public void undo() {
+		if (!stack.isEmpty()) {
+			UndoOp op = stack.pop();
+			op.undo();
+			
+			EditorLogger.debug("UNDO: " + op);
+		}
+	}
+
+	public void clear() {
+		stack.clear();
+	}
+}
diff --git a/adventure-composer/src/main/resources/images/ic_app16.png b/adventure-editor/src/main/resources/images/ic_app16.png
similarity index 100%
rename from adventure-composer/src/main/resources/images/ic_app16.png
rename to adventure-editor/src/main/resources/images/ic_app16.png
diff --git a/adventure-composer/src/main/resources/images/ic_app32.png b/adventure-editor/src/main/resources/images/ic_app32.png
similarity index 100%
rename from adventure-composer/src/main/resources/images/ic_app32.png
rename to adventure-editor/src/main/resources/images/ic_app32.png
diff --git a/adventure-composer/src/main/resources/images/ic_app64.png b/adventure-editor/src/main/resources/images/ic_app64.png
similarity index 100%
rename from adventure-composer/src/main/resources/images/ic_app64.png
rename to adventure-editor/src/main/resources/images/ic_app64.png
diff --git a/adventure-composer/src/main/resources/images/icons.atlas b/adventure-editor/src/main/resources/images/icons.atlas
similarity index 51%
rename from adventure-composer/src/main/resources/images/icons.atlas
rename to adventure-editor/src/main/resources/images/icons.atlas
index 67e1f9cdd..deeb27f7f 100644
--- a/adventure-composer/src/main/resources/images/icons.atlas
+++ b/adventure-editor/src/main/resources/images/icons.atlas
@@ -1,418 +1,600 @@
 
 icons.png
-size: 1006,124
+size: 1024,128
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
+eye
+  rotate: false
+  xy: 2, 2
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+eye_disabled
+  rotate: false
+  xy: 36, 2
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 ic_3d
   rotate: false
-  xy: 457, 46
+  xy: 420, 14
   size: 31, 31
   orig: 31, 31
   offset: 0, 0
   index: -1
 ic_add
   rotate: false
-  xy: 523, 63
-  size: 16, 16
-  orig: 16, 16
+  xy: 495, 58
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_add_disabled
   rotate: false
-  xy: 541, 63
-  size: 16, 16
-  orig: 16, 16
+  xy: 521, 56
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ic_anchor
+  rotate: false
+  xy: 70, 2
+  size: 32, 32
+  orig: 32, 32
   offset: 0, 0
   index: -1
 ic_animation
   rotate: false
-  xy: 668, 92
+  xy: 232, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_assets
   rotate: false
-  xy: 253, 79
+  xy: 104, 47
   size: 45, 45
   orig: 45, 45
   offset: 0, 0
   index: -1
 ic_assets_disabled
   rotate: false
-  xy: 104, 13
+  xy: 151, 47
   size: 45, 45
   orig: 45, 45
   offset: 0, 0
   index: -1
 ic_atlases
   rotate: false
-  xy: 300, 79
+  xy: 198, 47
   size: 45, 45
   orig: 45, 45
   offset: 0, 0
   index: -1
+ic_atlases_disabled
+  rotate: false
+  xy: 488, 84
+  size: 42, 42
+  orig: 42, 42
+  offset: 0, 0
+  index: -1
 ic_base_actor
   rotate: false
-  xy: 702, 92
+  xy: 266, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_character_actor
   rotate: false
-  xy: 736, 92
+  xy: 634, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_goto
   rotate: false
-  xy: 736, 92
+  xy: 634, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_check
   rotate: false
-  xy: 559, 63
-  size: 16, 16
-  orig: 16, 16
+  xy: 547, 56
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_check_disabled
   rotate: false
-  xy: 577, 63
-  size: 16, 16
-  orig: 16, 16
+  xy: 573, 56
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_closed
   rotate: false
-  xy: 794, 75
-  size: 15, 15
-  orig: 15, 15
+  xy: 599, 56
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ic_closed_disabled
+  rotate: false
+  xy: 634, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_copy
   rotate: false
-  xy: 595, 63
-  size: 16, 16
-  orig: 16, 16
+  xy: 660, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_copy_disabled
   rotate: false
-  xy: 613, 63
-  size: 16, 16
-  orig: 16, 16
+  xy: 686, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_create_all
   rotate: false
-  xy: 631, 63
-  size: 16, 16
-  orig: 16, 16
+  xy: 712, 68
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ic_create_all_disabled
+  rotate: false
+  xy: 913, 51
+  size: 15, 15
+  orig: 15, 15
   offset: 0, 0
   index: -1
 ic_custom
   rotate: false
-  xy: 770, 92
+  xy: 668, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_delete
   rotate: false
-  xy: 649, 63
-  size: 16, 16
-  orig: 16, 16
+  xy: 738, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_delete_disabled
   rotate: false
-  xy: 523, 45
-  size: 16, 16
-  orig: 16, 16
+  xy: 764, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_dialog
   rotate: false
-  xy: 804, 92
+  xy: 702, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_talkto
   rotate: false
-  xy: 804, 92
+  xy: 702, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_down
   rotate: false
-  xy: 541, 45
-  size: 16, 16
-  orig: 16, 16
+  xy: 790, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_down_disabled
   rotate: false
-  xy: 559, 45
-  size: 16, 16
-  orig: 16, 16
+  xy: 816, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_edit
   rotate: false
-  xy: 577, 45
-  size: 16, 16
-  orig: 16, 16
+  xy: 842, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_edit_disabled
   rotate: false
-  xy: 595, 45
-  size: 16, 16
-  orig: 16, 16
+  xy: 868, 68
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ic_enter
+  rotate: false
+  xy: 736, 94
+  size: 32, 32
+  orig: 32, 32
   offset: 0, 0
   index: -1
 ic_exit
   rotate: false
-  xy: 151, 13
-  size: 45, 45
-  orig: 45, 45
+  xy: 770, 94
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ic_eye
+  rotate: false
+  xy: 894, 68
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ic_eye_disabled
+  rotate: false
+  xy: 920, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_fg_actor
   rotate: false
-  xy: 838, 92
+  xy: 804, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+ic_flip
+  rotate: false
+  xy: 946, 68
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
 ic_init
   rotate: false
-  xy: 872, 92
+  xy: 838, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_leave
   rotate: false
-  xy: 906, 92
+  xy: 872, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_left
   rotate: false
-  xy: 613, 45
-  size: 16, 16
-  orig: 16, 16
+  xy: 972, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_left_disabled
   rotate: false
-  xy: 631, 45
-  size: 16, 16
-  orig: 16, 16
+  xy: 998, 68
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_load
   rotate: false
-  xy: 488, 81
+  xy: 104, 2
   size: 43, 43
   orig: 43, 43
   offset: 0, 0
   index: -1
 ic_lookat
   rotate: false
-  xy: 940, 92
+  xy: 906, 94
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_new
   rotate: false
-  xy: 533, 81
+  xy: 149, 2
   size: 43, 43
   orig: 43, 43
   offset: 0, 0
   index: -1
 ic_no_scene
   rotate: false
-  xy: 2, 2
+  xy: 2, 36
   size: 100, 56
   orig: 100, 56
   offset: 0, 0
   index: -1
+ic_obstacle_actor
+  rotate: false
+  xy: 940, 94
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 ic_open
   rotate: false
-  xy: 811, 75
-  size: 15, 15
-  orig: 15, 15
+  xy: 495, 32
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ic_open_disabled
+  rotate: false
+  xy: 521, 30
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_package
   rotate: false
-  xy: 347, 79
+  xy: 245, 47
   size: 45, 45
   orig: 45, 45
   offset: 0, 0
   index: -1
 ic_package_disabled
   rotate: false
-  xy: 198, 13
+  xy: 300, 81
   size: 45, 45
   orig: 45, 45
   offset: 0, 0
   index: -1
+ic_particles
+  rotate: false
+  xy: 974, 94
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 ic_paste
   rotate: false
-  xy: 649, 45
-  size: 16, 16
-  orig: 16, 16
+  xy: 547, 30
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_paste_disabled
   rotate: false
-  xy: 668, 74
-  size: 16, 16
-  orig: 16, 16
+  xy: 573, 30
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_pickup
   rotate: false
-  xy: 974, 92
+  xy: 292, 47
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_play
   rotate: false
-  xy: 394, 79
+  xy: 347, 81
   size: 45, 45
   orig: 45, 45
   offset: 0, 0
   index: -1
 ic_play_disabled
   rotate: false
-  xy: 441, 79
+  xy: 394, 81
   size: 45, 45
   orig: 45, 45
   offset: 0, 0
   index: -1
 ic_player
   rotate: false
-  xy: 253, 45
+  xy: 284, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+ic_player_small
+  rotate: false
+  xy: 599, 30
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ic_player_small_disabled
+  rotate: false
+  xy: 625, 42
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ic_quit
+  rotate: false
+  xy: 441, 81
+  size: 45, 45
+  orig: 45, 45
+  offset: 0, 0
+  index: -1
+ic_reload_small
+  rotate: false
+  xy: 651, 42
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+ic_reload_small_disabled
+  rotate: false
+  xy: 677, 42
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
 ic_repeat
   rotate: false
-  xy: 287, 45
+  xy: 326, 47
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_right
   rotate: false
-  xy: 686, 74
-  size: 16, 16
-  orig: 16, 16
+  xy: 703, 42
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_right_disabled
   rotate: false
-  xy: 704, 74
-  size: 16, 16
-  orig: 16, 16
+  xy: 729, 42
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_save
   rotate: false
-  xy: 578, 81
+  xy: 194, 2
   size: 43, 43
   orig: 43, 43
   offset: 0, 0
   index: -1
 ic_save_disabled
   rotate: false
-  xy: 623, 81
+  xy: 239, 2
   size: 43, 43
   orig: 43, 43
   offset: 0, 0
   index: -1
 ic_spine
   rotate: false
-  xy: 490, 48
+  xy: 462, 48
   size: 31, 31
   orig: 31, 31
   offset: 0, 0
   index: -1
 ic_sprite_actor
   rotate: false
-  xy: 321, 45
+  xy: 318, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_test
   rotate: false
-  xy: 355, 45
+  xy: 360, 47
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ic_text
+  rotate: false
+  xy: 352, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_up
   rotate: false
-  xy: 722, 74
-  size: 16, 16
-  orig: 16, 16
+  xy: 755, 42
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_up_disabled
   rotate: false
-  xy: 740, 74
-  size: 16, 16
-  orig: 16, 16
+  xy: 781, 42
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 ic_use
   rotate: false
-  xy: 389, 45
+  xy: 394, 47
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ic_walkzone
+  rotate: false
+  xy: 386, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ic_yoyo
   rotate: false
-  xy: 423, 45
+  xy: 428, 47
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+scn_character
+  rotate: false
+  xy: 532, 82
+  size: 32, 44
+  orig: 32, 44
+  offset: 0, 0
+  index: -1
+scn_move
+  rotate: false
+  xy: 566, 82
+  size: 32, 44
+  orig: 32, 44
+  offset: 0, 0
+  index: -1
+scn_rotate
+  rotate: false
+  xy: 807, 42
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+scn_scale
+  rotate: false
+  xy: 857, 48
+  size: 18, 18
+  orig: 18, 18
+  offset: 0, 0
+  index: -1
+scn_scale_lock
+  rotate: false
+  xy: 833, 44
+  size: 22, 22
+  orig: 22, 22
+  offset: 0, 0
+  index: -1
+scn_sprite
+  rotate: false
+  xy: 600, 82
+  size: 32, 44
+  orig: 32, 44
+  offset: 0, 0
+  index: -1
 title
   rotate: false
-  xy: 2, 60
-  size: 249, 64
-  orig: 249, 64
+  xy: 2, 94
+  size: 228, 32
+  orig: 228, 32
   offset: 0, 0
   index: -1
 transparent-dark
   rotate: false
-  xy: 758, 74
+  xy: 877, 50
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 transparent-light
   rotate: false
-  xy: 776, 74
+  xy: 895, 50
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
diff --git a/adventure-editor/src/main/resources/images/icons.png b/adventure-editor/src/main/resources/images/icons.png
new file mode 100644
index 000000000..6aa6ac77d
Binary files /dev/null and b/adventure-editor/src/main/resources/images/icons.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/android/AndroidManifest.xml b/adventure-editor/src/main/resources/projectTmpl/android/AndroidManifest.xml
new file mode 100644
index 000000000..d0a0d89ce
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/android/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-feature android:glEsVersion="0x00020000"
+                  android:required="true"/>
+
+    <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
+
+    <application
+            android:allowBackup="true"
+            android:fullBackupContent="true"
+            android:icon="@drawable/ic_launcher"
+            android:isGame="true"
+            android:appCategory="game"
+            android:label="@string/app_name"
+            tools:ignore="UnusedAttribute">
+        <activity
+                android:name=".AndroidLauncher"
+                android:label="@string/app_name"
+                android:exported="true"
+                android:screenOrientation="landscape"
+                android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/adventure-editor/src/main/resources/projectTmpl/android/build.gradle b/adventure-editor/src/main/resources/projectTmpl/android/build.gradle
new file mode 100644
index 000000000..5837d6750
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/android/build.gradle
@@ -0,0 +1,210 @@
+apply plugin: 'android'
+
+// @formatter:off
+android {
+    compileSdkVersion highestSdkAvailable("android-%API_LEVEL%")
+
+    defaultConfig {
+        namespace "%PACKAGE%"
+        minSdkVersion 21
+
+        targetSdkVersion %API_LEVEL%
+        versionName version
+
+        if (project.hasProperty('versionCode'))
+            versionCode project.versionCode.toInteger()
+        else
+            versionCode 1
+
+        buildConfigField "int", "EXPANSION_FILE_VERSION", "0"
+    }
+
+    flavorDimensions "default"
+
+    productFlavors {
+        full {
+        }
+
+        expansion {
+            buildConfigField "int", "EXPANSION_FILE_VERSION", String.valueOf(android.defaultConfig.versionCode)
+        }
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src/main/java']
+            aidl.srcDirs = ['src/main/java']
+            renderscript.srcDirs = ['src/main/java']
+            res.srcDirs = ['res']
+            jniLibs.srcDirs = ['libs']
+        }
+
+        full.assets.srcDirs = ['../assets']
+        expansion.assets.srcDirs = ['../base-assets']
+    }
+
+    packagingOptions {
+        // Preventing from license violations (more or less):
+        pickFirst 'META-INF/LICENSE.txt'
+        pickFirst 'META-INF/LICENSE'
+        pickFirst 'META-INF/license.txt'
+        pickFirst 'META-INF/LGPL2.1'
+        pickFirst 'META-INF/NOTICE.txt'
+        pickFirst 'META-INF/NOTICE'
+        pickFirst 'META-INF/notice.txt'
+        // Excluding unnecessary meta-data:
+        exclude 'META-INF/robovm/ios/robovm.xml'
+        exclude 'META-INF/DEPENDENCIES.txt'
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/dependencies.txt'
+    }
+
+    if (project.hasProperty('keystore')) {
+        signingConfigs {
+            release {
+                storeFile file(project.keystore)
+                storePassword project.storePassword
+                keyAlias project.alias
+                keyPassword project.keyPassword
+            }
+        }
+
+        buildTypes {
+            release {
+                signingConfig signingConfigs.release
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+configurations { natives }
+
+dependencies {
+    implementation project(":core")
+    implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
+    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
+    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
+    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
+    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
+    implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
+
+    // TO QUERY PERMISSIONS
+    implementation "com.android.support:support-v4:23.0.0"
+
+    implementation "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion"
+}
+
+// called every time gradle gets executed, takes the native dependencies of
+// the natives configuration, and extracts them to the proper libs/ folders
+// so they get packed with the APK.
+task copyAndroidNatives() {
+    file("libs/armeabi-v7a/").mkdirs();
+    file("libs/arm64-v8a/").mkdirs();
+    file("libs/x86_64/").mkdirs();
+    file("libs/x86/").mkdirs();
+
+    configurations.natives.files.each { jar ->
+        def outputDir = null
+        if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
+        if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
+        if (jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
+        if (jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
+        if (outputDir != null) {
+            copy {
+                from zipTree(jar)
+                into outputDir
+                include "*.so"
+            }
+        }
+    }
+}
+
+tasks.matching { it.name.contains("merge") && it.name.contains("JniLibFolders") }.configureEach { packageTask ->
+    packageTask.dependsOn 'copyAndroidNatives'
+}
+
+build.dependsOn ':core:setVersion'
+
+task run(type: Exec) {
+    def path = getSdkFolder()
+
+    def adb = path + "/platform-tools/adb"
+    commandLine "$adb", 'shell', 'am', 'start', '-n', android.defaultConfig.applicationId + '/' + 'com.bladecoder.engine.AndroidLauncher'
+}
+
+task('packageMainExpansionFile', type: Zip) {
+
+    FileTree tree = fileTree(dir: '../assets')
+
+    from tree
+    //into 'assets'
+
+    // Expansion file name format: main.versionCode.packageName.obb
+    entryCompression = ZipEntryCompression.STORED
+    archiveName = 'main.' + android.defaultConfig.versionCode + "." + android.defaultConfig.applicationId + ".obb"
+
+    doLast {
+        println "Generating expansion file:" + archiveName
+    }
+
+}
+
+tasks.whenTaskAdded { task ->
+    if (task.name == 'generateExpansionReleaseBuildConfig') {
+        task.dependsOn packageMainExpansionFile
+    }
+}
+
+String getSdkFolder() {
+    def path
+    def localProperties = project.file("../local.properties")
+    if (localProperties.exists()) {
+        Properties properties = new Properties()
+        localProperties.withInputStream { instr ->
+            properties.load(instr)
+        }
+        def sdkDir = properties.getProperty('sdk.dir')
+        if (sdkDir) {
+            path = sdkDir
+        } else {
+            path = "$System.env.ANDROID_HOME"
+        }
+    } else {
+        path = "$System.env.ANDROID_HOME"
+    }
+
+    return path
+}
+
+String highestSdkAvailable(String defaultSdk) {
+    try {
+        def buildToolsDir = new File(getSdkFolder(), "platforms")
+        def sdks = buildToolsDir.list([accept: { d, f -> f.startsWith("android-") && new File(d, f).isDirectory() }] as FilenameFilter).sort { a, b -> b <=> a }
+        def highestSdk = sdks[0]
+        if (highestSdk != null) {
+            println "Using highest found SDK: " + highestSdk
+            highestSdk
+        } else {
+            println "No installed SDKs found. Using default SDK: " + defaultSdk
+
+            defaultSdk
+        }
+    } catch (any) {
+        println "Exception while determining highest SDK. Using default SDK: " + defaultSdk
+
+        defaultSdk
+    }
+}
+
diff --git a/adventure-editor/src/main/resources/projectTmpl/android/ic_launcher-web.png b/adventure-editor/src/main/resources/projectTmpl/android/ic_launcher-web.png
new file mode 100644
index 000000000..cd5f45e67
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/android/ic_launcher-web.png differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/proguard-project.txt b/adventure-editor/src/main/resources/projectTmpl/android/proguard-rules.pro
similarity index 100%
rename from adventure-composer/src/main/resources/projectTmpl/android/proguard-project.txt
rename to adventure-editor/src/main/resources/projectTmpl/android/proguard-rules.pro
diff --git a/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-hdpi/ic_launcher.png b/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..5972cb6b6
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-hdpi/ic_launcher.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-mdpi/ic_launcher.png b/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..42d5fd9f4
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-mdpi/ic_launcher.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-xhdpi/ic_launcher.png b/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..eca794ff4
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-xxhdpi/ic_launcher.png b/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..9c165ef68
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-xxxhdpi/ic_launcher.png b/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..0deffd3dc
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/android/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/res/values/strings.xml b/adventure-editor/src/main/resources/projectTmpl/android/res/values/strings.xml
similarity index 100%
rename from adventure-composer/src/main/resources/projectTmpl/android/res/values/strings.xml
rename to adventure-editor/src/main/resources/projectTmpl/android/res/values/strings.xml
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/res/values/styles.xml b/adventure-editor/src/main/resources/projectTmpl/android/res/values/styles.xml
similarity index 100%
rename from adventure-composer/src/main/resources/projectTmpl/android/res/values/styles.xml
rename to adventure-editor/src/main/resources/projectTmpl/android/res/values/styles.xml
diff --git a/adventure-editor/src/main/resources/projectTmpl/android/src/AndroidLauncher b/adventure-editor/src/main/resources/projectTmpl/android/src/AndroidLauncher
new file mode 100644
index 000000000..a34d4b4d9
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/android/src/AndroidLauncher
@@ -0,0 +1,148 @@
+package com.bladecoder.engine;
+
+import com.bladecoder.engine.BladeEngine;
+
+import android.Manifest;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.WindowManager;
+import android.support.v4.app.ActivityCompat;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
+
+import com.badlogic.gdx.backends.android.APKExpansionSupport;
+import com.badlogic.gdx.backends.android.AndroidApplication;
+import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
+import com.badlogic.gdx.backends.android.AndroidFiles;
+import com.badlogic.gdx.utils.GdxRuntimeException;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+import com.badlogic.gdx.Gdx;
+
+public class AndroidLauncher extends AndroidApplication {
+	private static final String TAG = "AndroidLauncher";
+
+	private final AndroidEngine bladeEngine = new AndroidEngine();
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		AndroidApplicationConfiguration cfg = new AndroidApplicationConfiguration();
+		cfg.useAccelerometer = false;
+		cfg.useCompass = false;
+		// cfg.numSamples = 2;
+		cfg.useImmersiveMode = true;
+
+		getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+		initialize(bladeEngine, cfg);
+
+		if (BuildConfig.EXPANSION_FILE_VERSION > 0) {
+
+			boolean success = expansionFilesExists(BuildConfig.EXPANSION_FILE_VERSION, 0);
+
+			if (!success) {
+				if (Build.VERSION.SDK_INT >= 23) {
+					if (checkSelfPermission(
+							Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+						Log.e(TAG, "Permission is granted but .obb was not found.");
+						// TODO Download .obb
+						exit();
+					} else {
+						Log.v(TAG, "Permission is revoked, requesting...");
+						bladeEngine.setWaitingForPermissions(true);
+						ActivityCompat.requestPermissions(AndroidLauncher.this,
+								new String[] { Manifest.permission.READ_EXTERNAL_STORAGE }, 2);
+					}
+				} else { // permission is automatically granted on sdk<23 upon installation
+					Log.e(TAG, "Permission is granted in Manifest (sdk<23) but .obb was not found.");
+					// TODO Download .obb
+					exit();
+				}
+			}
+		}
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+		switch (requestCode) {
+		case 2:
+			Log.d(TAG, "External storage2");
+			if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+				Log.v(TAG, "Permission: " + permissions[0] + "was " + grantResults[0]);
+
+				boolean success = ((AndroidFiles) Gdx.files).setAPKExpansion(BuildConfig.EXPANSION_FILE_VERSION, 0);
+
+				if (!success) {
+					Log.e(TAG, "Permission accepted but .obb was not found.");
+
+					// TODO Download .obb
+					exit();
+				} 
+			} else {
+				Log.e(TAG, "Permission denied by user.");
+				exit();
+			}
+			break;
+		}
+	}
+
+	private boolean expansionFilesExists(int mainVersion, int patchVersion) {
+		try {
+			return APKExpansionSupport.getAPKExpansionZipFile(getContext(), mainVersion, patchVersion) != null;
+		} catch (IOException ex) {
+			Log.v(TAG, "APK expansion main version " + mainVersion + " or patch version " + patchVersion
+					+ " couldn't be opened!");
+		}
+
+		return false;
+	}
+
+	class AndroidEngine extends BladeEngine {
+		private boolean waitingForPermissions = false;
+
+		@Override
+		public void create() {
+			if(waitingForPermissions)
+				return;
+
+			if (BuildConfig.EXPANSION_FILE_VERSION > 0) {
+				boolean success = ((AndroidFiles) Gdx.files).setAPKExpansion(BuildConfig.EXPANSION_FILE_VERSION, 0);
+
+				if(!success) {
+					Log.e(TAG, "Can not set APK expansion.");
+					Gdx.app.exit();
+				} else {
+					Log.d(TAG, "Expansion file stablish successfully!");
+				}
+			}
+
+			super.create();
+		}
+
+		@Override
+		public void resume() {
+			if(waitingForPermissions) {
+				// returns from querying permissions
+				bladeEngine.setWaitingForPermissions(false);
+				bladeEngine.create();
+			}
+
+			super.resume();
+		}
+
+		public void setWaitingForPermissions(boolean v) {
+			waitingForPermissions = v;
+		}
+	}
+}
\ No newline at end of file
diff --git a/adventure-editor/src/main/resources/projectTmpl/android/src/expansion/AndroidManifest.xml b/adventure-editor/src/main/resources/projectTmpl/android/src/expansion/AndroidManifest.xml
new file mode 100644
index 000000000..073bdefde
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/android/src/expansion/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+</manifest>
\ No newline at end of file
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/BladeEngine.properties b/adventure-editor/src/main/resources/projectTmpl/assets/BladeEngine.properties
new file mode 100644
index 000000000..f7f3c56d4
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/assets/BladeEngine.properties
@@ -0,0 +1,7 @@
+title=Blade Engine Adventure
+ui_mode=two_buttons
+inventory_pos=down
+debug=false
+resolutions=1
+
+
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/model/00.chapter.json b/adventure-editor/src/main/resources/projectTmpl/assets/model/00.chapter.json
new file mode 100644
index 000000000..9b4273829
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/assets/model/00.chapter.json
@@ -0,0 +1,25 @@
+{
+bladeEngineVersion: "1.3.1",
+sounds: {},
+scenes: {
+	"scene-1": {
+		id: "scene-1",
+		layers: [
+			{
+				name: "foreground"
+			},
+			{
+				name: "dynamic",
+				dynamic: true
+			},
+			{
+				name: "background"
+			}
+		],
+		actors: {},
+		musicDesc: null,
+		verbs: {}
+	}
+},
+initScene: "scene-1"
+}
\ No newline at end of file
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/model/00.properties b/adventure-editor/src/main/resources/projectTmpl/assets/model/00.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/model/world b/adventure-editor/src/main/resources/projectTmpl/assets/model/world
new file mode 100644
index 000000000..17185f3a9
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/assets/model/world
@@ -0,0 +1,76 @@
+{
+width: 1920,
+height: 1080,
+initChapter: "00",
+verbs: {
+	dialog: {
+		id: "dialog",
+		target: null,
+		state: null,
+		actions: [
+			{
+				class: "com.bladecoder.engine.actions.SetCutmodeAction",
+				value: true
+			},
+			{
+				class: "com.bladecoder.engine.actions.SayDialogAction",
+				wait: true
+			},
+			{
+				class: "com.bladecoder.engine.actions.SetCutmodeAction",
+				value: false
+			}
+		]
+	},
+	use: {
+		id: "use",
+		target: null,
+		state: null,
+		actions: [
+			{
+				class: "com.bladecoder.engine.actions.LookAtAction",
+				text: "@default.use.0.text",
+				wait: false
+			}
+		]
+	},
+	lookat: {
+		id: "lookat",
+		target: null,
+		state: null,
+		actions: [
+			{
+				class: "com.bladecoder.engine.actions.LookAtAction",
+				text: "@default.lookat.0.text",
+				wait: true
+			}
+		]
+	},
+	initNewGame: {
+		id: "initNewGame",
+		target: null,
+		state: null,
+		icon: null,
+		actions: []
+	},
+	initSavedGame: {
+		id: "initSavedGame",
+		target: null,
+		state: null,
+		icon: null,
+		actions: []
+	},
+	pickup: {
+		id: "pickup",
+		target: null,
+		state: null,
+		actions: [
+			{
+				class: "com.bladecoder.engine.actions.LookAtAction",
+				text: "@default.pickup.0.text",
+				wait: true
+			}
+		]
+	}
+}
+}
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/model/world.properties b/adventure-editor/src/main/resources/projectTmpl/assets/model/world.properties
new file mode 100644
index 000000000..982cfc27c
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/assets/model/world.properties
@@ -0,0 +1,21 @@
+#world.json
+#Sat Jan 02 11:31:11 CET 2016
+default.lookat.0.text=I'm not interested.
+default.pickup.0.text=For what?
+default.use.0.text=I don't know what to do with that.
+ui.back=Back
+ui.continue=Continue
+ui.credits=Credits
+ui.help=Help
+ui.load=Load/Save
+ui.new=New Game
+ui.newSlot=Save Game
+ui.noSavedGames=No saved games found
+ui.quit=Exit
+ui.save=Save Game
+ui.override=The current game progress will be lost. Are you sure you want to start a new game?
+ui.override_load=The current game progress will be lost. Are you sure you want to load this game?
+ui.remove=Are you sure you want to remove this saved game?
+ui.yes=YES
+ui.no=NO
+ui.gamesaved=Game Saved
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/model/world_es.properties b/adventure-editor/src/main/resources/projectTmpl/assets/model/world_es.properties
new file mode 100644
index 000000000..970831c70
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/assets/model/world_es.properties
@@ -0,0 +1,21 @@
+#Mon Apr 29 15:12:39 CEST 2013
+default.use.0.text=No se qué hacer con esto
+default.lookat.0.text=Nada interesante
+default.pickup.0.text=No puedo coger eso
+
+ui.back=Atrás
+ui.continue=Continuar
+ui.credits=Créditos
+ui.help=Ayuda
+ui.load=Guardar/Cargar
+ui.new=Nuevo Juego
+ui.newSlot=Guardar Juego
+ui.no=NO
+ui.noSavedGames=No se han encontrado juegos salvados
+ui.override=El progreso actual del juego se perderá. ¿Estás seguro de que quieres empezar un nuevo juego?
+ui.override_load=El progreso actual del juego se perderá. ¿Estás seguro de que quieres cargar la partida seleccionada?
+ui.quit=Salir
+ui.remove=¿Estás seguro de que quieres borrar la partida seleccionada?
+ui.save=Guardar Juego
+ui.yes=SI
+ui.gamesaved=Juego guardado
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/blade_logo.png b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/blade_logo.png
similarity index 100%
rename from adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/blade_logo.png
rename to adventure-editor/src/main/resources/projectTmpl/assets/ui/1/blade_logo.png
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpDesktop.png b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpDesktop.png
new file mode 100644
index 000000000..fc6addacb
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpDesktop.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpDesktop_es.png b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpDesktop_es.png
new file mode 100644
index 000000000..580d258fb
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpDesktop_es.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpPie.png b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpPie.png
new file mode 100644
index 000000000..62c2605f8
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpPie.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpPie_es.png b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpPie_es.png
new file mode 100644
index 000000000..24d582055
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/helpPie_es.png differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/libgdx_logo.png b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/libgdx_logo.png
similarity index 100%
rename from adventure-composer/src/main/resources/projectTmpl/android/assets/ui/1/libgdx_logo.png
rename to adventure-editor/src/main/resources/projectTmpl/assets/ui/1/libgdx_logo.png
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/ui.atlas b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/ui.atlas
new file mode 100644
index 000000000..881cfc4ea
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/ui.atlas
@@ -0,0 +1,169 @@
+
+ui.png
+size: 300,1031
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+back
+  rotate: false
+  xy: 207, 212
+  size: 92, 90
+  orig: 120, 120
+  offset: 14, 15
+  index: -1
+border_rect
+  rotate: false
+  xy: 204, 47
+  size: 29, 29
+  split: 5, 5, 5, 5
+  orig: 29, 29
+  offset: 0, 0
+  index: -1
+bubblepointer
+  rotate: false
+  xy: 204, 78
+  size: 60, 39
+  orig: 60, 39
+  offset: 0, 0
+  index: -1
+credits
+  rotate: false
+  xy: 1, 882
+  size: 148, 148
+  orig: 148, 148
+  offset: 0, 0
+  index: -1
+debug
+  rotate: false
+  xy: 1, 732
+  size: 148, 148
+  orig: 148, 148
+  offset: 0, 0
+  index: -1
+delete
+  rotate: false
+  xy: 108, 318
+  size: 112, 112
+  orig: 112, 112
+  offset: 0, 0
+  index: -1
+dialog_down
+  rotate: false
+  xy: 1, 1
+  size: 75, 75
+  orig: 93, 93
+  offset: 9, 8
+  index: -1
+dialog_up
+  rotate: false
+  xy: 222, 304
+  size: 75, 75
+  orig: 93, 93
+  offset: 9, 10
+  index: -1
+help
+  rotate: false
+  xy: 151, 882
+  size: 148, 148
+  orig: 148, 148
+  offset: 0, 0
+  index: -1
+hotspot
+  rotate: false
+  xy: 108, 219
+  size: 97, 97
+  orig: 97, 97
+  offset: 0, 0
+  index: -1
+hotspotpointer
+  rotate: false
+  xy: 1, 582
+  size: 148, 148
+  orig: 148, 148
+  offset: 0, 0
+  index: -1
+inv_down
+  rotate: false
+  xy: 1, 255
+  size: 105, 175
+  orig: 105, 175
+  offset: 0, 0
+  index: -1
+inv_up
+  rotate: false
+  xy: 1, 78
+  size: 105, 175
+  orig: 105, 175
+  offset: 0, 0
+  index: -1
+inventory
+  rotate: false
+  xy: 151, 468
+  size: 129, 112
+  orig: 129, 129
+  offset: 0, 10
+  index: -1
+leave
+  rotate: false
+  xy: 108, 30
+  size: 94, 90
+  orig: 94, 90
+  offset: 0, 0
+  index: -1
+lookat
+  rotate: false
+  xy: 151, 732
+  size: 148, 148
+  orig: 148, 148
+  offset: 0, 0
+  index: -1
+menu
+  rotate: false
+  xy: 222, 381
+  size: 65, 85
+  orig: 123, 123
+  offset: 29, 18
+  index: -1
+pickup
+  rotate: false
+  xy: 1, 432
+  size: 148, 148
+  orig: 148, 148
+  offset: 0, 0
+  index: -1
+plus
+  rotate: false
+  xy: 205, 119
+  size: 91, 91
+  orig: 91, 91
+  offset: 0, 0
+  index: -1
+pointer
+  rotate: false
+  xy: 108, 122
+  size: 95, 95
+  orig: 95, 95
+  offset: 0, 0
+  index: -1
+rect
+  rotate: false
+  xy: 151, 435
+  size: 31, 31
+  split: 5, 5, 5, 4
+  orig: 31, 31
+  offset: 0, 0
+  index: -1
+talkto
+  rotate: false
+  xy: 151, 582
+  size: 148, 148
+  orig: 148, 148
+  offset: 0, 0
+  index: -1
+white_pixel
+  rotate: false
+  xy: 78, 73
+  size: 3, 3
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/ui.png b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/ui.png
new file mode 100644
index 000000000..8884f5335
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/assets/ui/1/ui.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/ui/credits.txt b/adventure-editor/src/main/resources/projectTmpl/assets/ui/credits.txt
new file mode 100644
index 000000000..0d92db893
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/assets/ui/credits.txt
@@ -0,0 +1,6 @@
+t#BLADECODER ADVENTURE ENGINE
+RAFAEL GARCÍA
+s#120
+i#libgdx_logo.png
+s#250
+i#blade_logo.png
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/ArchitectsDaughter.ttf b/adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/ArchitectsDaughter.ttf
new file mode 100644
index 000000000..a2d4f0c46
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/ArchitectsDaughter.ttf differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/PaytoneOne.ttf b/adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/PaytoneOne.ttf
new file mode 100644
index 000000000..4ef776f48
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/PaytoneOne.ttf differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/Roboto-Black.ttf b/adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/Roboto-Black.ttf
similarity index 100%
rename from adventure-composer/src/main/resources/projectTmpl/android/assets/ui/Roboto-Black.ttf
rename to adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/Roboto-Black.ttf
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/Roboto-Regular.ttf b/adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/Roboto-Regular.ttf
similarity index 100%
rename from adventure-composer/src/main/resources/projectTmpl/android/assets/ui/Roboto-Regular.ttf
rename to adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/Roboto-Regular.ttf
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/Roboto-Thin.ttf b/adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/Roboto-Thin.ttf
similarity index 100%
rename from adventure-composer/src/main/resources/projectTmpl/android/assets/ui/Roboto-Thin.ttf
rename to adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/Roboto-Thin.ttf
diff --git a/adventure-composer/src/main/resources/projectTmpl/android/assets/ui/Ubuntu-M.ttf b/adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/Ubuntu-M.ttf
similarity index 100%
rename from adventure-composer/src/main/resources/projectTmpl/android/assets/ui/Ubuntu-M.ttf
rename to adventure-editor/src/main/resources/projectTmpl/assets/ui/fonts/Ubuntu-M.ttf
diff --git a/adventure-editor/src/main/resources/projectTmpl/assets/ui/ui.json b/adventure-editor/src/main/resources/projectTmpl/assets/ui/ui.json
new file mode 100644
index 000000000..23250c9c7
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/assets/ui/ui.json
@@ -0,0 +1,234 @@
+{
+
+BitmapFont: {
+	default: {file: fonts/Roboto-Regular.ttf, size: 17},
+	debug: {file: fonts/Roboto-Regular.ttf, size: 14}, 
+	big-font: {file: fonts/PaytoneOne.ttf, size: 35},
+	message-font: {file: fonts/PaytoneOne.ttf, size: 17},
+	dialog-font: {file: fonts/ArchitectsDaughter.ttf, size: 22},
+	text-manager-font: {file: fonts/ArchitectsDaughter.ttf, size: 20},
+	desc: {file: fonts/Ubuntu-M.ttf, size: 16},
+	credits-title: {file: fonts/Ubuntu-M.ttf, size: 20},
+	credits: {file: fonts/Ubuntu-M.ttf, size: 30}
+},
+
+
+Color: {
+	white: { a: 1, b: 1, g: 1, r: 1 },
+	black: { a: 1, b: 0, g: 0, r: 0 },
+	dark-grey: { a: 1, b: 0.25, g: 0.25, r: 0.25 },
+	light-grey: { a: 1, b: 0.75, g: 0.75, r: 0.75 },
+	grey: { a: 1, b: 0.5, g: 0.5, r: 0.5 },
+	text-dark: { a: 1, b: 1, g: 1, r: 1 },
+	black-trans:  { r: 0.6, g: 0.6, b: 0.6, a: 1 },
+	white-trans:  {  r: 1, g: 1, b: 1, a: 0.8 },
+	yellow:  { r: 1, g: 1, b: 0.13, a: 1 }
+},
+
+TintedDrawable: {
+	black: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 1.0 } },
+	black08: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 0.8 } },
+	white: { name: white_pixel, color: white },
+	grey: { name: white_pixel, color: grey},
+	dark-grey: { name: white_pixel, color: dark-grey},
+
+	menu-up: { name: menu, color: white-trans},
+
+	border-rect-over: { name: border_rect, color: white-trans},
+	border-rect-down: { name: border_rect, color: black},
+
+	lookat-down: {name:lookat, color: black-trans},
+	lookat-over: {name:lookat, color: white-trans},
+	pickup-down: {name:pickup, color: black-trans},
+	pickup-over: {name:pickup, color: white-trans},
+	talkto-down: {name:talkto, color: black-trans},
+	talkto-over: {name:talkto, color: white-trans},
+
+	help-down: {name:help, color: black},
+	help-over: {name:help, color: white-trans},
+	credits-down: {name:credits, color: black},
+	credits-over: {name:credits, color: white-trans},
+	debug-down: {name:debug, color: black},
+	debug-over: {name:debug, color: white-trans},
+
+	back-down: {name:back, color: black},
+	back-over: {name:back, color: white-trans},
+
+	delete-over: {name:delete, color: white-trans},
+
+	dialog-up-down: {name:dialog_up, color: black},
+	dialog-up-over: {name:dialog_up, color: white-trans},
+	dialog-down-down: {name:dialog_down, color: black},
+	dialog-down-over: {name:dialog_down, color: white-trans},
+},
+
+ButtonStyle: {
+	inventory: {up:inventory},
+	delete_game: {up:delete, over: delete-over},
+	menu: {up:menu-up, over: menu, down: menu},
+
+	pie_lookat: {up: lookat, down: lookat-down, over: lookat-over},
+	pie_pickup: {up: pickup, down: pickup-down, over: pickup-over},
+	pie_talkto: {up: talkto, down: talkto-down, over: talkto-over},
+	
+	help: {up:help, down: help-down, over: help-over},
+	credits: {up:credits, down: credits-down, over: credits-over},
+	debug: {up:debug, down: debug-down, over: debug-over},
+
+	back: {up:back, down: back-down, over: back-over},
+
+	dialog-up: {up:dialog_up, down: dialog-up-down, over: dialog-up-over},
+	dialog-down: {up:dialog_down, down: dialog-down-down, over: dialog-down-over},
+},
+
+
+TextButtonStyle: {
+	default: { 
+		font: debug, 
+		up: grey, 
+		fontColor: white, 
+		overFontColor: yellow,
+		downFontColor: grey,
+		disabledFontColor: dark-grey
+	},
+
+	menu: { 
+		up: border_rect, 
+		down: border-rect-down,
+		over: border-rect-over,
+		font: big-font,
+		fontColor: white, 
+		downFontColor: black, 
+		overFontColor: white-trans, 
+		disabledFontColor: dark-grey
+	},	
+
+	toggle: {
+		down: border-rect-down,
+		checked: border_rect,
+		font: debug,
+		fontColor: white,
+		overFontColor: yellow,
+		downFontColor: black-trans,
+		disabledFontColor: dark-grey
+	}
+
+	ui-dialog: {
+		font: message-font,
+		fontColor: white,
+		overFontColor: yellow,
+		downFontColor: grey,
+	}
+},
+
+
+LabelStyle: {
+	default: { font: default, fontColor: white},
+	debug: { font: debug, fontColor: white},
+	title: { font: big-font, fontColor: white},
+	ui-dialog: { font: message-font, fontColor: white},
+	ui-text: { font: message-font, fontColor: white, background: black08},
+},
+
+
+MenuScreenStyle: {
+	default: {textButtonStyle: menu, showTitle: true, titleStyle: title}
+},
+
+
+LoadSaveScreenStyle: {
+	default: {textButtonStyle: menu}
+},
+
+
+CreditScreenStyle: {
+	default: {
+		titleFont: credits-title, font: credits
+	}
+},
+
+InventoryUIStyle: {
+	default: {background: black08, itemBackground: dark-grey}
+},
+
+DialogUIStyle: {
+	default: {background: black08, textButtonStyle: {font: dialog-font, fontColor: white, overFontColor: light-grey}}
+},
+
+TextManagerUIStyle: {
+	default: {
+		rectBackground: rect, 
+		talkBackground: white, 
+		font: text-manager-font, 
+		talkBubble: bubblepointer,
+		defaultColor: black,
+		subtitlePosPercent: 0.9
+	}
+},
+
+
+TextFieldStyle: {
+	default: { 
+		selection: grey, 
+		background: dark-grey, 
+		focusedBackground: dark-grey, 
+		disabledBackground: grey, 
+		font: debug, 
+		fontColor: white, 
+		focusedFontColor: text-dark, 
+		disabledFontColor: text-dark, 
+		cursor: white, messageFont: debug, 
+		messageFontColor: text-dark 
+	}
+},
+
+
+ScrollPaneStyle: {
+	default: {
+		vScroll: dark-grey, vScrollKnob: grey, hScrollKnob: dark-grey,  hScroll: dark-grey, corner: white
+	},
+	
+	opaque: { 
+		vScroll: dark-grey, 
+		hScrollKnob: dark-grey, 
+		background: grey, hScroll: dark-grey, vScrollKnob: dark-grey, corner: grey
+	}
+},
+
+ListStyle: {
+	default: { 
+		fontColorUnselected: text-dark, 
+		selection: dark-grey, 
+		fontColorSelected: text-dark, 
+		font: debug 
+	},
+		
+	opaque: { 
+		fontColorUnselected: text-dark, 
+		selection: grey, 
+		fontColorSelected: text-dark, 
+		font: debug 
+	}
+},
+
+
+SelectBoxStyle: {
+	default: { 
+		background: dark-grey, 
+		backgroundOver: grey, 
+		backgroundOpen: dark-grey, 
+		listStyle: default, 
+		scrollStyle: opaque, 
+		font: debug, 
+		fontColor: white 
+	},
+},
+
+WindowStyle: {
+		default: { titleFont: big-font, background: black08, titleFontColor: white },
+},
+
+VerbUIStyle: {
+	default: { verbButtonStyle: {font:message-font, fontColor: yellow, up: dark-grey, overFontColor: white}, inventoryButtonStyle: {up: dark-grey, over: grey}, infoLineLabelStyle: {font: default}, upArrow: inv_up, downArrow: inv_down},
+}
+}
diff --git a/adventure-editor/src/main/resources/projectTmpl/build.gradle b/adventure-editor/src/main/resources/projectTmpl/build.gradle
new file mode 100644
index 000000000..3f6c08332
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/build.gradle
@@ -0,0 +1,22 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        google()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:$androidGradlePluginVersion"
+    }
+}
+
+subprojects {
+    repositories {
+        mavenCentral()
+        google()
+        gradlePluginPortal()
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        maven { url "https://oss.sonatype.org/content/repositories/releases/" }
+    }
+}
+
+
diff --git a/adventure-editor/src/main/resources/projectTmpl/core/build.gradle b/adventure-editor/src/main/resources/projectTmpl/core/build.gradle
new file mode 100644
index 000000000..d7b6742d7
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/core/build.gradle
@@ -0,0 +1,41 @@
+apply plugin: 'java'
+apply plugin: 'java-library'
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+
+dependencies {
+    api "com.badlogicgames.gdx:gdx:$gdxVersion"
+    api "com.bladecoder.engine:blade-engine:$bladeEngineVersion"
+    implementation "com.bladecoder.ink:blade-ink:$bladeInkVersion"
+    implementation "org.minimalcode:minimalcode-beans:0.5.1"
+    implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+    implementation "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
+
+
+    if (project.hasProperty("spinePlugin") && project.spinePlugin.equals("true")) {
+        println "Using Spine Plugin..."
+        implementation "com.bladecoder.engine:blade-engine-spine-plugin:$bladeEngineVersion"
+    }
+}
+
+
+task setVersion(type: WriteProperties) {
+    def props = new Properties()
+    def propFile = project.file("../assets/BladeEngine.properties");
+    props.load(new FileReader(propFile))
+
+    props."version" = version
+    props."bladeEngineVersion" = bladeEngineVersion
+    props."gdxVersion" = gdxVersion
+    props."roboVMVersion" = roboVMVersion
+
+    setProperties(props);
+    setOutputFile(propFile);
+
+    doLast {
+        println "Set version info in versions.properties"
+    }
+}
diff --git a/adventure-editor/src/main/resources/projectTmpl/desktop/build.gradle b/adventure-editor/src/main/resources/projectTmpl/desktop/build.gradle
new file mode 100644
index 000000000..05e87c475
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/desktop/build.gradle
@@ -0,0 +1,50 @@
+apply plugin: 'java-library'
+apply plugin: 'application'
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+sourceSets.main.resources.srcDirs += [rootProject.file('assets').absolutePath]
+mainClassName = "com.bladecoder.engine.DesktopLauncher"
+//applicationDefaultJvmArgs = ["-XstartOnFirstThread"]
+
+dependencies {
+    implementation project(":core")
+    implementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
+    implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+    implementation "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+    implementation "com.badlogicgames.gdx:gdx-lwjgl3-angle:$gdxVersion"
+    implementation "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion"
+}
+
+def os = System.properties['os.name'].toLowerCase()
+
+run {
+    standardInput = System.in
+    ignoreExitValue = true
+
+    if (project.hasProperty("appArgs")) {
+        args Eval.me(appArgs)
+    }
+
+    if (os.contains('mac')) {
+        jvmArgs = ["-XstartOnFirstThread"]
+    }
+}
+
+
+task dist(type: Jar) {
+    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+    manifest {
+        attributes 'Main-Class': project.mainClassName
+    }
+    dependsOn configurations.runtimeClasspath
+    from {
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+    with jar
+}
+
+dist.dependsOn classes
+dist.dependsOn ':core:jar'
+processResources.dependsOn ':core:setVersion'
diff --git a/adventure-editor/src/main/resources/projectTmpl/desktop/src/DesktopLauncher b/adventure-editor/src/main/resources/projectTmpl/desktop/src/DesktopLauncher
new file mode 100644
index 000000000..ae51260ce
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/desktop/src/DesktopLauncher
@@ -0,0 +1,184 @@
+package com.bladecoder.engine;
+
+import com.badlogic.gdx.Files.FileType;
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Graphics;
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Window;
+import com.bladecoder.engine.ui.SceneScreen;
+import com.bladecoder.engine.ui.UI.Screens;
+import com.bladecoder.engine.util.Config;
+import org.lwjgl.glfw.GLFW;
+import org.lwjgl.system.Configuration;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+public class DesktopLauncher extends BladeEngine {
+
+	private static final int WINDOW_WIDTH = 1920 / 2;
+    private static final int WINDOW_HEIGHT = 1080 / 2;
+
+    private boolean fullscreen = true;
+    private Lwjgl3ApplicationConfiguration cfg = new Lwjgl3ApplicationConfiguration();
+	
+	private float speed = 1.0f;
+
+	DesktopLauncher() {
+		Properties p = new Properties();
+
+
+		try {
+			InputStream s = DesktopLauncher.class.getResourceAsStream("/" + Config.PROPERTIES_FILENAME);
+			if(s!=null)
+				p.load(s);
+		} catch (IOException e) {
+			System.out.println("Could not load properties file.");
+		}
+		
+        cfg.setTitle(p.getProperty(Config.TITLE_PROP, "Blade Engine Adventure") + " "
+                + p.getProperty(Config.VERSION_PROP, ""));
+
+		cfg.setResizable(true);
+		cfg.useVsync(true);
+        cfg.setOpenGLEmulation(Lwjgl3ApplicationConfiguration.GLEmulation.GL20, 0, 0);
+	}
+
+	public void run() {
+        List<String> iconList = new ArrayList<>();
+
+        if (DesktopLauncher.class.getResource("/icons/icon128.png") != null)
+            iconList.add("icons/icon128.png");
+
+        if (DesktopLauncher.class.getResource("/icons/icon32.png") != null)
+            iconList.add("icons/icon32.png");
+
+        if (DesktopLauncher.class.getResource("/icons/icon16.png") != null)
+            iconList.add("icons/icon16.png");
+
+        cfg.setWindowIcon(FileType.Internal, iconList.toArray(new String[0]));
+
+        new Lwjgl3Application(this, cfg);
+	}
+
+	public void parseParams(String[] args) {
+		for (int i = 0; i < args.length; i++) {
+			String s = args[i];
+			if (s.equals("-t")) {
+				if (i + 1 < args.length) {
+					i++;
+					setTestMode(args[i]);
+				}
+			} else if (s.equals("-p")) {
+				if (i + 1 < args.length) {
+					i++;
+					setPlayMode(args[i]);
+				}
+			} else if (s.equals("-s")) {
+				if (i + 1 < args.length) {
+					i++;
+					speed = Float.parseFloat(args[i]);
+				}				
+			} else if (s.equals("-chapter")) {
+				if (i + 1 < args.length) {
+					i++;
+					setChapter(args[i]);
+				}							
+			} else if (s.equals("-f")) {
+				fullscreen = true;
+			} else if (s.equals("-d")) {
+				setDebugMode();
+			} else if (s.equals("-r")) {
+				setRestart();				
+			} else if (s.equals("-res")) {
+				if (i + 1 < args.length) {
+					i++;
+					forceResolution(args[i]);
+				}
+			} else if (s.equals("-aspect")) {
+				if (i + 1 < args.length) {
+					i++;
+					String aspect = args[i];
+					
+                    if (aspect.equals("16:9")) {
+                        cfg.setWindowedMode(WINDOW_WIDTH, WINDOW_WIDTH * 9 / 16);
+                    } else if (aspect.equals("4:3")) {
+                        cfg.setWindowedMode(WINDOW_WIDTH, WINDOW_WIDTH * 3 / 4);
+                    } else if (aspect.equals("16:10") || aspect.equals("8:5")) {
+                        cfg.setWindowedMode(WINDOW_WIDTH, WINDOW_WIDTH * 10 / 16);
+                    }
+				}	
+			} else if (s.equals("-w")) {
+				fullscreen = false;
+			} else if (s.equals("-l")) {
+				if (i + 1 < args.length) {
+					i++;
+					loadGameState(args[i]);
+				}
+			} else if (s.equals("-h")) {
+				usage();
+            } else if (s.equals("-opengl")) {
+                cfg.setOpenGLEmulation(Lwjgl3ApplicationConfiguration.GLEmulation.GL20, 0, 0);
+            } else if (s.equals("-angle")) {
+                cfg.setOpenGLEmulation(Lwjgl3ApplicationConfiguration.GLEmulation.ANGLE_GLES20, 0, 0);
+            } else {
+				if(i == 0 && !s.startsWith("-")) continue; // When embeded JRE the 0 parameter is the app name
+				System.out.println("Unrecognized parameter: " + s);
+				usage();
+			}
+		}
+
+        if(!fullscreen)
+            cfg.setWindowedMode(WINDOW_WIDTH, WINDOW_HEIGHT);
+	}
+	
+	public void usage() {
+		System.out.println("Usage:\n" 
+				+ "-chapter chapter\tLoads the selected chapter\n"
+				+ "-t scene_name\tStart test mode for the scene\n" 
+				+ "-p record_name\tPlay previusly recorded games\n"
+				+ "-f\tSet fullscreen mode\n"
+				+ "-w\tSet windowed mode\n" 
+				+ "-d\tShow debug messages\n"
+				+ "-res width\tForce the resolution width\n" 
+				+ "-l game_state\tLoad the previusly saved game state\n"
+				+ "-r\tRun the game from the begining\n"
+				+ "-s speed\tSets the game speed\n"
+				+ "-aspect aspect_ratio\tSets the specified screen aspect (16:9, 4:3, 16:10)\n");
+
+		System.exit(0);
+	}
+
+	@Override
+	public void create() {
+		if (fullscreen)
+			Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
+		
+		hideCursor();
+		
+		super.create();
+		
+		if(getUI().getScreen(Screens.SCENE_SCREEN) instanceof SceneScreen)
+			((SceneScreen) getUI().getScreen(Screens.SCENE_SCREEN)).setSpeed(speed);
+	}
+
+    private void hideCursor() {
+        Lwjgl3Window window = ((Lwjgl3Graphics) Gdx.graphics).getWindow();
+        GLFW.glfwSetInputMode(window.getWindowHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_HIDDEN);
+    }
+
+	public static void main(String[] args) {
+//        if (SharedLibraryLoader.isMac && !"1".equals(System.getenv("JAVA_STARTED_ON_FIRST_THREAD_" + LibC.getpid()))) {
+//            System.out.println("MacOs detected. Running in async mode.");
+//            Configuration.GLFW_LIBRARY_NAME.set("glfw_async");
+//        }
+
+		DesktopLauncher game = new DesktopLauncher();
+		game.parseParams(args);
+		game.run();
+	}
+}
diff --git a/adventure-editor/src/main/resources/projectTmpl/desktop/src/icons/icon128.png b/adventure-editor/src/main/resources/projectTmpl/desktop/src/icons/icon128.png
new file mode 100644
index 000000000..3eeb1b2db
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/desktop/src/icons/icon128.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/desktop/src/icons/icon16.png b/adventure-editor/src/main/resources/projectTmpl/desktop/src/icons/icon16.png
new file mode 100644
index 000000000..d0dbcf0b0
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/desktop/src/icons/icon16.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/desktop/src/icons/icon32.png b/adventure-editor/src/main/resources/projectTmpl/desktop/src/icons/icon32.png
new file mode 100644
index 000000000..d74097298
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/desktop/src/icons/icon32.png differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/gitignore b/adventure-editor/src/main/resources/projectTmpl/gitignore
similarity index 93%
rename from adventure-composer/src/main/resources/projectTmpl/gitignore
rename to adventure-editor/src/main/resources/projectTmpl/gitignore
index 2668f0074..29759ecfa 100644
--- a/adventure-composer/src/main/resources/projectTmpl/gitignore
+++ b/adventure-editor/src/main/resources/projectTmpl/gitignore
@@ -21,6 +21,8 @@ www-test/
 android/libs/armeabi/
 android/libs/armeabi-v7a/
 android/libs/x86/
+android/libs/x86_64/
+android/libs/arm64-v8a/
 android/gen/
 .idea/
 *.ipr
diff --git a/adventure-editor/src/main/resources/projectTmpl/gradle.properties b/adventure-editor/src/main/resources/projectTmpl/gradle.properties
new file mode 100644
index 000000000..49a554ea3
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/gradle.properties
@@ -0,0 +1,12 @@
+appName=%APP_NAME%
+bladeEngineVersion=%BLADE_ENGINE_VERSION%
+gdxVersion=%LIBGDX_VERSION%
+roboVMVersion=%ROBOVM_VERSION%
+androidGradlePluginVersion=%ANDROID_GRADLE_PLUGIN_VERSION%
+bladeInkVersion=%BLADE_INK_VERSION%
+spinePlugin=%USE_SPINE%
+gdxControllersVersion=2.2.2
+org.gradle.daemon=true
+org.gradle.jvmargs=-Xms128m -Xmx1536m
+org.gradle.configureondemand=false
+android.injected.testOnly=false
diff --git a/adventure-editor/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.jar b/adventure-editor/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..7454180f2
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.properties b/adventure-editor/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.properties
similarity index 53%
rename from adventure-composer/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.properties
rename to adventure-editor/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.properties
index d01e74dca..1e2fbf0d4 100644
--- a/adventure-composer/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.properties
+++ b/adventure-editor/src/main/resources/projectTmpl/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Sep 21 13:08:26 CEST 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip
diff --git a/adventure-editor/src/main/resources/projectTmpl/gradlew b/adventure-editor/src/main/resources/projectTmpl/gradlew
new file mode 100755
index 000000000..1b6c78733
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/adventure-composer/src/main/resources/projectTmpl/gradlew.bat b/adventure-editor/src/main/resources/projectTmpl/gradlew.bat
old mode 100644
new mode 100755
similarity index 64%
rename from adventure-composer/src/main/resources/projectTmpl/gradlew.bat
rename to adventure-editor/src/main/resources/projectTmpl/gradlew.bat
index aec99730b..ac1b06f93
--- a/adventure-composer/src/main/resources/projectTmpl/gradlew.bat
+++ b/adventure-editor/src/main/resources/projectTmpl/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,20 +24,23 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/Info.plist.xml b/adventure-editor/src/main/resources/projectTmpl/ios/Info.plist.xml
new file mode 100644
index 000000000..2b93e03c9
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/ios/Info.plist.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>UIRequiresFullScreen</key>
+        <string>yes</string>
+        <key>MinimumOSVersion</key>
+        <string>12.0</string>
+
+        <key>CFBundleDevelopmentRegion</key>
+        <string>en</string>
+        <key>CFBundleDisplayName</key>
+        <string>${app.name}</string>
+        <key>CFBundleExecutable</key>
+        <string>${app.executable}</string>
+        <key>CFBundleIdentifier</key>
+        <string>${app.id}</string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>6.0</string>
+        <key>CFBundleName</key>
+        <string>${app.name}</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>${app.version}</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>${app.build}</string>
+        <key>LSRequiresIPhoneOS</key>
+        <true/>
+        <key>UIViewControllerBasedStatusBarAppearance</key>
+        <false/>
+        <key>UIStatusBarHidden</key>
+        <true/>
+        <key>UIDeviceFamily</key>
+        <array>
+            <integer>1</integer>
+            <integer>2</integer>
+        </array>
+        <key>UIRequiredDeviceCapabilities</key>
+        <array>
+            <!--  <string>opengles-2</string> -->
+            <string>arm64</string>
+        </array>
+        <key>UISupportedInterfaceOrientations</key>
+        <array>
+            <string>UIInterfaceOrientationLandscapeLeft</string>
+            <string>UIInterfaceOrientationLandscapeRight</string>
+        </array>
+        <key>CFBundleIconName</key>
+        <string>AppIcon</string>
+
+        <key>GCSupportedGameControllers</key>
+        <array>
+            <dict>
+                <key>ProfileName</key>
+                <string>ExtendedGamepad</string>
+            </dict>
+        </array>
+        <key>GCSupportsControllerUserInteraction</key>
+        <true/>
+    </dict>
+</plist>
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/build.gradle b/adventure-editor/src/main/resources/projectTmpl/ios/build.gradle
new file mode 100644
index 000000000..3701237a1
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/ios/build.gradle
@@ -0,0 +1,39 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.mobidevelop.robovm:robovm-gradle-plugin:$roboVMVersion"
+    }
+}
+
+apply plugin: 'java-library'
+apply plugin: 'robovm'
+
+[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+ext {
+    mainClassName = "com.bladecoder.engine.IOSLauncher"
+}
+
+launchIPhoneSimulator.dependsOn build
+launchIPadSimulator.dependsOn build
+launchIOSDevice.dependsOn build
+createIPA.dependsOn build
+processResources.dependsOn ':core:setVersion'
+
+robovm {
+    archs = "arm64"
+}
+
+dependencies {
+    implementation project(':core')
+    implementation "com.mobidevelop.robovm:robovm-rt:$roboVMVersion"
+    implementation "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
+    implementation "com.badlogicgames.gdx:gdx-backend-robovm-metalangle:$gdxVersion"
+    implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
+    implementation "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
+    implementation "com.badlogicgames.gdx-controllers:gdx-controllers-ios:$gdxControllersVersion"
+}
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-1024w-1366h@2x~ipad.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-1024w-1366h@2x~ipad.png
new file mode 100644
index 000000000..113bcba67
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-1024w-1366h@2x~ipad.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-375w-667h@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-375w-667h@2x.png
new file mode 100644
index 000000000..e84978071
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-375w-667h@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-375w-812h@3x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-375w-812h@3x.png
new file mode 100644
index 000000000..8df3504e5
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-375w-812h@3x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-414w-736h@3x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-414w-736h@3x.png
new file mode 100644
index 000000000..4175413c0
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-414w-736h@3x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-568h@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-568h@2x.png
new file mode 100644
index 000000000..075fe48cb
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default-568h@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Default.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default.png
new file mode 100644
index 000000000..465aec434
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Default@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default@2x.png
new file mode 100644
index 000000000..634480a29
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Default@2x~ipad.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default@2x~ipad.png
new file mode 100644
index 000000000..9efbfc6d8
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default@2x~ipad.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Default~ipad.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default~ipad.png
new file mode 100644
index 000000000..314f19bb4
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Default~ipad.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/Contents.json b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..9ed19e123
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,116 @@
+{
+  "images" : [
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "iphone-notification-icon-20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "iphone-notification-icon-20@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "iphone-spotlight-settings-icon-29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "iphone-spotlight-settings-icon-29@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "iphone-spotlight-icon-40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "iphone-spotlight-icon-40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "iphone-app-icon-60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "iphone-app-icon-60@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "ipad-notifications-icon-20@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "ipad-notifications-icon-20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "ipad-settings-icon-29@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "ipad-settings-icon-29@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "ipad-spotlight-icon-40@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "ipad-spotlight-icon-40@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "ipad-app-icon-76@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "ipad-app-icon-76@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "ipad-pro-app-icon-83.5@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "app-store-icon-1024@1x.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/app-store-icon-1024@1x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/app-store-icon-1024@1x.png
new file mode 100644
index 000000000..9dd840af6
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/app-store-icon-1024@1x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@1x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@1x.png
new file mode 100644
index 000000000..63e2d934d
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@1x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@2x.png
new file mode 100644
index 000000000..05b44c38e
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@1x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@1x.png
new file mode 100644
index 000000000..96a0295bd
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@1x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@2x.png
new file mode 100644
index 000000000..0a96cb38c
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-pro-app-icon-83.5@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-pro-app-icon-83.5@2x.png
new file mode 100644
index 000000000..34af8bb78
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-pro-app-icon-83.5@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@1x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@1x.png
new file mode 100644
index 000000000..800cf1ab4
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@1x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@2x.png
new file mode 100644
index 000000000..8e2f18f1e
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@1x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@1x.png
new file mode 100644
index 000000000..0a96cb38c
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@1x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@2x.png
new file mode 100644
index 000000000..f2cf46660
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@2x.png
new file mode 100644
index 000000000..28a6f79cb
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@3x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@3x.png
new file mode 100644
index 000000000..4c37e27ac
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@3x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@2x.png
new file mode 100644
index 000000000..0a96cb38c
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@3x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@3x.png
new file mode 100644
index 000000000..af5cffd7f
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@3x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@2x.png
new file mode 100644
index 000000000..f2cf46660
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@3x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@3x.png
new file mode 100644
index 000000000..28a6f79cb
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@3x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@2x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@2x.png
new file mode 100644
index 000000000..8e2f18f1e
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@2x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@3x.png b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@3x.png
new file mode 100644
index 000000000..ca47b9473
Binary files /dev/null and b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@3x.png differ
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/Contents.json b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/Contents.json
new file mode 100644
index 000000000..2d92bd53f
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/ios/data/Media.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/robovm.properties b/adventure-editor/src/main/resources/projectTmpl/ios/robovm.properties
similarity index 53%
rename from adventure-composer/src/main/resources/projectTmpl/ios/robovm.properties
rename to adventure-editor/src/main/resources/projectTmpl/ios/robovm.properties
index fcf15b903..05619e28e 100644
--- a/adventure-composer/src/main/resources/projectTmpl/ios/robovm.properties
+++ b/adventure-editor/src/main/resources/projectTmpl/ios/robovm.properties
@@ -1,6 +1,6 @@
 app.version=1.0
-app.id=%PACKAGE%.IOSLauncher
-app.mainclass=%PACKAGE%.IOSLauncher
+app.id=%PACKAGE%
+app.mainclass=com.bladecoder.engine.IOSLauncher
 app.executable=IOSLauncher
 app.build=1
 app.name=%APP_NAME%
diff --git a/adventure-editor/src/main/resources/projectTmpl/ios/robovm.xml b/adventure-editor/src/main/resources/projectTmpl/ios/robovm.xml
new file mode 100644
index 000000000..8e322b42e
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/ios/robovm.xml
@@ -0,0 +1,50 @@
+<config>
+    <executableName>${app.executable}</executableName>
+    <mainClass>${app.mainclass}</mainClass>
+    <os>ios</os>
+    <target>ios</target>
+    <iosInfoPList>Info.plist.xml</iosInfoPList>
+    <resources>
+        <resource>
+            <directory>../assets</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+            <skipPngCrush>true</skipPngCrush>
+        </resource>
+        <resource>
+            <directory>data</directory>
+        </resource>
+    </resources>
+    <forceLinkClasses>
+        <pattern>com.bladecoder.engine.**</pattern>
+        <pattern>com.badlogic.gdx.scenes.scene2d.ui.*</pattern>
+        <pattern>com.badlogic.gdx.graphics.g3d.particles.**</pattern>
+        <pattern>com.android.okhttp.HttpHandler</pattern>
+        <pattern>com.android.okhttp.HttpsHandler</pattern>
+        <pattern>com.android.org.conscrypt.**</pattern>
+        <pattern>com.android.org.bouncycastle.jce.provider.BouncyCastleProvider</pattern>
+        <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.BC$Mappings</pattern>
+        <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi</pattern>
+        <pattern>com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std</pattern>
+        <pattern>com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi</pattern>
+        <pattern>com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL</pattern>
+        <pattern>org.apache.harmony.security.provider.cert.DRLCertFactory</pattern>
+        <pattern>org.apache.harmony.security.provider.crypto.CryptoProvider</pattern>
+        <pattern>com.badlogic.gdx.controllers.IosControllerManager</pattern>
+    </forceLinkClasses>
+    <libs>
+        <lib>z</lib>
+    </libs>
+    <frameworks>
+        <framework>UIKit</framework>
+        <!-- <framework>OpenGLES</framework> -->
+        <framework>QuartzCore</framework>
+        <framework>CoreGraphics</framework>
+        <framework>OpenAL</framework>
+        <framework>AudioToolbox</framework>
+        <framework>AVFoundation</framework>
+        <framework>GameController</framework>
+    </frameworks>
+</config>
+
diff --git a/adventure-composer/src/main/resources/projectTmpl/ios/src/IOSLauncher b/adventure-editor/src/main/resources/projectTmpl/ios/src/IOSLauncher
similarity index 95%
rename from adventure-composer/src/main/resources/projectTmpl/ios/src/IOSLauncher
rename to adventure-editor/src/main/resources/projectTmpl/ios/src/IOSLauncher
index 38831be67..11b966e44 100644
--- a/adventure-composer/src/main/resources/projectTmpl/ios/src/IOSLauncher
+++ b/adventure-editor/src/main/resources/projectTmpl/ios/src/IOSLauncher
@@ -1,4 +1,4 @@
-package %PACKAGE%.ios;
+package com.bladecoder.engine;
 
 import org.robovm.apple.foundation.NSAutoreleasePool;
 import org.robovm.apple.uikit.UIApplication;
diff --git a/adventure-composer/src/main/resources/projectTmpl/local.properties b/adventure-editor/src/main/resources/projectTmpl/local.properties
similarity index 100%
rename from adventure-composer/src/main/resources/projectTmpl/local.properties
rename to adventure-editor/src/main/resources/projectTmpl/local.properties
diff --git a/adventure-editor/src/main/resources/projectTmpl/settings.gradle b/adventure-editor/src/main/resources/projectTmpl/settings.gradle
new file mode 100644
index 000000000..1770f2dc6
--- /dev/null
+++ b/adventure-editor/src/main/resources/projectTmpl/settings.gradle
@@ -0,0 +1,17 @@
+include 'core', 'desktop', 'ios'
+
+// include android project only when calling a subproject task or a task without subproject
+def tasks=gradle.startParameter.getTaskNames()
+def includeAndroid=false
+
+for(t in tasks) {
+    if(t.indexOf(':') == -1 || t.contains("android:")) {
+        println "INCLUDING ANDROID PROJECT"
+        includeAndroid = true
+        break;
+    }
+}
+
+if (includeAndroid) {
+   include 'android'
+}
\ No newline at end of file
diff --git a/adventure-editor/src/main/resources/skin/BladeSkin/PaytoneOne.ttf b/adventure-editor/src/main/resources/skin/BladeSkin/PaytoneOne.ttf
new file mode 100644
index 000000000..4ef776f48
Binary files /dev/null and b/adventure-editor/src/main/resources/skin/BladeSkin/PaytoneOne.ttf differ
diff --git a/adventure-editor/src/main/resources/skin/BladeSkin/Ubuntu-L.ttf b/adventure-editor/src/main/resources/skin/BladeSkin/Ubuntu-L.ttf
new file mode 100644
index 000000000..ed0f5bce8
Binary files /dev/null and b/adventure-editor/src/main/resources/skin/BladeSkin/Ubuntu-L.ttf differ
diff --git a/adventure-editor/src/main/resources/skin/BladeSkin/Ubuntu-M.ttf b/adventure-editor/src/main/resources/skin/BladeSkin/Ubuntu-M.ttf
new file mode 100644
index 000000000..ca9c03a47
Binary files /dev/null and b/adventure-editor/src/main/resources/skin/BladeSkin/Ubuntu-M.ttf differ
diff --git a/adventure-composer/src/main/resources/skin/BladeSkin/BladeSkin-ldpi.atlas b/adventure-editor/src/main/resources/skin/BladeSkin/blade-skin.atlas
similarity index 84%
rename from adventure-composer/src/main/resources/skin/BladeSkin/BladeSkin-ldpi.atlas
rename to adventure-editor/src/main/resources/skin/BladeSkin/blade-skin.atlas
index 4514c921a..876ae5f12 100644
--- a/adventure-composer/src/main/resources/skin/BladeSkin/BladeSkin-ldpi.atlas
+++ b/adventure-editor/src/main/resources/skin/BladeSkin/blade-skin.atlas
@@ -1,33 +1,33 @@
 
-BladeSkin-ldpi.png
-size: 1270,110
+blade-skin.png
+size: 332,78
 format: RGBA8888
-filter: MipMapLinearNearest,Nearest
+filter: Nearest,Nearest
 repeat: none
 btn_check_off
   rotate: false
-  xy: 1091, 85
+  xy: 88, 53
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 btn_check_on
   rotate: false
-  xy: 1117, 85
+  xy: 114, 53
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 btn_check_on_focused
   rotate: false
-  xy: 1143, 85
+  xy: 140, 53
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 btn_default_disabled
   rotate: false
-  xy: 1247, 85
+  xy: 111, 27
   size: 19, 24
   split: 8, 8, 12, 10
   pad: 8, 8, 6, 6
@@ -36,7 +36,7 @@ btn_default_disabled
   index: -1
 btn_default_focused
   rotate: false
-  xy: 1070, 44
+  xy: 41, 1
   size: 19, 24
   split: 8, 8, 12, 10
   pad: 8, 8, 6, 6
@@ -45,7 +45,7 @@ btn_default_focused
   index: -1
 btn_default_normal
   rotate: false
-  xy: 1070, 18
+  xy: 132, 27
   size: 19, 24
   split: 8, 8, 12, 10
   pad: 8, 8, 6, 6
@@ -54,7 +54,7 @@ btn_default_normal
   index: -1
 btn_default_pressed
   rotate: false
-  xy: 1091, 33
+  xy: 62, 1
   size: 19, 24
   split: 8, 8, 12, 10
   pad: 8, 8, 6, 6
@@ -63,28 +63,28 @@ btn_default_pressed
   index: -1
 btn_radio_off
   rotate: false
-  xy: 1169, 85
+  xy: 166, 53
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 btn_radio_on
   rotate: false
-  xy: 1195, 85
+  xy: 192, 53
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 btn_radio_on_focused
   rotate: false
-  xy: 1221, 85
+  xy: 218, 53
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 btn_toggle_off_disabled
   rotate: false
-  xy: 1169, 59
+  xy: 153, 27
   size: 19, 24
   split: 9, 9, 12, 10
   pad: 8, 8, 6, 6
@@ -93,7 +93,7 @@ btn_toggle_off_disabled
   index: -1
 btn_toggle_off_focused
   rotate: false
-  xy: 1112, 33
+  xy: 83, 1
   size: 19, 24
   split: 9, 9, 12, 10
   pad: 8, 8, 6, 6
@@ -102,7 +102,7 @@ btn_toggle_off_focused
   index: -1
 btn_toggle_off_normal
   rotate: false
-  xy: 1190, 59
+  xy: 104, 1
   size: 19, 24
   split: 9, 9, 12, 10
   pad: 8, 8, 6, 6
@@ -111,7 +111,7 @@ btn_toggle_off_normal
   index: -1
 btn_toggle_on_focused
   rotate: false
-  xy: 1133, 33
+  xy: 125, 1
   size: 19, 24
   split: 9, 9, 12, 10
   pad: 8, 8, 6, 6
@@ -120,7 +120,7 @@ btn_toggle_on_focused
   index: -1
 btn_toggle_on_normal
   rotate: false
-  xy: 1211, 59
+  xy: 146, 1
   size: 19, 24
   split: 9, 9, 12, 10
   pad: 8, 8, 6, 6
@@ -129,7 +129,7 @@ btn_toggle_on_normal
   index: -1
 btn_toggle_on_pressed
   rotate: false
-  xy: 1154, 33
+  xy: 167, 1
   size: 19, 24
   split: 9, 9, 12, 10
   pad: 8, 8, 6, 6
@@ -138,28 +138,21 @@ btn_toggle_on_pressed
   index: -1
 icon-blitz
   rotate: false
-  xy: 1050, 33
+  xy: 1, 1
   size: 18, 30
   orig: 18, 30
   offset: 0, 0
   index: -1
 icon-blitz_pressed
   rotate: false
-  xy: 1050, 1
+  xy: 21, 1
   size: 18, 30
   orig: 18, 30
   offset: 0, 0
   index: -1
-paytone-one-18
-  rotate: false
-  xy: 1, 61
-  size: 1024, 48
-  orig: 1024, 48
-  offset: 0, 0
-  index: 0
 scroll
   rotate: false
-  xy: 1253, 80
+  xy: 69, 33
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -167,7 +160,7 @@ scroll
   index: -1
 scroll_corner
   rotate: false
-  xy: 1027, 1
+  xy: 88, 30
   size: 21, 21
   split: 10, 10, 10, 10
   orig: 21, 21
@@ -175,7 +168,7 @@ scroll_corner
   index: -1
 scroll_horizontal
   rotate: false
-  xy: 1027, 88
+  xy: 1, 56
   size: 39, 21
   split: 18, 19, 10, 10
   pad: 9, 9, 9, 9
@@ -184,7 +177,7 @@ scroll_horizontal
   index: -1
 scroll_horizontal_knob
   rotate: false
-  xy: 1027, 65
+  xy: 1, 33
   size: 39, 21
   split: 18, 19, 10, 10
   pad: 9, 9, 9, 9
@@ -193,7 +186,7 @@ scroll_horizontal_knob
   index: -1
 scroll_opaque
   rotate: false
-  xy: 1086, 13
+  xy: 297, 34
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -201,7 +194,7 @@ scroll_opaque
   index: -1
 scroll_vertical
   rotate: false
-  xy: 1068, 70
+  xy: 42, 38
   size: 21, 39
   split: 10, 10, 18, 20
   pad: 9, 9, 9, 9
@@ -210,7 +203,7 @@ scroll_vertical
   index: -1
 scroll_vertical_knob
   rotate: false
-  xy: 1027, 24
+  xy: 65, 38
   size: 21, 39
   split: 10, 10, 18, 19
   pad: 9, 9, 9, 9
@@ -219,14 +212,14 @@ scroll_vertical_knob
   index: -1
 scrubber_control_normal
   rotate: false
-  xy: 1091, 59
+  xy: 244, 53
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 scrubber_primary
   rotate: false
-  xy: 1252, 43
+  xy: 42, 27
   size: 7, 9
   split: 0, 0, 0, 7
   pad: 0, 0, 0, 0
@@ -235,7 +228,7 @@ scrubber_primary
   index: -1
 scrubber_secondary
   rotate: false
-  xy: 1261, 43
+  xy: 51, 27
   size: 7, 9
   split: 0, 0, 0, 7
   pad: 0, 0, 0, 0
@@ -244,7 +237,7 @@ scrubber_secondary
   index: -1
 scrubber_track
   rotate: false
-  xy: 1232, 22
+  xy: 60, 27
   size: 7, 9
   split: 0, 0, 0, 7
   pad: 0, 0, 0, 0
@@ -253,7 +246,7 @@ scrubber_track
   index: -1
 scrubber_vertical_primary
   rotate: false
-  xy: 1238, 34
+  xy: 322, 70
   size: 9, 7
   split: 0, 7, 0, 0
   pad: 0, 0, 0, 0
@@ -262,7 +255,7 @@ scrubber_vertical_primary
   index: -1
 scrubber_vertical_secondary
   rotate: false
-  xy: 1249, 34
+  xy: 322, 61
   size: 9, 7
   split: 0, 7, 0, 0
   pad: 0, 0, 0, 0
@@ -271,7 +264,7 @@ scrubber_vertical_secondary
   index: -1
 scrubber_vertical_track
   rotate: false
-  xy: 1260, 34
+  xy: 322, 52
   size: 9, 7
   split: 0, 7, 0, 0
   pad: 0, 0, 0, 0
@@ -280,7 +273,7 @@ scrubber_vertical_track
   index: -1
 spinner_default
   rotate: false
-  xy: 1253, 54
+  xy: 272, 1
   size: 16, 24
   split: 3, 11, 3, 19
   pad: 3, 11, 5, 6
@@ -289,7 +282,7 @@ spinner_default
   index: -1
 spinner_focused
   rotate: false
-  xy: 1196, 7
+  xy: 279, 27
   size: 16, 24
   split: 3, 11, 3, 19
   pad: 3, 11, 5, 6
@@ -298,7 +291,7 @@ spinner_focused
   index: -1
 spinner_pressed
   rotate: false
-  xy: 1214, 7
+  xy: 290, 1
   size: 16, 24
   split: 3, 11, 3, 19
   pad: 3, 11, 5, 6
@@ -307,7 +300,7 @@ spinner_pressed
   index: -1
 splitpane_horizontal
   rotate: false
-  xy: 1070, 4
+  xy: 297, 39
   size: 14, 12
   split: 0, 14, 2, 9
   pad: 7, 6, 2, 8
@@ -316,7 +309,7 @@ splitpane_horizontal
   index: -1
 splitpane_vertical
   rotate: false
-  xy: 1238, 43
+  xy: 313, 36
   size: 12, 14
   split: 2, 9, 0, 14
   pad: 2, 8, 7, 6
@@ -325,7 +318,7 @@ splitpane_vertical
   index: -1
 text
   rotate: false
-  xy: 1232, 59
+  xy: 174, 27
   size: 19, 24
   split: 8, 8, 12, 10
   pad: 8, 8, 6, 6
@@ -334,7 +327,7 @@ text
   index: -1
 text_focused
   rotate: false
-  xy: 1175, 33
+  xy: 188, 1
   size: 19, 24
   split: 8, 8, 12, 10
   pad: 8, 8, 6, 6
@@ -343,7 +336,7 @@ text_focused
   index: -1
 text_focused_opaque
   rotate: false
-  xy: 1196, 33
+  xy: 195, 27
   size: 19, 24
   split: 8, 8, 12, 10
   pad: 8, 8, 6, 6
@@ -352,7 +345,7 @@ text_focused_opaque
   index: -1
 text_opaque
   rotate: false
-  xy: 1217, 33
+  xy: 209, 1
   size: 19, 24
   split: 8, 8, 12, 10
   pad: 8, 8, 6, 6
@@ -361,7 +354,7 @@ text_opaque
   index: -1
 text_selected
   rotate: false
-  xy: 1091, 7
+  xy: 216, 27
   size: 19, 24
   split: 8, 8, 12, 10
   pad: 8, 8, 6, 6
@@ -370,7 +363,7 @@ text_selected
   index: -1
 text_selected_opaque
   rotate: false
-  xy: 1112, 7
+  xy: 230, 1
   size: 19, 24
   split: 8, 8, 12, 10
   pad: 8, 8, 6, 6
@@ -379,7 +372,7 @@ text_selected_opaque
   index: -1
 textfield_cursor
   rotate: false
-  xy: 1070, 1
+  xy: 69, 27
   size: 2, 1
   split: 0, 1, 0, 0
   orig: 2, 1
@@ -387,7 +380,7 @@ textfield_cursor
   index: -1
 textfield_default
   rotate: false
-  xy: 1133, 7
+  xy: 237, 27
   size: 19, 24
   split: 8, 8, 15, 7
   pad: 8, 8, 5, 6
@@ -396,7 +389,7 @@ textfield_default
   index: -1
 textfield_disabled
   rotate: false
-  xy: 1154, 7
+  xy: 251, 1
   size: 19, 24
   split: 8, 8, 15, 7
   pad: 8, 8, 5, 6
@@ -405,7 +398,7 @@ textfield_disabled
   index: -1
 textfield_focused
   rotate: false
-  xy: 1175, 7
+  xy: 258, 27
   size: 19, 24
   split: 8, 8, 15, 7
   pad: 8, 8, 5, 5
@@ -414,49 +407,35 @@ textfield_focused
   index: -1
 textfield_selection
   rotate: false
-  xy: 1074, 1
+  xy: 69, 30
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 tree_minus
   rotate: false
-  xy: 1117, 59
+  xy: 270, 53
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 tree_plus
   rotate: false
-  xy: 1143, 59
+  xy: 296, 53
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-ubuntu-light-12
-  rotate: false
-  xy: 1, 8
-  size: 1024, 23
-  orig: 1024, 23
-  offset: 0, 0
-  index: 0
-ubuntu-medium-14
-  rotate: false
-  xy: 1, 33
-  size: 1024, 26
-  orig: 1024, 26
-  offset: 0, 0
-  index: 0
 white_pixel
   rotate: false
-  xy: 1077, 1
-  size: 1, 1
-  orig: 1, 1
+  xy: 327, 47
+  size: 3, 3
+  orig: 3, 3
   offset: 0, 0
   index: -1
 window
   rotate: false
-  xy: 1268, 80
+  xy: 308, 8
   size: 1, 29
   split: 0, 0, 28, 0
   orig: 1, 29
diff --git a/adventure-composer/src/main/resources/skin/BladeSkin/BladeSkin-ldpi.json b/adventure-editor/src/main/resources/skin/BladeSkin/blade-skin.json
similarity index 81%
rename from adventure-composer/src/main/resources/skin/BladeSkin/BladeSkin-ldpi.json
rename to adventure-editor/src/main/resources/skin/BladeSkin/blade-skin.json
index 8e6c9e06a..307e3a81d 100644
--- a/adventure-composer/src/main/resources/skin/BladeSkin/BladeSkin-ldpi.json
+++ b/adventure-editor/src/main/resources/skin/BladeSkin/blade-skin.json
@@ -1,96 +1,146 @@
-{
-	com.badlogic.gdx.graphics.g2d.BitmapFont: { 
-		default-font: {file: ubuntu-medium-14.fnt}, 
-		thin-font: {file: ubuntu-light-12.fnt}, 
-		big-font: {file: paytone-one-18.fnt}
-	},
-	com.badlogic.gdx.graphics.Color: {
-		green: { a: 1, b: 0, g: 1, r: 0 },
-		white: { a: 1, b: 1, g: 1, r: 1 },
-		red: { a: 1, b: 0, g: 0, r: 1 },
-		black: { a: 1, b: 0, g: 0, r: 0 },
-		text-dark: { a: 1, b: 1, g: 1, r: 1 },
-		text-light: { a: 1, b: 0.7, g: 0.7, r: 0.7 },
-		text-light-dark: { a: 1, b: 0, g: 0, r: 0 },
-		holo-blue: { a: 1, b: 0.89, g: 0.7, r: 0.2 }
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
-		dialogDim: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 0.45 } },
-		message: { name: white_pixel, color: holo-blue },
-		trans: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 0.75 } }
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle: {
-		default: { fontColorUnselected: text-dark, selection: text_selected, fontColorSelected: text-dark, font: default-font },
-		opaque: { fontColorUnselected: text-dark, selection: text_selected_opaque, fontColorSelected: text-dark, font: default-font },
-		default-thin: { fontColorUnselected: text-dark, selection: text_selected, fontColorSelected: text-dark, font: thin-font },
-		opaque-thin: { fontColorUnselected: text-dark, selection: text_selected_opaque, fontColorSelected: text-dark, font: thin-font }
-	},
-	com.bladecoder.engineeditor.ui.components.CustomList$CustomListStyle: {
-		default: {  fontColorUnselected: text-dark, selection: text_selected, fontColorSelected: text-dark, font: default-font, subtitleFont: thin-font},
-	},	
-	com.badlogic.gdx.scenes.scene2d.ui.ScrollPane$ScrollPaneStyle: {
-		default: {vScroll: scroll_vertical, hScrollKnob: scroll_horizontal_knob, background: btn_default_disabled, hScroll: scroll_horizontal, vScrollKnob: scroll_vertical_knob, corner: scroll_corner},
-		opaque: { vScroll: scroll_vertical, hScrollKnob: scroll_horizontal_knob, background: scroll_opaque, hScroll: scroll_horizontal, vScrollKnob: scroll_vertical_knob, corner: scroll_corner}
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.Button$ButtonStyle: {
-		default: { up: btn_default_normal, down: btn_default_pressed, over: btn_default_focused, disabled: btn_default_disabled},
-		toggle: { up: btn_toggle_off_normal, down: btn_toggle_on_pressed, over: btn_toggle_off_focused, checked: btn_toggle_on_normal, checkedOver: btn_toggle_on_focused, disabled: btn_toggle_off_disabled },
-		plain: { down: btn_default_pressed, over: btn_default_focused},
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
-		default: { up: btn_default_normal, down: btn_default_pressed, over: btn_default_focused, disabled: btn_default_disabled, font: default-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, disabledFontColor: text-dark, checked: btn_default_pressed},
-		toggle: { up: btn_toggle_off_normal, down: btn_toggle_on_pressed, over: btn_toggle_off_focused, checked: btn_toggle_on_normal, checkedOver: btn_toggle_on_focused, disabled: btn_toggle_off_disabled, font: default-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark },
-		default-thin: { up: btn_default_normal, down: btn_default_pressed, over: btn_default_focused, disabled: btn_default_disabled, font: thin-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, disabledFontColor: text-dark},
-		toggle-thin: { up: btn_toggle_off_normal, down: btn_toggle_on_pressed, over: btn_toggle_off_focused, checked: btn_toggle_on_normal, checkedOver: btn_toggle_on_focused, disabled: btn_toggle_off_disabled, font: thin-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark }
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: {
-		default: { up: btn_default_normal, down: btn_default_pressed, over: btn_default_focused, disabled: btn_default_disabled, imageUp: icon-blitz, imageDown: icon-blitz, imageOver: icon-blitz, imageDisabled: icon-blitz},
-		toggle: { up: btn_toggle_off_normal, down: btn_toggle_on_pressed, over: btn_toggle_off_focused, checked: btn_toggle_on_normal, checkedOver: btn_toggle_on_focused, disabled: btn_toggle_off_disabled, imageUp: icon-blitz, imageDown: icon-blitz, imageOver: icon-blitz, imageChecked: icon-blitz_pressed, imageCheckedOver: icon-blitz_pressed, imageDisabled: icon-blitz }
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.SelectBox$SelectBoxStyle: {
-		default: { background: spinner_default, backgroundOver: spinner_focused, backgroundOpen: spinner_pressed, listStyle: default, scrollStyle: opaque, font: default-font, fontColor: text-dark },
-		default-thin: { background: spinner_default, backgroundOver: spinner_focused, backgroundOpen: spinner_pressed, listStyle: default-thin, scrollStyle: opaque, font: thin-font, fontColor: text-dark }
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.SplitPane$SplitPaneStyle: {
-		default-vertical: { handle: splitpane_vertical },
-		default-horizontal: { handle: splitpane_horizontal }
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.Window$WindowStyle: {
-		default: { titleFont: big-font, background: window, titleFontColor: text-dark },
-		dialog: { titleFont: big-font, background: window, titleFontColor: text-dark, stageBackground: dialogDim },
-		default-thin: { titleFont: thin-font, background: window, titleFontColor: text-dark },
-		dialog-thin: { titleFont: thin-font, background: window, titleFontColor: text-dark, stageBackground: dialogDim }
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
-		default-horizontal: { background: scrubber_track, knob: scrubber_control_normal},
-		default-vertical: { background: scrubber_vertical_track, knob: scrubber_control_normal},
-		left-horizontal: { background: scrubber_track, knob: scrubber_control_normal, knobBefore: scrubber_primary, knobAfter: scrubber_secondary},
-		right-horizontal: { background: scrubber_track, knob: scrubber_control_normal, knobBefore: scrubber_secondary, knobAfter: scrubber_primary}, 
-		up-vertical: { background: scrubber_vertical_track, knob: scrubber_control_normal, knobBefore: scrubber_vertical_primary, knobAfter: scrubber_vertical_secondary},
-		down-vertical: { background: scrubber_vertical_track, knob: scrubber_control_normal, knobBefore: scrubber_vertical_secondary, knobAfter: scrubber_vertical_primary},
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
-		default: { font: default-font, fontColor: text-dark , background: text},
-		subtitle: { font: thin-font, fontColor: text-light , background: text},
-		message: { font: big-font, fontColor: text-dark , background: message},
-		big: { font: big-font, fontColor: text-dark}
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
-		default: { selection: textfield_selection, background: textfield_default, focusedBackground: textfield_focused, disabledBackground: textfield_disabled, font: default-font, fontColor: text-dark, focusedFontColor: text-dark, disabledFontColor: text-dark, cursor: textfield_cursor, messageFont: default-font, messageFontColor: text-dark }
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.CheckBox$CheckBoxStyle: {
-		default: { up: text, down: btn_default_pressed, over: btn_default_focused, checked: text, checkedOver: btn_default_focused, disabled: btn_default_disabled, font: default-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark, checkboxOn: btn_check_on, checkboxOff: btn_check_off, checkboxOver: btn_check_on_focused},
-		default-thin: { up: text, down: btn_default_pressed, over: btn_default_focused, checked: text, checkedOver: btn_default_focused, disabled: btn_default_disabled, font: thin-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark, checkboxOn: btn_check_on, checkboxOff: btn_check_off, checkboxOver: btn_check_on_focused},
-		default-radio: { up: text, down: btn_default_pressed, over: btn_default_focused, checked: text, checkedOver: btn_default_focused, disabled: btn_default_disabled, font: default-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark, checkboxOn: btn_radio_on, checkboxOff: btn_radio_off, checkboxOver: btn_radio_on_focused},
-		default-thin-radio: { up: text, down: btn_default_pressed, over: btn_default_focused, checked: text, checkedOver: btn_default_focused, disabled: btn_default_disabled, font: thin-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark, checkboxOn: btn_radio_on, checkboxOff: btn_radio_off, checkboxOver: btn_radio_on_focused}
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle: {
-		default: { fontColorUnselected: text-dark, selection: text_selected, fontColorSelected: text-dark, font: default-font }
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.Touchpad$TouchpadStyle: {
-		default: { background: text, knob: scrubber_control_normal }
-	},
-	com.badlogic.gdx.scenes.scene2d.ui.Tree$TreeStyle: {
-		default: { minus: tree_minus, plus: tree_plus, over: text_focused, selection: text_selected , background: text_opaque}
-	}
-}
+{
+	com.badlogic.gdx.graphics.g2d.BitmapFont: { 
+		default-font: {file: Ubuntu-M.ttf, size: 12},
+		thin-font: {file: Ubuntu-L.ttf, size: 10}, 
+		big-font:  {file: PaytoneOne.ttf, size: 14}
+	},
+
+
+	com.badlogic.gdx.graphics.Color: {
+		green: { a: 1, b: 0, g: 1, r: 0 },
+		white: { a: 1, b: 1, g: 1, r: 1 },
+		red: { a: 1, b: 0, g: 0, r: 1 },
+		black: { a: 1, b: 0, g: 0, r: 0 },
+		text-dark: { a: 1, b: 1, g: 1, r: 1 },
+		text-light: { a: 1, b: 0.7, g: 0.7, r: 0.7 },
+		text-light-dark: { a: 1, b: 0, g: 0, r: 0 },
+		holo-blue: { a: 1, b: 0.89, g: 0.7, r: 0.2 },
+		separator-color: { a: 1, b: 0.33, g: 0.33, r: 0.33 }
+		grey: { a: 1, b: 0.5, g: 0.5, r: 0.5 },
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
+		dialogDim: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 0.45 } },
+		message: { name: white_pixel, color: holo-blue },
+		trans: { name: white_pixel, color: { r: 0, g: 0, b: 0, a: 0.75 } },
+		holo-trans: { name: white_pixel, color: { r: 0.2, g: 0.7, b: 0.89, a: 0.5 } },
+		background: { name: white_pixel, color:  { r: 0.07, g: 0.07, b: 0.07, a: 1 } }
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle: {
+		default: { fontColorUnselected: text-dark, selection: text_selected, fontColorSelected: text-dark, font: default-font },
+		opaque: { fontColorUnselected: text-dark, selection: text_selected_opaque, fontColorSelected: text-dark, font: default-font },
+		default-thin: { fontColorUnselected: text-dark, selection: text_selected, fontColorSelected: text-dark, font: thin-font },
+		opaque-thin: { fontColorUnselected: text-dark, selection: text_selected_opaque, fontColorSelected: text-dark, font: thin-font }
+	},
+
+
+	com.bladecoder.engineeditor.ui.panels.CustomList$CustomListStyle: {
+		default: {  fontColorUnselected: text-dark, selection: text_selected, fontColorSelected: text-dark, font: default-font, subtitleFont: thin-font},
+	},	
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.ScrollPane$ScrollPaneStyle: {
+		default: {vScroll: scroll_vertical, hScrollKnob: scroll_horizontal_knob, background: btn_default_disabled, hScroll: scroll_horizontal, vScrollKnob: scroll_vertical_knob, corner: scroll_corner},
+		opaque: { vScroll: scroll_vertical, hScrollKnob: scroll_horizontal_knob, background: scroll_opaque, hScroll: scroll_horizontal, vScrollKnob: scroll_vertical_knob, corner: scroll_corner}
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.Button$ButtonStyle: {
+		default: { up: btn_default_normal, down: btn_default_pressed, over: btn_default_focused, disabled: btn_default_disabled},
+		toggle: { up: btn_toggle_off_normal, down: btn_toggle_on_pressed, over: btn_toggle_off_focused, checked: btn_toggle_on_normal, checkedOver: btn_toggle_on_focused, disabled: btn_toggle_off_disabled },
+		plain: { down: btn_default_pressed, over: holo-trans},
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: {
+		default: { up: btn_default_normal, down: btn_default_pressed, over: btn_default_focused, disabled: btn_default_disabled, font: default-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, disabledFontColor: grey, checked: btn_default_pressed},
+	no-toggled: { up: btn_default_normal, down: btn_default_pressed, over: btn_default_focused, disabled: btn_default_disabled, font: default-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, disabledFontColor: grey},
+		toggle: { up: btn_toggle_off_normal, down: btn_toggle_on_pressed, over: btn_toggle_off_focused, checked: btn_toggle_on_normal, checkedOver: btn_toggle_on_focused, disabled: btn_toggle_off_disabled, font: default-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark },
+		default-thin: { up: btn_default_normal, down: btn_default_pressed, over: btn_default_focused, disabled: btn_default_disabled, font: thin-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, disabledFontColor: text-dark},
+		toggle-thin: { up: btn_toggle_off_normal, down: btn_toggle_on_pressed, over: btn_toggle_off_focused, checked: btn_toggle_on_normal, checkedOver: btn_toggle_on_focused, disabled: btn_toggle_off_disabled, font: thin-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark }
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: {
+		default: { up: btn_default_normal, down: btn_default_pressed, over: btn_default_focused, disabled: btn_default_disabled, imageUp: icon-blitz, imageDown: icon-blitz, imageOver: icon-blitz, imageDisabled: icon-blitz},
+		toggle: { up: btn_toggle_off_normal, down: btn_toggle_on_pressed, over: btn_toggle_off_focused, checked: btn_toggle_on_normal, checkedOver: btn_toggle_on_focused, disabled: btn_toggle_off_disabled, imageUp: icon-blitz, imageDown: icon-blitz, imageOver: icon-blitz, imageChecked: icon-blitz_pressed, imageCheckedOver: icon-blitz_pressed, imageDisabled: icon-blitz }
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.SelectBox$SelectBoxStyle: {
+		default: { background: spinner_default, backgroundOver: spinner_focused, backgroundOpen: spinner_pressed, listStyle: default, scrollStyle: opaque, font: default-font, fontColor: text-dark },
+		default-thin: { background: spinner_default, backgroundOver: spinner_focused, backgroundOpen: spinner_pressed, listStyle: default-thin, scrollStyle: opaque, font: thin-font, fontColor: text-dark }
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.SplitPane$SplitPaneStyle: {
+		default-vertical: { handle: splitpane_vertical },
+		default-horizontal: { handle: splitpane_horizontal }
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.Window$WindowStyle: {
+		default: { titleFont: big-font, background: window, titleFontColor: text-dark },
+		dialog: { titleFont: big-font, background: window, titleFontColor: text-dark, stageBackground: dialogDim },
+		default-thin: { titleFont: thin-font, background: window, titleFontColor: text-dark },
+		dialog-thin: { titleFont: thin-font, background: window, titleFontColor: text-dark, stageBackground: dialogDim }
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
+		default-horizontal: { background: scrubber_track, knob: scrubber_control_normal},
+		default-vertical: { background: scrubber_vertical_track, knob: scrubber_control_normal},
+		left-horizontal: { background: scrubber_track, knob: scrubber_control_normal, knobBefore: scrubber_primary, knobAfter: scrubber_secondary},
+		right-horizontal: { background: scrubber_track, knob: scrubber_control_normal, knobBefore: scrubber_secondary, knobAfter: scrubber_primary}, 
+		up-vertical: { background: scrubber_vertical_track, knob: scrubber_control_normal, knobBefore: scrubber_vertical_primary, knobAfter: scrubber_vertical_secondary},
+		down-vertical: { background: scrubber_vertical_track, knob: scrubber_control_normal, knobBefore: scrubber_vertical_secondary, knobAfter: scrubber_vertical_primary},
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
+		default: { font: default-font, fontColor: text-dark , background: text},
+		subtitle: { font: thin-font, fontColor: text-light , background: text},
+		message: { font: big-font, fontColor: text-dark , background: message},
+		big: { font: big-font, fontColor: text-dark}
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
+		default: { selection: textfield_selection, background: textfield_default, focusedBackground: textfield_focused, disabledBackground: textfield_disabled, font: thin-font, fontColor: text-dark, focusedFontColor: text-dark, disabledFontColor: text-dark, cursor: textfield_cursor, messageFont: default-font, messageFontColor: text-dark }
+		filter: { selection: textfield_selection, background: background, focusedBackground: background, disabledBackground: textfield_disabled, font: thin-font, fontColor: text-dark, focusedFontColor: text-dark, disabledFontColor: text-dark, cursor: textfield_cursor, messageFont: default-font, messageFontColor: text-dark }
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.CheckBox$CheckBoxStyle: {
+		default: { up: text, down: btn_default_pressed, over: btn_default_focused, checked: text, checkedOver: btn_default_focused, disabled: btn_default_disabled, font: default-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark, checkboxOn: btn_check_on, checkboxOff: btn_check_off, checkboxOver: btn_check_on_focused},
+		default-thin: { up: text, down: btn_default_pressed, over: btn_default_focused, checked: text, checkedOver: btn_default_focused, disabled: btn_default_disabled, font: thin-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark, checkboxOn: btn_check_on, checkboxOff: btn_check_off, checkboxOver: btn_check_on_focused},
+		default-radio: { up: text, down: btn_default_pressed, over: btn_default_focused, checked: text, checkedOver: btn_default_focused, disabled: btn_default_disabled, font: default-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark, checkboxOn: btn_radio_on, checkboxOff: btn_radio_off, checkboxOver: btn_radio_on_focused},
+		default-thin-radio: { up: text, down: btn_default_pressed, over: btn_default_focused, checked: text, checkedOver: btn_default_focused, disabled: btn_default_disabled, font: thin-font, fontColor: text-dark , downFontColor: text-dark, overFontColor: text-dark, checkedFontColor: text-dark, checkedOverFontColor: text-dark, disabledFontColor: text-dark, checkboxOn: btn_radio_on, checkboxOff: btn_radio_off, checkboxOver: btn_radio_on_focused}
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.List$ListStyle: {
+		default: { fontColorUnselected: text-dark, selection: text_selected, fontColorSelected: text-dark, font: default-font }
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.Touchpad$TouchpadStyle: {
+		default: { background: text, knob: scrubber_control_normal }
+	},
+
+
+	com.badlogic.gdx.scenes.scene2d.ui.Tree$TreeStyle: {
+		default: { minus: tree_minus, plus: tree_plus, over: text_focused, selection: text_selected , background: text_opaque}
+	},
+
+	com.badlogic.gdx.scenes.scene2d.ui.TextTooltip$TextTooltipStyle: {
+		default: {label: { font: default-font, fontColor: text-dark}, background: message}
+	},
+	
+	com.bladecoder.engineeditor.ui.panels.FilteredSelectBox$FilteredSelectBoxStyle: {
+		default: { background: spinner_default, backgroundOver: spinner_focused, backgroundOpen: spinner_pressed, listStyle: default, scrollStyle: opaque, font: default-font, fontColor: text-dark, textFieldStyle: filter }
+	},
+}
diff --git a/adventure-editor/src/main/resources/skin/BladeSkin/blade-skin.png b/adventure-editor/src/main/resources/skin/BladeSkin/blade-skin.png
new file mode 100644
index 000000000..94b9df7a2
Binary files /dev/null and b/adventure-editor/src/main/resources/skin/BladeSkin/blade-skin.png differ
diff --git a/adventure-composer/src/main/resources/skin/BladeSkin/paytone-one-18.fnt b/adventure-editor/src/main/resources/skin/BladeSkin/paytone-one-18.fnt
similarity index 100%
rename from adventure-composer/src/main/resources/skin/BladeSkin/paytone-one-18.fnt
rename to adventure-editor/src/main/resources/skin/BladeSkin/paytone-one-18.fnt
diff --git a/adventure-composer/src/main/resources/skin/default.fnt b/adventure-editor/src/main/resources/skin/libgdx/default.fnt
similarity index 100%
rename from adventure-composer/src/main/resources/skin/default.fnt
rename to adventure-editor/src/main/resources/skin/libgdx/default.fnt
diff --git a/adventure-composer/src/main/resources/skin/default.png b/adventure-editor/src/main/resources/skin/libgdx/default.png
similarity index 100%
rename from adventure-composer/src/main/resources/skin/default.png
rename to adventure-editor/src/main/resources/skin/libgdx/default.png
diff --git a/adventure-composer/src/main/resources/skin/uiskin.atlas b/adventure-editor/src/main/resources/skin/libgdx/uiskin.atlas
similarity index 100%
rename from adventure-composer/src/main/resources/skin/uiskin.atlas
rename to adventure-editor/src/main/resources/skin/libgdx/uiskin.atlas
diff --git a/adventure-composer/src/main/resources/skin/uiskin.json b/adventure-editor/src/main/resources/skin/libgdx/uiskin.json
similarity index 100%
rename from adventure-composer/src/main/resources/skin/uiskin.json
rename to adventure-editor/src/main/resources/skin/libgdx/uiskin.json
diff --git a/adventure-composer/src/main/resources/skin/uiskin.png b/adventure-editor/src/main/resources/skin/libgdx/uiskin.png
similarity index 100%
rename from adventure-composer/src/main/resources/skin/uiskin.png
rename to adventure-editor/src/main/resources/skin/libgdx/uiskin.png
diff --git a/adventure-editor/src/main/resources/versions.properties b/adventure-editor/src/main/resources/versions.properties
new file mode 100644
index 000000000..987fb2dc4
--- /dev/null
+++ b/adventure-editor/src/main/resources/versions.properties
@@ -0,0 +1,6 @@
+androidAPILevel=35
+androidGradlePluginVersion=8.6.1
+bladeInkVersion=1.2.0
+libgdxVersion=1.13.1-SNAPSHOT
+roboVMVersion=2.3.21
+version=4.4.0-SNAPSHOT
diff --git a/adventure-editor/thirdparty/gdx-particle-editor.jar b/adventure-editor/thirdparty/gdx-particle-editor.jar
new file mode 100755
index 000000000..1234098e4
Binary files /dev/null and b/adventure-editor/thirdparty/gdx-particle-editor.jar differ
diff --git a/blade-engine-spine-plugin/.gitignore b/blade-engine-spine-plugin/.gitignore
new file mode 100644
index 000000000..3c7b40761
--- /dev/null
+++ b/blade-engine-spine-plugin/.gitignore
@@ -0,0 +1,18 @@
+# Java
+*.class
+
+# IDEA
+*.iws
+*.ipr
+*.iml
+out/
+
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# Gradle
+build/
+.gradle/
diff --git a/blade-engine-spine-plugin/README.md b/blade-engine-spine-plugin/README.md
new file mode 100644
index 000000000..9c35f9d0b
--- /dev/null
+++ b/blade-engine-spine-plugin/README.md
@@ -0,0 +1,7 @@
+# Spine Plugin for the Bladecoder Adventure Engine
+
+This plugin allows Spine animation support for the **Bladecoder Adventure Engine**.
+
+More info about creating animations with Spine can be found in the [Spine site](http://esotericsoftware.com/).
+
+
diff --git a/blade-engine-spine-plugin/build.gradle b/blade-engine-spine-plugin/build.gradle
new file mode 100644
index 000000000..c9d951f6f
--- /dev/null
+++ b/blade-engine-spine-plugin/build.gradle
@@ -0,0 +1,111 @@
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+    id 'signing'
+}
+
+group = 'com.bladecoder.engine'
+
+// java
+sourceCompatibility = 1.8
+targetCompatibility=1.8
+[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+
+jar {
+	manifest.attributes += [
+			'github': 'https://github.com/bladecoder/bladecoder-adventure-engine/',
+			'license': 'Apache-2.0, Spine Runtimes Software License',
+			'group': project.group,
+			'version': project.version,
+			'libgdx': libgdxVersion,
+			'java': targetCompatibility,
+			'timestamp': System.currentTimeMillis()
+	]
+}
+
+dependencies {
+  implementation "com.badlogicgames.gdx:gdx:$libgdxVersion"
+  implementation "com.esotericsoftware.spine:spine-libgdx:4.2.7"
+  
+  implementation project(":blade-engine")
+}
+
+
+task sourcesJar(type: Jar) {
+    from sourceSets.main.allJava
+    archiveClassifier = 'sources'
+}
+
+task javadocJar(type: Jar) {
+    from javadoc
+    archiveClassifier = 'javadoc'
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId = 'blade-engine-spine-plugin'
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
+
+            versionMapping {
+                usage('java-api') {
+                    fromResolutionOf('runtimeClasspath')
+                }
+                usage('java-runtime') {
+                    fromResolutionResult()
+                }
+            }
+
+            pom {
+                name = 'Blade Engine Spine Plugin'
+                description = 'Classic point and click adventure game engine - Spine plugin'
+                url = 'https://github.com/bladecoder/bladecoder-adventure-engine'
+
+                licenses {
+                    license {
+                        name='Spine Runtimes Software License'
+                        url='http://esotericsoftware.com/files/license.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'bladecoder'
+                        name = 'Rafael Garcia'
+                        email = 'bladecoder@gmail.com'
+                    }
+                }
+                scm {
+                    connection = 'scm:git@github.com:bladecoder/bladecoder-adventure-engine.git'
+                    developerConnection = 'scm:git@github.com:bladecoder/bladecoder-adventure-engine.git'
+                    url = 'scm:git@github.com:bladecoder/bladecoder-adventure-engine.git'
+                }
+            }
+        }
+    }
+    repositories {
+        maven {
+            def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+            credentials {
+                username findProperty("sonatypeUsername")
+                password findProperty("sonatypePassword")
+            }
+        }
+    }
+}
+
+signing {
+    if(!version.endsWith('SNAPSHOT')) {
+        sign publishing.publications.mavenJava
+    }
+}
+
+
+javadoc {
+    if(JavaVersion.current().isJava9Compatible()) {
+        options.addBooleanOption('html5', true)
+    }
+}
diff --git a/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/actions/SpineSecondaryAnimationAction.java b/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/actions/SpineSecondaryAnimationAction.java
new file mode 100644
index 000000000..7a5811344
--- /dev/null
+++ b/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/actions/SpineSecondaryAnimationAction.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.spine.SpineRenderer;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("ONLY FOR SPINE ACTORS: Sets a secondary animation")
+public class SpineSecondaryAnimationAction implements Action {
+
+	@ActionProperty(required = false)
+	@ActionPropertyDescription("The Animation to set. Empty to clear the secondary animation")
+	private ActorAnimationRef animation;
+
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+	
+	@Override
+	public boolean run(VerbRunner cb) {
+		
+		String actorId = animation.getActorId();
+		
+		SpriteActor a = (SpriteActor) w.getCurrentScene().getActor(actorId, true);
+		
+		if(a.getRenderer() instanceof SpineRenderer) {
+			SpineRenderer r = (SpineRenderer) a.getRenderer();
+			String anim = animation.getAnimationId();
+			
+			if(anim.isEmpty())
+				anim = null;
+			
+			r.setSecondaryAnimation(anim);
+		} else {
+			EngineLogger.error("SpineSecondaryAnimation: The actor renderer has to be of Spine type.");
+		}
+
+		return false;
+	}
+
+}
diff --git a/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/actions/SpineSkinAction.java b/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/actions/SpineSkinAction.java
new file mode 100644
index 000000000..e3e90735a
--- /dev/null
+++ b/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/actions/SpineSkinAction.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.spine.SpineRenderer;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("ONLY FOR SPINE ACTORS: Sets a Skin.")
+public class SpineSkinAction implements Action {
+
+	@ActionPropertyDescription("The target actor")
+	@ActionProperty(required = true)
+	private SceneActorRef actor;
+
+	@ActionProperty(required = false)
+	@ActionPropertyDescription("The Skin. Empty to clear the skin.")
+	private String skin;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		SpriteActor a = (SpriteActor) actor.getActor(w);
+		
+		if(a instanceof SpriteActor && a.getRenderer() instanceof SpineRenderer) {
+			SpineRenderer r = (SpineRenderer) a.getRenderer();
+			
+			r.setSkin(skin);
+		} else {
+			EngineLogger.error("SpineSecondaryAnimation: The actor renderer has to be of Spine type.");
+		}
+
+		return false;
+	}
+
+}
diff --git a/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/spine/SkeletonDataLoader.java b/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/spine/SkeletonDataLoader.java
new file mode 100644
index 000000000..97fa4e4ea
--- /dev/null
+++ b/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/spine/SkeletonDataLoader.java
@@ -0,0 +1,102 @@
+package com.bladecoder.engine.spine;
+
+import com.badlogic.gdx.assets.AssetDescriptor;
+import com.badlogic.gdx.assets.AssetLoaderParameters;
+import com.badlogic.gdx.assets.AssetManager;
+import com.badlogic.gdx.assets.loaders.AssetLoader;
+import com.badlogic.gdx.assets.loaders.AsynchronousAssetLoader;
+import com.badlogic.gdx.assets.loaders.FileHandleResolver;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.utils.Array;
+import com.esotericsoftware.spine.SkeletonBinary;
+import com.esotericsoftware.spine.SkeletonData;
+import com.esotericsoftware.spine.SkeletonJson;
+
+/**
+ * {@link AssetLoader} for {@link SkeletonData} instances. Loads an exported
+ * Spine's skeleton data. The atlas with the images will be loaded as a
+ * dependency. This has to be declared as a {@link SkeletonDataLoaderParameter}
+ * in the {@link AssetManager#load(String, Class, AssetLoaderParameters)} call.
+ * Supports both binary and JSON skeleton format files. If the animation file
+ * name has a 'skel' extension, it will be loaded as binary. Any other extension
+ * will be assumed as JSON.
+ *
+ * Example: suppose you have 'data/spine/character.atlas',
+ * 'data/spine/character.png' and 'data/spine/character.skel'. To load it with
+ * an asset manager, just do the following: *
+ * 
+ * <pre>
+* {@code
+* assetManager.setLoader(SkeletonData.class, new SkeletonDataLoader(new InternalFileHandleResolver()));
+* SkeletonDataLoaderParameter parameter = new SkeletonDataLoaderParameter("data/spine/character.atlas");
+* assetManager.load("data/spine/character.skel", SkeletonData.class, parameter);
+* }
+ * </pre>
+ * 
+ * @author Alvaro Barbeira
+ */
+public class SkeletonDataLoader
+		extends AsynchronousAssetLoader<SkeletonData, SkeletonDataLoader.SkeletonDataLoaderParameter> {
+
+	SkeletonData skeletonData;
+
+	public SkeletonDataLoader(FileHandleResolver resolver) {
+		super(resolver);
+	}
+
+	@Override
+	public void loadAsync(AssetManager manager, String fileName, FileHandle file,
+			SkeletonDataLoaderParameter parameter) {
+		skeletonData = null;
+		TextureAtlas atlas = manager.get(parameter.atlasName, TextureAtlas.class);
+
+		String extension = file.extension();
+		if (extension.toLowerCase().equals("skel")) {
+			SkeletonBinary skeletonBinary = new SkeletonBinary(atlas);
+			skeletonBinary.setScale(parameter.scale);
+			skeletonData = skeletonBinary.readSkeletonData(file);
+		} else {
+			SkeletonJson skeletonJson = new SkeletonJson(atlas);
+			skeletonJson.setScale(parameter.scale);
+			skeletonData = skeletonJson.readSkeletonData(file);
+		}
+	}
+
+	@Override
+	public SkeletonData loadSync(AssetManager manager, String fileName, FileHandle file,
+			SkeletonDataLoaderParameter parameter) {
+		return skeletonData;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@Override
+	public Array<AssetDescriptor> getDependencies(String fileName, FileHandle file,
+			SkeletonDataLoaderParameter parameter) {
+		Array<AssetDescriptor> deps = new Array<AssetDescriptor>();
+		deps.add(new AssetDescriptor(parameter.atlasName, TextureAtlas.class));
+		return deps;
+	}
+
+	/**
+	 * Mandatory parameter to be passed to
+	 * {@link AssetManager#load(String, Class, AssetLoaderParameters)}. This
+	 * will insure the skeleton data is loaded correctly
+	 * 
+	 * @author Alvaro Barbeira
+	 */
+	static public class SkeletonDataLoaderParameter extends AssetLoaderParameters<SkeletonData> {
+		// A SkeletonJson must be loaded from an atlas.
+		public String atlasName;
+		public float scale;
+
+		public SkeletonDataLoaderParameter(String atlasName, float scale) {
+			this.atlasName = atlasName;
+			this.scale = scale;
+		}
+
+		public SkeletonDataLoaderParameter(String atlasName) {
+			this(atlasName, 1);
+		}
+	}
+}
diff --git a/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/spine/SpineRenderer.java b/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/spine/SpineRenderer.java
new file mode 100644
index 000000000..6a6407baf
--- /dev/null
+++ b/blade-engine-spine-plugin/src/main/java/com/bladecoder/engine/spine/SpineRenderer.java
@@ -0,0 +1,760 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.spine;
+
+import java.util.HashMap;
+import java.util.Map.Entry;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.math.Matrix4;
+import com.badlogic.gdx.math.Polygon;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.FloatArray;
+import com.badlogic.gdx.utils.GdxRuntimeException;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.anim.SpineAnimationDesc;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.serialization.ActionCallbackSerializer;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+import com.bladecoder.engine.spine.SkeletonDataLoader.SkeletonDataLoaderParameter;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engine.util.RectangleRenderer;
+import com.esotericsoftware.spine.Animation;
+import com.esotericsoftware.spine.AnimationState;
+import com.esotericsoftware.spine.AnimationState.AnimationStateAdapter;
+import com.esotericsoftware.spine.AnimationState.AnimationStateListener;
+import com.esotericsoftware.spine.AnimationState.TrackEntry;
+import com.esotericsoftware.spine.AnimationStateData;
+import com.esotericsoftware.spine.Event;
+import com.esotericsoftware.spine.Skeleton;
+import com.esotericsoftware.spine.SkeletonBounds;
+import com.esotericsoftware.spine.SkeletonData;
+import com.esotericsoftware.spine.SkeletonRenderer;
+import com.esotericsoftware.spine.Skin;
+
+public class SpineRenderer extends AnimationRenderer {
+
+	private final static int PLAY_ANIMATION_EVENT = 0;
+	private final static int PLAY_SOUND_EVENT = 1;
+	private final static int RUN_VERB_EVENT = 2;
+	private final static int LOOP_EVENT = 3;
+
+	private ActionCallback animationCb = null;
+
+	private int currentCount;
+	private Tween.Type currentAnimationType;
+
+	private SkeletonRenderer renderer;
+	private SkeletonBounds bounds;
+
+	private float width = super.getWidth(), height = super.getHeight();
+
+	private float lastAnimationTime = 0;
+
+	private boolean complete = false;
+
+	private boolean eventsEnabled = true;
+
+	private int loopCount = 0;
+
+	private String secondaryAnimation;
+
+	private String skin;
+
+	private World world;
+
+	class SkeletonCacheEntry extends CacheEntry {
+		Skeleton skeleton;
+		AnimationState animation;
+		String atlas;
+	}
+
+	public SpineRenderer() {
+
+	}
+
+	public void enableEvents(boolean v) {
+		eventsEnabled = v;
+	}
+
+	private AnimationStateListener animationListener = new AnimationStateAdapter() {
+		@Override
+		public void complete(TrackEntry entry) {
+			if (complete || (entry != null && entry.getTrackIndex() != 0))
+				return;
+
+			loopCount++;
+
+			if ((currentAnimationType == Tween.Type.REPEAT || currentAnimationType == Tween.Type.REVERSE_REPEAT)
+					&& (currentCount == Tween.INFINITY || currentCount >= loopCount)) {
+				return;
+			}
+
+			complete = true;
+			computeBbox();
+
+			if (animationCb != null) {
+				ActionCallback tmpcb = animationCb;
+				animationCb = null;
+				tmpcb.resume();
+			}
+		}
+
+		@Override
+		public void event(TrackEntry entry, Event event) {
+			if (!eventsEnabled || currentAnimationType == Tween.Type.REVERSE)
+				return;
+
+			String actorId = event.getData().getName();
+
+			EngineLogger.debug("Spine event " + event.getInt() + ":" + actorId + "." + event.getString());
+
+			InteractiveActor actor = (InteractiveActor) world.getCurrentScene().getActor(actorId, true);
+
+			switch (event.getInt()) {
+			case PLAY_ANIMATION_EVENT:
+				if (actor == null) {
+					EngineLogger.debug("Actor in Spine animation event not found in scene: " + actorId);
+					return;
+				}
+
+				((SpriteActor) actor).startAnimation(event.getString(), null);
+				break;
+			case PLAY_SOUND_EVENT:
+				// Backwards compatibility
+				String sid = event.getString();
+				if (world.getSounds().get(sid) == null && actor != null)
+					sid = actor.getId() + "_" + sid;
+
+				world.getCurrentScene().getSoundManager().playSound(sid);
+				break;
+			case RUN_VERB_EVENT:
+				if (actor != null)
+					actor.runVerb(event.getString());
+				else
+					world.getCurrentScene().runVerb(event.getString());
+				break;
+			case LOOP_EVENT:
+				// used for looping from a starting frame
+				break;
+			default:
+				EngineLogger.error("Spine event not recognized.");
+			}
+		}
+	};
+
+	@Override
+	public String[] getInternalAnimations(AnimationDesc anim) {
+		try {
+			retrieveSource(anim.source, ((SpineAnimationDesc) anim).atlas);
+		} catch (GdxRuntimeException e) {
+			sourceCache.remove(anim.source);
+			Array<String> dependencies = EngineAssetManager.getInstance().getDependencies(getFileName(anim.source));
+			if (dependencies.size > 0)
+				dependencies.removeIndex(dependencies.size - 1);
+			return new String[0];
+		}
+
+		Array<Animation> animations = ((SkeletonCacheEntry) sourceCache.get(anim.source)).skeleton.getData()
+				.getAnimations();
+
+		String[] result = new String[animations.size];
+
+		for (int i = 0; i < animations.size; i++) {
+			Animation a = animations.get(i);
+			result[i] = a.getName();
+		}
+
+		return result;
+	}
+
+	@Override
+	public void update(float delta) {
+		if (complete) {
+
+			// keep updating secondary animation
+			// WARNING: It doesn't work with REVERSE ANIMATION
+			if (secondaryAnimation != null && currentSource != null
+					&& (!((SkeletonCacheEntry) currentSource).animation.getTracks().get(1).isComplete()
+							|| ((SkeletonCacheEntry) currentSource).animation.getTracks().get(1).getLoop()))
+				updateAnimation(delta);
+
+			return;
+		}
+
+		if (currentSource != null && ((SkeletonCacheEntry) currentSource).skeleton != null) {
+			float d = delta;
+
+			if (currentAnimationType == Tween.Type.REVERSE) {
+				d = -delta;
+
+				if (lastAnimationTime < 0) {
+					lastAnimationTime = 0;
+					loopCount = 0;
+					animationListener.complete(null);
+					return;
+				}
+			}
+
+			lastAnimationTime += d;
+
+			if (lastAnimationTime >= 0)
+				updateAnimation(d);
+		}
+	}
+
+	private void updateAnimation(float time) {
+		SkeletonCacheEntry cs = (SkeletonCacheEntry) currentSource;
+
+		cs.animation.update(time);
+		cs.animation.apply(cs.skeleton);
+
+		cs.skeleton.updateWorldTransform(Skeleton.Physics.none);
+	}
+
+	private static final Matrix4 tmp = new Matrix4();
+
+	@Override
+	public void draw(SpriteBatch batch, float x, float y, float scaleX, float scaleY, float rotation, Color tint) {
+
+		SkeletonCacheEntry cs = (SkeletonCacheEntry) currentSource;
+
+		if (cs != null && cs.skeleton != null) {
+			Matrix4 tm = batch.getTransformMatrix();
+			tmp.set(tm);
+
+			float originX = cs.skeleton.getRootBone().getX();
+			float originY = cs.skeleton.getRootBone().getY();
+			tm.translate(x, y, 0).rotate(0, 0, 1, rotation).scale(scaleX, scaleY, 1).translate(originX, originY, 0);
+
+			// cs.skeleton.setX(x / scale);
+			// cs.skeleton.setY(y / scale);
+
+			batch.setTransformMatrix(tm);
+
+			if (tint != null)
+				cs.skeleton.setColor(tint);
+
+			renderer.draw(batch, cs.skeleton);
+
+			if (tint != null)
+				batch.setColor(Color.WHITE);
+			batch.setTransformMatrix(tmp);
+		} else {
+			float dx = getAlignDx(getWidth(), orgAlign);
+			float dy = getAlignDy(getHeight(), orgAlign);
+
+			RectangleRenderer.draw(batch, x + dx * scaleX, y + dy * scaleY, getWidth() * scaleX, getHeight() * scaleY,
+					Color.RED);
+		}
+	}
+
+	@Override
+	public float getWidth() {
+		return width;
+	}
+
+	@Override
+	public float getHeight() {
+		return height;
+	}
+
+	public String getSkin() {
+		return skin;
+	}
+
+	public void setSkin(String skin) {
+		// set the skin if the current source is loaded
+		if (currentSource != null && currentSource.refCounter > 0) {
+			SkeletonCacheEntry sce = (SkeletonCacheEntry) currentSource;
+
+			EngineLogger.debug("Setting Spine skin: " + skin);
+
+			if (skin != null) {
+				SkeletonData skeletonData = sce.skeleton.getData();
+
+				if (skin.indexOf(',') == -1 || skeletonData.findSkin(skin) != null) {
+					sce.skeleton.setSkin(skin);
+				} else {
+					// we can combine several skins separated by ','
+					String[] skins = skin.split(",");
+
+					Skin combinedSkin = new Skin(skin);
+
+					for (String sk : skins) {
+
+						// Get the source skins.
+						Skin singleSkin = skeletonData.findSkin(sk.trim());
+						combinedSkin.addSkin(singleSkin);
+					}
+
+					// Set and apply the Skin to the skeleton.
+					sce.skeleton.setSkin(combinedSkin);
+				}
+
+			} else {
+				sce.skeleton.setSkin((Skin) null);
+			}
+
+			// sce.skeleton.setSlotsToSetupPose();
+		}
+
+		this.skin = skin;
+	}
+
+	@Override
+	public void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb, String direction) {
+		StringBuilder sb = new StringBuilder(id);
+
+		// if dir==null gets the current animation direction
+		if (direction == null) {
+			int idx = getCurrentAnimationId().indexOf('.');
+
+			if (idx != -1) {
+				String dir = getCurrentAnimationId().substring(idx);
+				sb.append(dir);
+			}
+		} else {
+			sb.append('.');
+			sb.append(direction);
+		}
+
+		String anim = sb.toString();
+
+		if (getAnimation(anim) == null) {
+			anim = id;
+		}
+
+		startAnimation(anim, repeatType, count, null);
+	}
+
+	@Override
+	public void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb, Vector2 p0, Vector2 pf) {
+		startAnimation(id, repeatType, count, cb, getDirectionString(p0, pf, getDirs(id, fanims)));
+	}
+
+	@Override
+	public void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb) {
+		SpineAnimationDesc fa = (SpineAnimationDesc) getAnimation(id);
+
+		if (fa == null) {
+			EngineLogger.error("AnimationDesc not found: " + id);
+
+			return;
+		}
+
+		if (currentAnimation != null && currentAnimation.disposeWhenPlayed)
+			disposeSource(currentAnimation.source);
+
+		currentAnimation = fa;
+		currentSource = sourceCache.get(fa.source);
+
+		animationCb = cb;
+
+		// If the source is not loaded. Load it.
+		if (currentSource == null || currentSource.refCounter < 1) {
+			loadSource(fa.source, fa.atlas);
+			EngineAssetManager.getInstance().finishLoading();
+
+			retrieveSource(fa.source, fa.atlas);
+
+			currentSource = sourceCache.get(fa.source);
+
+			if (currentSource == null) {
+				EngineLogger.error("Could not load AnimationDesc: " + id);
+				currentAnimation = null;
+
+				return;
+			}
+		}
+
+		if (repeatType == Tween.Type.SPRITE_DEFINED) {
+			currentAnimationType = currentAnimation.animationType;
+			currentCount = currentAnimation.count;
+		} else {
+			currentCount = count;
+			currentAnimationType = repeatType;
+		}
+
+		if (currentAnimationType == Tween.Type.REVERSE) {
+			// get animation duration
+			Array<Animation> animations = ((SkeletonCacheEntry) currentSource).skeleton.getData().getAnimations();
+
+			for (Animation a : animations) {
+				if (a.getName().equals(currentAnimation.id)) {
+					lastAnimationTime = a.getDuration() / currentAnimation.duration - 0.01f;
+					break;
+				}
+			}
+		} else {
+			lastAnimationTime = 0f;
+		}
+
+		complete = false;
+		loopCount = 0;
+		setCurrentAnimation();
+	}
+
+	public void setSecondaryAnimation(String animation) {
+		secondaryAnimation = animation;
+		SkeletonCacheEntry cs = (SkeletonCacheEntry) currentSource;
+
+		try {
+
+			if (animation == null) {
+				cs.animation.setEmptyAnimation(1, 0);
+				// cs.animation.clearTrack(1);
+			} else {
+
+				SpineAnimationDesc fa = (SpineAnimationDesc) fanims.get(animation);
+
+				if (fa == null) {
+					EngineLogger.error("SpineRenderer:setSecondaryAnimation Animation not found: " + animation);
+					return;
+				}
+
+				cs.animation.setAnimation(1, secondaryAnimation, fa.animationType == Tween.Type.REPEAT);
+			}
+
+			updateAnimation(0);
+		} catch (Exception e) {
+			EngineLogger.error("Error in SpineRenderer::setSecondaryAnimation", e);
+		}
+	}
+
+	public Skeleton getCurrentSkeleton() {
+		SkeletonCacheEntry cs = (SkeletonCacheEntry) currentSource;
+		return cs.skeleton;
+	}
+
+	public AnimationState getCurrentAnimationState() {
+		SkeletonCacheEntry cs = (SkeletonCacheEntry) currentSource;
+		return cs.animation;
+	}
+
+	private void setCurrentAnimation() {
+		try {
+			SkeletonCacheEntry cs = (SkeletonCacheEntry) currentSource;
+
+			if(cs.skeleton == null) {
+				return;
+			}
+
+			if (skin != null && (cs.skeleton.getSkin() == null || !skin.equals(cs.skeleton.getSkin().getName()))) {
+				setSkin(skin);
+			}
+
+			cs.skeleton.setToSetupPose();
+			cs.skeleton.setScaleX(flipX ? -1 : 1);
+			cs.animation.setTimeScale(currentAnimation.duration);
+			cs.animation.clearTracks();
+			cs.animation.setAnimation(0, currentAnimation.id, currentAnimationType == Tween.Type.REPEAT);
+
+			if (secondaryAnimation != null)
+				setSecondaryAnimation(secondaryAnimation);
+
+			updateAnimation(lastAnimationTime);
+			computeBbox();
+
+		} catch (Exception e) {
+			EngineLogger.error("Error in SpineRenderer::setCurrentAnimation", e);
+		}
+	}
+
+	@Override
+	public void computeBbox() {
+		float minX, minY, maxX, maxY;
+
+		if (bbox == null)
+			bbox = new Polygon(new float[8]);
+
+		if (bbox != null && (bbox.getVertices() == null || bbox.getVertices().length != 8)) {
+			bbox.setVertices(new float[8]);
+		}
+
+		SkeletonCacheEntry cs = (SkeletonCacheEntry) currentSource;
+
+		if (cs == null || cs.skeleton == null) {
+
+			float[] verts = bbox.getVertices();
+
+			verts[0] = -getWidth() / 2;
+			verts[1] = 0f;
+			verts[2] = -getWidth() / 2;
+			verts[3] = getHeight();
+			verts[4] = getWidth() / 2;
+			verts[5] = getHeight();
+			verts[6] = getWidth() / 2;
+			verts[7] = 0f;
+			bbox.dirty();
+			return;
+		}
+
+		cs.skeleton.setPosition(0, 0);
+		cs.skeleton.updateWorldTransform(Skeleton.Physics.none);
+		bounds.update(cs.skeleton, true);
+
+		if (bounds.getWidth() > 0 && bounds.getHeight() > 0) {
+			// if there is only one bbox, get the polygon, else get the rectangle bbox
+			// (union of all bboxes).
+			if (bounds.getPolygons().size == 1) {
+				FloatArray p = bounds.getPolygons().get(0);
+
+				bbox.setVertices(p.toArray());
+				bbox.dirty();
+				Rectangle boundingRectangle = bbox.getBoundingRectangle();
+				width = boundingRectangle.getWidth();
+				height = boundingRectangle.getHeight();
+				return;
+
+			} else {
+				width = bounds.getWidth();
+				height = bounds.getHeight();
+				minX = bounds.getMinX();
+				minY = bounds.getMinY();
+				maxX = bounds.getMaxX();
+				maxY = bounds.getMaxY();
+			}
+
+		} else {
+
+			Vector2 offset = new Vector2();
+			Vector2 size = new Vector2();
+			cs.skeleton.getBounds(offset, size, new FloatArray());
+			width = size.x;
+			height = size.y;
+
+			minX = offset.x;
+			minY = offset.y;
+			maxX = offset.x + width;
+			maxY = offset.y + height;
+		}
+
+		float[] verts = bbox.getVertices();
+		verts[0] = minX;
+		verts[1] = minY;
+		verts[2] = minX;
+		verts[3] = maxY;
+		verts[4] = maxX;
+		verts[5] = maxY;
+		verts[6] = maxX;
+		verts[7] = minY;
+
+		bbox.dirty();
+	}
+
+	private String getFileName(String source) {
+		return EngineAssetManager.SPINE_DIR + source + EngineAssetManager.SPINE_EXT;
+	}
+
+	private void loadSource(String source, String atlas) {
+		EngineLogger.debug("Loading: " + source);
+		SkeletonCacheEntry entry = (SkeletonCacheEntry) sourceCache.get(source);
+
+		if (entry == null) {
+			entry = new SkeletonCacheEntry();
+			entry.atlas = atlas == null ? source : atlas;
+			sourceCache.put(source, entry);
+		}
+
+		if (entry.refCounter == 0) {
+
+			if (EngineAssetManager.getInstance().getLoader(SkeletonData.class) == null) {
+				EngineAssetManager.getInstance().setLoader(SkeletonData.class,
+						new SkeletonDataLoader(EngineAssetManager.getInstance().getFileHandleResolver()));
+			}
+
+			SkeletonDataLoaderParameter parameter = new SkeletonDataLoaderParameter(
+					EngineAssetManager.ATLASES_DIR + entry.atlas + EngineAssetManager.ATLAS_EXT,
+					EngineAssetManager.getInstance().getScale());
+			EngineAssetManager.getInstance().load(getFileName(source), SkeletonData.class, parameter);
+		}
+
+		entry.refCounter++;
+	}
+
+	private void retrieveSource(String source, String atlas) {
+		EngineLogger.debug("Retrieving: " + source);
+		SkeletonCacheEntry entry = (SkeletonCacheEntry) sourceCache.get(source);
+
+		if (entry == null || entry.refCounter < 1) {
+			loadSource(source, atlas);
+			EngineAssetManager.getInstance().finishLoading();
+			entry = (SkeletonCacheEntry) sourceCache.get(source);
+		}
+
+		if (entry.skeleton == null) {
+			SkeletonData skeletonData = EngineAssetManager.getInstance().get(getFileName(source), SkeletonData.class);
+
+			entry.skeleton = new Skeleton(skeletonData);
+
+			AnimationStateData stateData = new AnimationStateData(skeletonData); // Defines
+																					// mixing
+																					// between
+																					// animations.
+			stateData.setDefaultMix(0f);
+
+			entry.animation = new AnimationState(stateData);
+			entry.animation.addListener(animationListener);
+		}
+	}
+
+	private void disposeSource(String source) {
+		EngineLogger.debug("Disposing: " + source);
+		SkeletonCacheEntry entry = (SkeletonCacheEntry) sourceCache.get(source);
+
+		if (entry.refCounter == 1) {
+			EngineAssetManager.getInstance()
+					.unload(EngineAssetManager.SPINE_DIR + source + EngineAssetManager.SPINE_EXT);
+			entry.animation = null;
+			entry.skeleton = null;
+		}
+
+		entry.refCounter--;
+	}
+
+	@Override
+	public void loadAssets() {
+		for (AnimationDesc fa : fanims.values()) {
+			if (fa.preload)
+				loadSource(fa.source, ((SpineAnimationDesc) fa).atlas);
+		}
+
+		if (currentAnimation != null && !currentAnimation.preload) {
+			loadSource(currentAnimation.source, ((SpineAnimationDesc) currentAnimation).atlas);
+		} else if (currentAnimation == null && initAnimation != null) {
+			AnimationDesc fa = fanims.get(initAnimation);
+
+			if (fa != null && !fa.preload)
+				loadSource(fa.source, ((SpineAnimationDesc) fa).atlas);
+		}
+	}
+
+	@Override
+	public void retrieveAssets() {
+		renderer = new SkeletonRenderer();
+		renderer.setPremultipliedAlpha(false);
+		bounds = new SkeletonBounds();
+
+		for (String key : sourceCache.keySet()) {
+			if (sourceCache.get(key).refCounter > 0)
+				retrieveSource(key, ((SkeletonCacheEntry) sourceCache.get(key)).atlas);
+		}
+
+		if (currentAnimation != null) {
+			SkeletonCacheEntry entry = (SkeletonCacheEntry) sourceCache.get(currentAnimation.source);
+			currentSource = entry;
+
+			// Stop events to avoid event trigger
+			boolean prevEnableEvents = eventsEnabled;
+
+			eventsEnabled = false;
+			setCurrentAnimation();
+			eventsEnabled = prevEnableEvents;
+
+		} else if (initAnimation != null) {
+			startAnimation(initAnimation, Tween.Type.SPRITE_DEFINED, 1, null);
+		}
+	}
+
+	@Override
+	public void dispose() {
+		for (Entry<String, CacheEntry> entry : sourceCache.entrySet()) {
+
+			if (entry.getValue().refCounter > 0) {
+				String filename = EngineAssetManager.SPINE_DIR + entry.getKey() + EngineAssetManager.SPINE_EXT;
+
+				if (EngineAssetManager.getInstance().isLoaded(filename))
+					EngineAssetManager.getInstance().unload(filename);
+			}
+		}
+
+		sourceCache.clear();
+		currentSource = null;
+		renderer = null;
+		bounds = null;
+	}
+
+	@Override
+	public void write(Json json) {
+		super.write(json);
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+
+		} else {
+
+			if (animationCb != null) {
+				json.writeValue("cb",
+						ActionCallbackSerializer.serialize(bjson.getWorld(), bjson.getScene(), animationCb));
+			}
+
+			json.writeValue("currentCount", currentCount);
+
+			if (currentAnimation != null)
+				json.writeValue("currentAnimationType", currentAnimationType);
+
+			json.writeValue("lastAnimationTime", lastAnimationTime);
+			json.writeValue("complete", complete);
+			json.writeValue("loopCount", loopCount);
+			json.writeValue("secondaryAnimation", secondaryAnimation);
+		}
+
+		json.writeValue("skin", skin);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		super.read(json, jsonData);
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			fanims = json.readValue("fanims", HashMap.class, SpineAnimationDesc.class, jsonData);
+
+			world = bjson.getWorld();
+		} else {
+
+			animationCb = ActionCallbackSerializer.find(((BladeJson) json).getWorld(), ((BladeJson) json).getScene(),
+					json.readValue("cb", String.class, jsonData));
+
+			currentCount = json.readValue("currentCount", Integer.class, jsonData);
+
+			if (currentAnimation != null)
+				currentAnimationType = json.readValue("currentAnimationType", Tween.Type.class, jsonData);
+
+			lastAnimationTime = json.readValue("lastAnimationTime", Float.class, jsonData);
+			complete = json.readValue("complete", Boolean.class, jsonData);
+			loopCount = json.readValue("loopCount", int.class, loopCount, jsonData);
+
+			secondaryAnimation = json.readValue("secondaryAnimation", String.class, (String) null, jsonData);
+		}
+
+		skin = json.readValue("skin", String.class, skin, jsonData);
+	}
+}
\ No newline at end of file
diff --git a/blade-engine/build.gradle b/blade-engine/build.gradle
index 4130efd3d..ece13c417 100644
--- a/blade-engine/build.gradle
+++ b/blade-engine/build.gradle
@@ -1,16 +1,21 @@
-apply plugin: "java"
-apply plugin: "maven"
-apply plugin: "signing"
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+    id 'signing'
+}
 
 group = 'com.bladecoder.engine'
 
 // java
-    sourceCompatibility = 1.7
-    [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+sourceCompatibility=1.8
+targetCompatibility=1.8
+
+[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+
 sourceSets {
 	main {
 		java.srcDirs = ['src']
-		resources.srcDirs = ['src']
+		resources.srcDirs = ['resources']
 	}
 }
 
@@ -21,157 +26,96 @@ jar {
 			'license': 'Apache-2.0',
 			'group': project.group,
 			'version': project.version,
-			'libgdx': gdxVersion,
+			'libgdx': libgdxVersion,
 			'java': targetCompatibility,
 			'timestamp': System.currentTimeMillis()
 	]
 }
 
-    javadoc {
-	title = "Bladecoder Adventure Engine"
-	options {
-		memberLevel = JavadocMemberLevel.PUBLIC
-		author true
-		setUse true
-    		encoding "UTF-8"
-	}
-    }
-
 dependencies {
-  compile "com.badlogicgames.gdx:gdx:$gdxVersion"
-  compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
-  compile fileTree(dir: 'libs', include: '*.jar')
-}
-
-def isDevBuild
-def isCiBuild
-def isReleaseBuild
-
-def sonatypeRepositoryUrl
-
-//set build variables based on build type (release, continuous integration, development)
-if(hasProperty("release")) {
-    isReleaseBuild = true
-    sonatypeRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-} else if (hasProperty("ci")) {
-    isCiBuild = true
-    version += "-SNAPSHOT"
-    sonatypeRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-} else {
-    isDevBuild = true
-}
-
-
-task enginedocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from 'build/docs/javadoc'
+  implementation "com.badlogicgames.gdx:gdx:$libgdxVersion"
+  implementation "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
+  implementation "com.badlogicgames.gdx:gdx-freetype:$libgdxVersion"
+  implementation "com.bladecoder.ink:blade-ink:$bladeInkVersion"
+  implementation fileTree(dir: 'libs', include: '*.jar')
 }
 
 
 task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    classifier = 'sources'
+    from sourceSets.main.allJava
+    archiveClassifier = 'sources'
 }
 
-artifacts {
-    archives jar
-    archives enginedocJar
-    archives sourcesJar
+task javadocJar(type: Jar) {
+    from javadoc
+    archiveClassifier = 'javadoc'
 }
 
-def ask(title){
-	def console = System.console()
-	def string
-	
-    if (console) {
-        string = console.readLine(title)
-    } else {
-        logger.error "Cannot get console."
-    }
-    
-    return new String(string)
-}
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifactId = 'blade-engine'
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
+
+            versionMapping {
+                usage('java-api') {
+                    fromResolutionOf('runtimeClasspath')
+                }
+                usage('java-runtime') {
+                    fromResolutionResult()
+                }
+            }
 
-def askPasswd(title){
-	def console = System.console()
-	def string
-	
-    if (console) {
-        string = console.readPassword(title)
-    } else {
-        logger.error "Cannot get console."
-    }
-    
-    return new String(string)
-}
+            pom {
+                name = 'Blade Engine'
+                description = 'Classic point and click adventure game engine'
+                url = 'https://github.com/bladecoder/bladecoder-adventure-engine'
 
-//********* artifact signing *********
-if(isReleaseBuild) {
-    signing {
-    	if(!project.hasProperty("signing.keyId"))
-    		allprojects {ext."signing.keyId" = ask('\nKey Id: ')}
-    	
-    	if(!project.hasProperty("signing.secretKeyRingFile"))
-    		allprojects { ext."signing.secretKeyRingFile" = ask('\nSecret Keyring file: ') }
-    	
-    	if(!project.hasProperty("signing.password"))
-    	  	allprojects { ext."signing.password" = askPasswd('\nKey Password: ') }
-
-    
-        sign configurations.archives
+                licenses {
+                    license {
+                        name = 'The Apache License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id = 'bladecoder'
+                        name = 'Rafael Garcia'
+                        email = 'bladecoder@gmail.com'
+                    }
+                }
+                scm {
+                    connection = 'scm:git@github.com:bladecoder/bladecoder-adventure-engine.git'
+                    developerConnection = 'scm:git@github.com:bladecoder/bladecoder-adventure-engine.git'
+                    url = 'scm:git@github.com:bladecoder/bladecoder-adventure-engine.git'
+                }
+            }
+        }
     }
-} else {
-    task signArchives {
-        // do nothing
+    repositories {
+        maven {
+            def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+            credentials {
+                username findProperty("sonatypeUsername")
+                password findProperty("sonatypePassword")
+            }
+        }
     }
 }
 
-uploadArchives {
-    repositories {
-        if (isDevBuild) {
-            mavenLocal()
-        }
-        else {
-            mavenDeployer {
-                if(isReleaseBuild) {
-                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-                }
+signing {
+    if(!version.endsWith('SNAPSHOT')) {
+        sign publishing.publications.mavenJava
+    }
+}
 
-                repository(url: sonatypeRepositoryUrl) {                 
-                  authentication(
-                    userName: project.hasProperty("sonatypeUsername")?sonatypeUsername:ask('\nSonatype Username: '), 
-                  	password: project.hasProperty("sonatypePassword")?sonatypePassword:askPasswd('\nSonatype Password: ')
-                  )
-                }
 
-                pom.project {
-                   name 'blade-engine'
-                   packaging 'jar'
-                   description 'Classic point and click adventure game engine'
-                   url 'https://github.com/bladecoder/bladecoder-adventure-engine'
-
-                   scm {
-                       url 'scm:git@github.com:bladecoder/bladecoder-adventure-engine.git'
-                       connection 'scm:git@github.com:bladecoder/bladecoder-adventure-engine.git'
-                       developerConnection 'scm:git@github.com:bladecoder/bladecoder-adventure-engine.git'
-                   }
-
-                   licenses {
-                       license {
-                           name 'The Apache Software License, Version 2.0'
-                           url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                           distribution 'repo'
-                       }
-                   }
-
-                   developers {
-                       developer {
-                           id 'rgarcia'
-                           name 'Rafael Garcia'
-                       } 
-                   }
-               }
-            }
-        }
+javadoc {
+    if(JavaVersion.current().isJava9Compatible()) {
+        options.addBooleanOption('html5', true)
     }
-}
+}
\ No newline at end of file
diff --git a/blade-engine/libs/spine-libgdx.jar b/blade-engine/libs/spine-libgdx.jar
deleted file mode 100644
index 8426028cc..000000000
Binary files a/blade-engine/libs/spine-libgdx.jar and /dev/null differ
diff --git a/adventure-composer/src/main/resources/projectTmpl/core/CoreGdxDefinition b/blade-engine/src/com/bladecoder/engine.gwt.xml
similarity index 87%
rename from adventure-composer/src/main/resources/projectTmpl/core/CoreGdxDefinition
rename to blade-engine/src/com/bladecoder/engine.gwt.xml
index e28fe8bf3..969488998 100644
--- a/adventure-composer/src/main/resources/projectTmpl/core/CoreGdxDefinition
+++ b/blade-engine/src/com/bladecoder/engine.gwt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit trunk//EN" "http://google-web-toolkit.googlecode.com/svn/trunk/distro-source/core/src/gwt-module.dtd">
 <module>
-	<source path="%PACKAGE_DIR%" />
+	<source path="engine"/>
 </module>
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/BladeEngine.java b/blade-engine/src/com/bladecoder/engine/BladeEngine.java
index 51dd049b6..a3f86caf1 100644
--- a/blade-engine/src/com/bladecoder/engine/BladeEngine.java
+++ b/blade-engine/src/com/bladecoder/engine/BladeEngine.java
@@ -1,180 +1,240 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package com.bladecoder.engine;
-
-import java.nio.IntBuffer;
-import java.text.MessageFormat;
+package com.bladecoder.engine;
 
-import com.bladecoder.engine.BladeEngine;
-
-import com.badlogic.gdx.ApplicationListener;
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.utils.BufferUtils;
+import com.badlogic.gdx.Application;
+import com.badlogic.gdx.ApplicationListener;
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.utils.BufferUtils;
 import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.ui.SceneScreen;
 import com.bladecoder.engine.ui.UI;
-import com.bladecoder.engine.ui.UI.Screens;
 import com.bladecoder.engine.util.Config;
+import com.bladecoder.engine.util.DPIUtils;
 import com.bladecoder.engine.util.EngineLogger;
-
-public class BladeEngine implements ApplicationListener {
-
-	private String chapter;
-	private String gameState;
-	private String testScene;
-	private String recordName;
-	private String forceRes;
-	private boolean debug = false;
-	private boolean restart = false;
-	private UI ui;
-	
-	public static UI getAppUI() {
-		return ((BladeEngine)Gdx.app.getApplicationListener()).getUI();
-	}
-
-	public void setTestMode(String s) {
-		testScene = s;
-	}
-	
-	public void loadGameState(String s) {
-		gameState = s;
-	}
-	
-	public void setPlayMode(String recordName) {
-		this.recordName = recordName;
-	}
-	
-	public void setDebugMode() {
-		debug = true;
-	}
-	
-	public void setRestart() {
-		restart = true;
-	}
-	
-	public void setChapter(String chapter) {
-		this.chapter = chapter;
-	}
-	
-	public void forceResolution(String forceRes) {
-		this.forceRes = forceRes;
-	}
-	
-	public UI getUI() {
-		return ui;
-	}
-
-	@Override
-	public void create() {
-		if(!debug)
-			debug = Config.getProperty(Config.DEBUG_PROP, debug);
-		
-		if(debug)
-			EngineLogger.setDebug();
-		
-		EngineLogger.debug("GAME CREATE");
-		
-		if(forceRes == null)
-			forceRes = Config.getProperty(Config.FORCE_RES_PROP, forceRes);
-		
-		if(forceRes != null) {
-			EngineAssetManager.getInstance().forceResolution(forceRes);
-		}
-		
-		ui = new UI();
-
-		if(chapter == null)
-			chapter = Config.getProperty(Config.CHAPTER_PROP, chapter);
-		
-		if(testScene == null) {
-			testScene = Config.getProperty(Config.TEST_SCENE_PROP, testScene);
-		}
-		
-		if (testScene != null || chapter != null) {
-			World.getInstance().loadXMLChapter(chapter, testScene);
-			ui.setCurrentScreen(UI.Screens.SCENE_SCREEN);
-		}
-		
-		if(gameState == null)
-			gameState = Config.getProperty(Config.LOAD_GAMESTATE_PROP, gameState);
-		
-		if (gameState != null) {
-			World.getInstance().loadGameState(gameState);
-		}
-		
-		if(restart) {
-			try {
-				World.getInstance().loadXMLChapter(null);
-			} catch (Exception e) {
-				EngineLogger.error("ERROR LOADING GAME", e);
-				dispose();
-				Gdx.app.exit();
-			}
-		}
-		
-		if(recordName == null)
-			recordName = Config.getProperty(Config.PLAY_RECORD_PROP, recordName);
-		
-		if (recordName != null) {
-			SceneScreen scr = (SceneScreen)ui.getScreen(Screens.SCENE_SCREEN);
-			scr.getRecorder().load(recordName);
-			scr.getRecorder().setPlaying(true);
-		}
-
-		if (EngineLogger.debugMode()) {
-			IntBuffer size = BufferUtils.newIntBuffer(16);
-			Gdx.gl.glGetIntegerv(GL20.GL_MAX_TEXTURE_SIZE, size);
-			int maxSize = size.get();
-
-			EngineLogger.debug("Max. texture Size: " + maxSize);
-			EngineLogger.debug("Density: " + Gdx.graphics.getDensity());
-		}
-	}
-
-	@Override
-	public void dispose() {
-		EngineLogger.debug("GAME DISPOSE");
-		World.getInstance().dispose();
-		ui.dispose();
-	}
-
-	@Override
-	public void render() {
-		ui.render();
-	}
-
-	@Override
-	public void resize(int width, int height) {
-		EngineLogger.debug(MessageFormat.format("GAME RESIZE {0}x{1}", width, height));
-		ui.resize(width, height);
-	}
-
-	@Override
-	public void pause() {
-		EngineLogger.debug("GAME PAUSE");
-		ui.pause();
-		World.getInstance().saveGameState();
-	}
-
-	@Override
-	public void resume() {
-		EngineLogger.debug("GAME RESUME");
-		ui.resume();
-	}
-
-}
+
+import java.io.IOException;
+import java.nio.IntBuffer;
+import java.text.MessageFormat;
+
+public class BladeEngine implements ApplicationListener {
+
+    private String chapter;
+    private String gameState;
+    private String testScene;
+    private String recordName;
+    private String forceRes;
+    private boolean debug = false;
+    private boolean restart = false;
+    private UI ui;
+    private World world;
+
+    public static UI getAppUI() {
+        return ((BladeEngine) Gdx.app.getApplicationListener()).getUI();
+    }
+
+    public void setTestMode(String s) {
+        testScene = s;
+    }
+
+    public void loadGameState(String s) {
+        gameState = s;
+    }
+
+    public void setPlayMode(String recordName) {
+        this.recordName = recordName;
+    }
+
+    public void setDebugMode() {
+        debug = true;
+    }
+
+    public void setRestart() {
+        restart = true;
+    }
+
+    public void setChapter(String chapter) {
+        this.chapter = chapter;
+    }
+
+    public void forceResolution(String forceRes) {
+        this.forceRes = forceRes;
+    }
+
+    public UI getUI() {
+        return ui;
+    }
+
+    public void loadGame(String baseFolder) {
+        if (ui != null) {
+            ui.dispose();
+            world.dispose();
+        }
+
+        world = new World();
+
+        EngineAssetManager.setAssetFolder(baseFolder);
+        Config.getInstance().load();
+
+        try {
+            world.loadWorldDesc();
+        } catch (Exception e) {
+            // dispose();
+            EngineLogger.error("EXITING: " + e.getMessage());
+            Gdx.app.exit();
+        }
+
+        ui = new UI(world);
+    }
+
+    @Override
+    public void create() {
+        if (!debug)
+            debug = Config.getInstance().getProperty(Config.DEBUG_PROP, debug);
+
+        if (debug)
+            EngineLogger.setDebug();
+        else
+            EngineLogger.setDebugLevel(Application.LOG_ERROR);
+
+        EngineLogger.debug("GAME CREATE");
+
+        if (forceRes == null)
+            forceRes = Config.getInstance().getProperty(Config.FORCE_RES_PROP, forceRes);
+
+        if (forceRes != null) {
+            EngineAssetManager.getInstance().forceResolution(forceRes);
+        }
+
+        loadGame(null);
+
+        if (EngineLogger.debugMode()) {
+            if (chapter == null)
+                chapter = Config.getInstance().getProperty(Config.CHAPTER_PROP, chapter);
+
+            if (testScene == null) {
+                testScene = Config.getInstance().getProperty(Config.TEST_SCENE_PROP, testScene);
+            }
+
+            if (testScene != null || chapter != null) {
+                try {
+                    world.loadChapter(chapter, testScene, true);
+                } catch (Exception e) {
+                    dispose();
+                    EngineLogger.error("Error loading model:" + e.getMessage(), e);
+                    Gdx.app.exit();
+                }
+
+                ui.setCurrentScreen(UI.Screens.SCENE_SCREEN);
+            }
+
+            if (gameState == null)
+                gameState = Config.getInstance().getProperty(Config.LOAD_GAMESTATE_PROP, gameState);
+
+            if (gameState != null) {
+                try {
+                    world.loadGameState(gameState);
+                } catch (IOException e) {
+                    EngineLogger.error(e.getMessage());
+                }
+            }
+
+            if (restart) {
+                try {
+                    world.getSerializer().loadChapter();
+
+                    ui.setCurrentScreen(UI.Screens.SCENE_SCREEN);
+                } catch (Exception e) {
+                    EngineLogger.error("ERROR LOADING GAME", e);
+                    dispose();
+                    Gdx.app.exit();
+                }
+            }
+
+            if (recordName == null)
+                recordName = Config.getInstance().getProperty(Config.PLAY_RECORD_PROP, recordName);
+
+            if (recordName != null) {
+                ui.getRecorder().setFilename(recordName);
+                ui.getRecorder().load();
+                ui.getRecorder().setPlaying(true);
+
+                ui.setCurrentScreen(UI.Screens.SCENE_SCREEN);
+            }
+        }
+
+        IntBuffer size = BufferUtils.newIntBuffer(16);
+        Gdx.gl.glGetIntegerv(GL20.GL_MAX_TEXTURE_SIZE, size);
+        int maxSize = size.get();
+
+        EngineLogger.debug("Max. texture Size: " + maxSize);
+        EngineLogger.debug("Density: " + Gdx.graphics.getDensity());
+        EngineLogger.debug("Dimensions: " + Gdx.graphics.getWidth() + "x" + Gdx.graphics.getHeight());
+        EngineLogger.debug("Size Multiplier: " + DPIUtils.getSizeMultiplier());
+    }
+
+    @Override
+    public void dispose() {
+        EngineLogger.debug("GAME DISPOSE");
+        world.dispose();
+        ui.dispose();
+    }
+
+    @Override
+    public void render() {
+        ui.render();
+
+        // Pause the game when an error is found in debug mode
+        if (EngineLogger.lastError != null && EngineLogger.debugMode() && !world.isPaused()) {
+            pause();
+        }
+    }
+
+    @Override
+    public void resize(int width, int height) {
+        EngineLogger.debug(MessageFormat.format("GAME RESIZE {0}x{1}", width, height));
+
+        if (ui != null)
+            ui.resize(width, height);
+    }
+
+    @Override
+    public void pause() {
+        boolean bot = ui.getTesterBot().isEnabled();
+        boolean r = ui.getRecorder().isPlaying();
+
+        if (!world.isDisposed() && ((!bot && !r) || EngineLogger.lastError != null)) {
+            EngineLogger.debug("GAME PAUSE");
+            ui.pause();
+            try {
+                world.saveGameState();
+            } catch (IOException e) {
+                EngineLogger.error(e.getMessage());
+            }
+        } else {
+            EngineLogger.debug("NOT PAUSING WHEN BOT IS RUNNING OR PLAYING RECORDED GAME");
+        }
+    }
+
+    @Override
+    public void resume() {
+        EngineLogger.debug("GAME RESUME");
+        resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+        ui.resume();
+    }
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/AbstractControlAction.java b/blade-engine/src/com/bladecoder/engine/actions/AbstractControlAction.java
new file mode 100644
index 000000000..cc51bfaee
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/AbstractControlAction.java
@@ -0,0 +1,24 @@
+package com.bladecoder.engine.actions;
+
+import java.util.List;
+
+public abstract class AbstractControlAction implements Action {
+	
+	@ActionProperty(required = true)
+	protected String caID;
+
+	protected int skipControlIdBlock(List<Action> actions, int ip) {
+		final String caID = getControlActionID();
+
+		do {
+			ip++;
+		} while (!(actions.get(ip) instanceof AbstractControlAction)
+				|| !((AbstractControlAction) actions.get(ip)).getControlActionID().equals(caID));
+
+		return ip;
+	}
+
+	public String getControlActionID() {
+		return caID;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/AbstractIfAction.java b/blade-engine/src/com/bladecoder/engine/actions/AbstractIfAction.java
new file mode 100644
index 000000000..c9c057a79
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/AbstractIfAction.java
@@ -0,0 +1,11 @@
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.VerbRunner;
+
+public abstract class AbstractIfAction extends AbstractControlAction {
+	protected void gotoElse(VerbRunner v) {
+		int ip = skipControlIdBlock(v.getActions(), v.getIP());
+
+		v.setIP(ip);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/Action.java b/blade-engine/src/com/bladecoder/engine/actions/Action.java
index 838596fcc..8eed9cefd 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/Action.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/Action.java
@@ -15,24 +15,25 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
 
 public interface Action {
+	
+	/**
+	 * This is to inject the world dependency.
+	 * 
+	 * @param w The world to inject
+	 */
+	public void init(World w);
+	
+	
 	/**
 	 * Execute the action
 	 * 
 	 * @param cb
-	 * @return If returns true, the verb must stops the execution and wait
+	 * @return If 'true', the verb must stops the execution and wait
 	 * for the action to call the cb.resume()
 	 */
-	public boolean run(ActionCallback cb);
-
-	public void setParams(HashMap<String, String> params);
-
-	public String getInfo();
-
-	public Param[] getParams();
+	public boolean run(VerbRunner cb);
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ActionDescription.java b/blade-engine/src/com/bladecoder/engine/actions/ActionDescription.java
new file mode 100644
index 000000000..5a972217b
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/ActionDescription.java
@@ -0,0 +1,13 @@
+package com.bladecoder.engine.actions;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ActionDescription {
+	String name() default "";
+	String value();
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ActionFactory.java b/blade-engine/src/com/bladecoder/engine/actions/ActionFactory.java
index ba6ea0ebf..e2cc8d7b4 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/ActionFactory.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/ActionFactory.java
@@ -17,101 +17,119 @@
 
 import java.util.HashMap;
 
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionFactory;
-
+import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.reflect.ClassReflection;
 import com.badlogic.gdx.utils.reflect.ReflectionException;
+import com.bladecoder.engine.util.ActionUtils;
 import com.bladecoder.engine.util.EngineLogger;
 
 public class ActionFactory {
 
-	private static final HashMap<String, String> actions = new HashMap<String, String>();
+	private static ClassLoader loader = ActionFactory.class.getClassLoader();
+	private static ObjectMap<String, Class<? extends Action>> tagToClass = new ObjectMap<>();
 
 	static {
-		
-		actions.put("Lookat",
-				"com.bladecoder.engine.actions.LookAtAction");
-		actions.put("Pickup",
-				"com.bladecoder.engine.actions.PickUpAction");
-		actions.put("Goto",
-				"com.bladecoder.engine.actions.GotoAction");
-		actions.put("Leave",
-				"com.bladecoder.engine.actions.LeaveAction");	
-
-		actions.put("SetState",
-				"com.bladecoder.engine.actions.SetStateAction");
-		actions.put("SetActive",
-				"com.bladecoder.engine.actions.SetActiveAction");
-		actions.put("Cutmode",
-				"com.bladecoder.engine.actions.SetCutmodeAction");
-		actions.put("ShowInventory",
-				"com.bladecoder.engine.actions.ShowInventoryAction");			
-		actions.put("Animation",
-				"com.bladecoder.engine.actions.FrameAnimationAction");
-		actions.put("Position",
-				"com.bladecoder.engine.actions.PosAnimationAction");
-		actions.put("RemoveInventoryItem",
-				"com.bladecoder.engine.actions.RemoveInventoryItemAction");	
-		actions.put("Say",
-				"com.bladecoder.engine.actions.SayAction");	
-		actions.put("DropItem",
-				"com.bladecoder.engine.actions.DropItemAction");
-		actions.put("Wait",
-				"com.bladecoder.engine.actions.WaitAction");
-		actions.put("Talkto",
-				"com.bladecoder.engine.actions.TalktoAction");
-		actions.put("DialogOption",
-				"com.bladecoder.engine.actions.DialogOptionAction");
-		actions.put("SayDialog",
-				"com.bladecoder.engine.actions.SayDialogAction");
-		actions.put("RunVerb",
-				"com.bladecoder.engine.actions.RunVerbAction");
-		actions.put("CancelVerb",
-				"com.bladecoder.engine.actions.CancelVerbAction");
-		actions.put("Sound",
-				"com.bladecoder.engine.actions.SoundAction");
-		actions.put("Music",
-				"com.bladecoder.engine.actions.MusicAction");
-		actions.put("Camera",
-				"com.bladecoder.engine.actions.CameraAction");
-		actions.put("Transition",
-				"com.bladecoder.engine.actions.TransitionAction");
+		addClassTag(AlphaAnimAction.class);
+		addClassTag(AnimationAction.class);
+		addClassTag(CameraAction.class);
+		addClassTag(CancelVerbAction.class);
+		addClassTag(ChooseAction.class);
+		addClassTag(CommentAction.class);
+		addClassTag(DisableActionAction.class);
+		addClassTag(DropItemAction.class);
+		addClassTag(EndAction.class);
+		addClassTag(EndGameAction.class);
+		addClassTag(GotoAction.class);
+		addClassTag(IfAttrAction.class);
+		addClassTag(IfInkVariableAction.class);
+		addClassTag(IfPropertyAction.class);
+		addClassTag(IfSceneAttrAction.class);
+		addClassTag(InkNewStoryAction.class);
+		addClassTag(InkRunAction.class);
+		addClassTag(InkVariable.class);
+		addClassTag(LeaveAction.class);
+		addClassTag(LoadChapterAction.class);
+		addClassTag(LookAtAction.class);
+		addClassTag(MoveToSceneAction.class);
+		addClassTag(MusicAction.class);
+		addClassTag(MusicVolumeAction.class);
+		addClassTag(OpenURLAction.class);
+		addClassTag(PickUpAction.class);
+		addClassTag(PlaySoundAction.class);
+		addClassTag(PositionAction.class);
+		addClassTag(PositionAnimAction.class);
+		addClassTag(PropertyAction.class);
+		addClassTag(RandomPositionAction.class);
+		addClassTag(RemoveInventoryItemAction.class);
+		addClassTag(RepeatAction.class);
+		addClassTag(RotateAction.class);
+		addClassTag(RunOnceAction.class);
+		addClassTag(RunVerbAction.class);
+		addClassTag(SayAction.class);
+		addClassTag(SayDialogAction.class);
+		addClassTag(ScaleAction.class);
+		addClassTag(ScaleAnimActionXY.class);
+		addClassTag(ScreenPositionAction.class);
+		addClassTag(SetAchievementAction.class);
+		addClassTag(SetActorAttrAction.class);
+		addClassTag(SetCutmodeAction.class);
+		addClassTag(SetDialogOptionAttrAction.class);
+		addClassTag(SetPlayerAction.class);
+		addClassTag(SetSceneStateAction.class);
+		addClassTag(SetStateAction.class);
+		addClassTag(SetDescAction.class);
+		addClassTag(SetWalkzoneAction.class);
+		addClassTag(ShowInventoryAction.class);
+		addClassTag(SoundAction.class);
+		addClassTag(TalktoAction.class);
+		addClassTag(TextAction.class);
+		addClassTag(TintAnimAction.class);
+		addClassTag(TransitionAction.class);
+		addClassTag(WaitAction.class);
 	}
-	
-	public static String []getActionList() {
-		return  actions.keySet().toArray(new String[actions.size()]);
+
+	private static void addClassTag(Class<? extends Action> cls) {
+		tagToClass.put(ActionUtils.getName(cls), cls);
 	}
 
-	public static Action create(String name,
-			HashMap<String, String> params) {
-		String className = actions.get(name);
+	public static ObjectMap<String, Class<? extends Action>> getClassTags() {
+		return tagToClass;
+	}
 
-		if (className == null) {
-			EngineLogger.error( "Action with name '" + name
-					+ "' not found.");
+	public static void setActionClassLoader(ClassLoader loader) {
+		ActionFactory.loader = loader;
+	}
 
-			return null;
-		}
+	public static ClassLoader getActionClassLoader() {
+		return loader;
+	}
 
-		return ActionFactory.createByClass(className, params);
-	}	
-	
-	
-	
-	public static Action createByClass(String className,
-			HashMap<String, String> params) {
+	public static Action create(String tag, HashMap<String, String> params)
+			throws ClassNotFoundException, ReflectionException {
 
 		Action a = null;
 
-		try {
-			Class<?> c = ClassReflection.forName(className);
-			a = (Action) ClassReflection.newInstance(c);
-			
-			if(params != null)
-				a.setParams(params);
-		} catch (ReflectionException e) {
-			EngineLogger.error(e.getMessage());
+		Class<?> c = tagToClass.get(tag);
+
+		if (c == null) {
+			c = Class.forName(tag, true, loader);
+		}
+
+		a = (Action) ClassReflection.newInstance(c);
+
+		if (params != null) {
+
+			for (String key : params.keySet()) {
+				String value = params.get(key);
+
+				try {
+					ActionUtils.setParam(a, key, value);
+				} catch (NoSuchFieldException | SecurityException | IllegalArgumentException
+						| IllegalAccessException e) {
+					EngineLogger.error("Error Setting Action Param - Action:" + tag + " Param: " + key + " Value: "
+							+ value + " Msg: NOT FOUND " + e.getMessage());
+				}
+			}
 		}
 
 		return a;
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ActionProperty.java b/blade-engine/src/com/bladecoder/engine/actions/ActionProperty.java
new file mode 100644
index 000000000..c68b54ed9
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/ActionProperty.java
@@ -0,0 +1,11 @@
+package com.bladecoder.engine.actions;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ActionProperty {
+	String defaultValue() default "";
+    boolean required() default false;
+	Param.Type type() default Param.Type.NOT_SET;
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ActionPropertyDescription.java b/blade-engine/src/com/bladecoder/engine/actions/ActionPropertyDescription.java
new file mode 100644
index 000000000..76b5388a5
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/ActionPropertyDescription.java
@@ -0,0 +1,9 @@
+package com.bladecoder.engine.actions;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ActionPropertyDescription {
+	String value() default "";
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ActorAnimationRef.java b/blade-engine/src/com/bladecoder/engine/actions/ActorAnimationRef.java
new file mode 100644
index 000000000..9886af276
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/ActorAnimationRef.java
@@ -0,0 +1,51 @@
+package com.bladecoder.engine.actions;
+
+public class ActorAnimationRef {
+	private final String actor, animation;
+
+	public ActorAnimationRef() {
+		this(null, null);
+	}
+
+	public ActorAnimationRef(String actorAnimation) {
+		if (actorAnimation == null) {
+			actor = null;
+			animation = null;
+			return;
+		}
+
+		int idx = actorAnimation.indexOf(Param.STRING_PARAM_SEPARATOR.charAt(0));
+		
+		// Also allow '.' character as separator because is more usable inside Ink files.
+		if(idx == -1)
+			idx = actorAnimation.indexOf('.');
+
+		if (idx != -1) {
+			actor = actorAnimation.substring(0, idx);
+			animation = actorAnimation.substring(idx + 1);
+		} else {
+			actor = null;
+			animation = actorAnimation;
+		}
+	}
+
+	public ActorAnimationRef(String actorId, String animationId) {
+		this.actor = actorId;
+		this.animation = animationId;
+	}
+
+	public String getActorId() {
+		return actor;
+	}
+
+	public String getAnimationId() {
+		return animation;
+	}
+
+	public String toString() {
+		if (actor == null || actor.isEmpty())
+			return animation;
+
+		return actor + Param.STRING_PARAM_SEPARATOR + animation;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/AddValueToProperty.java b/blade-engine/src/com/bladecoder/engine/actions/AddValueToProperty.java
new file mode 100644
index 000000000..03bb77368
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/AddValueToProperty.java
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("Adds an integer value to the selected property.")
+public class AddValueToProperty implements Action {
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("Property name")
+	private String prop;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The integer value to add.")
+	private int value;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		
+		String p = w.getCustomProperty(prop);
+		
+		int v = 0;
+		
+		if(p != null) {
+			try {
+				v = Integer.parseInt(p);
+			} catch(NumberFormatException e) {
+			}
+		}
+		
+		v += value;
+		
+		w.setCustomProperty(prop, Integer.toString(v));
+		EngineLogger.debug("AddValueToProperty: " + prop + "=" + w.getCustomProperty(prop));
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/AlphaAnimAction.java b/blade-engine/src/com/bladecoder/engine/actions/AlphaAnimAction.java
new file mode 100644
index 000000000..49b39324d
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/AlphaAnimAction.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.anim.SpriteAlphaTween;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.InterpolationMode;
+
+@ActionDescription(value= "Actor transparency (alpha channel) animation")
+public class AlphaAnimAction implements Action {
+	@ActionPropertyDescription("The target actor")
+	@ActionProperty(type = Type.SPRITE_ACTOR, required=true)
+	private String actor;
+
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription( "The target transparency value (0-1).")
+	private float alpha;
+
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription("Duration of the animation in seconds")
+	private float speed;
+
+	@ActionProperty
+	@ActionPropertyDescription("The The times to repeat")
+	private int count = 1;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the action continues inmediatly")
+	private boolean wait = true;
+
+	@ActionProperty(required = true, defaultValue = "NO_REPEAT")
+	@ActionPropertyDescription("The repeat mode")
+	private Tween.Type repeat = Tween.Type.NO_REPEAT;
+
+	@ActionProperty
+	@ActionPropertyDescription("The interpolation mode")
+	private InterpolationMode interpolation;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {				
+		SpriteActor a = (SpriteActor) w.getCurrentScene().getActor(actor, true);
+
+		
+		SpriteAlphaTween t = new SpriteAlphaTween();
+		t.start(a, repeat, count, alpha, speed, interpolation,
+				wait ? cb : null);
+		
+		a.addTween(t);
+		
+		return wait;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/AnimationAction.java b/blade-engine/src/com/bladecoder/engine/actions/AnimationAction.java
new file mode 100644
index 000000000..5ad48adad
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/AnimationAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Sets the animation for an actor")
+public class AnimationAction implements Action {
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The Animation to set")
+	private ActorAnimationRef animation;
+
+	@ActionProperty(required = true, defaultValue = "-1")
+	@ActionPropertyDescription("The times to repeat. -1 to infinity repeat")
+	private int count = -1;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("Waits to finish the animation.")
+	private boolean wait = true;
+
+	@ActionProperty(required = true, defaultValue = "SPRITE_DEFINED")
+	@ActionPropertyDescription("The repeat mode")
+	private Tween.Type repeat = Tween.Type.SPRITE_DEFINED;
+	
+	@ActionProperty(required = true, defaultValue = "false")
+	@ActionPropertyDescription("Keeps the current actor animation direction.")
+	private boolean keepDirection = false;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+//		EngineLogger.debug(MessageFormat.format("ANIMATION_ACTION: {0}.{1}", animation.getActorId(), animation.getAnimationId()));
+		
+		String actorId = animation.getActorId();
+		
+		SpriteActor a = (SpriteActor) w.getCurrentScene().getActor(actorId, true);
+		
+		String anim = animation.getAnimationId();
+		
+		if(keepDirection) {
+			String c = ((AnimationRenderer)a.getRenderer()).getCurrentAnimationId();
+			
+			if(anim.endsWith(AnimationRenderer.LEFT) && c.endsWith(AnimationRenderer.RIGHT) || 
+					anim.endsWith(AnimationRenderer.RIGHT) && c.endsWith(AnimationRenderer.LEFT)) {
+				anim = AnimationRenderer.getFlipId(anim);
+			}
+		}
+
+		a.startAnimation(anim, repeat, count, wait?cb:null);
+
+		return wait;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/BaseCallbackAction.java b/blade-engine/src/com/bladecoder/engine/actions/BaseCallbackAction.java
index 2e7ddcb7c..3831e874d 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/BaseCallbackAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/BaseCallbackAction.java
@@ -15,59 +15,71 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
-import com.bladecoder.engine.util.ActionCallbackSerialization;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.serialization.ActionCallbackSerializer;
+import com.bladecoder.engine.serialization.BladeJson;
 
-public abstract class BaseCallbackAction implements Action, ActionCallback, Serializable {	
+public abstract class BaseCallbackAction implements Action, ActionCallback, Serializable {
 	private ActionCallback verbCb;
-	private String verbCbSer;
-	private boolean wait = true;	
-	
+
+	// Depending on the reading order of Inventory, InkManager and Actor verbs,
+	// the verbCallbacks may not exist. So, we search the Cb lazily when needed.
+	private String sCb;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the text is showed and the action continues inmediatly")
+	private boolean wait = true;
+
+	protected World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
 	@Override
 	public void resume() {
-		if(verbCb != null || verbCbSer != null) {
-			if(verbCb==null) {
-				verbCb =  ActionCallbackSerialization.find(verbCbSer);
-				verbCbSer = null;
+		if (verbCb != null || sCb != null) {
+
+			if (verbCb == null) {
+				verbCb = ActionCallbackSerializer.find(w, w.getCurrentScene(), sCb);
 			}
-			
+
 			ActionCallback cb2 = verbCb;
 			verbCb = null;
+			sCb = null;
 			cb2.resume();
 		}
 	}
-	
+
 	public void setVerbCb(ActionCallback cb) {
-		this.verbCb = cb;
+		verbCb = cb;
+		sCb = null;
 	}
 
 	public void setWait(boolean wait) {
 		this.wait = wait;
 	}
-	
+
 	public boolean getWait() {
 		return wait;
 	}
 
 	@Override
 	public void write(Json json) {
-		json.writeValue("wait", wait);
-		
-		if(verbCbSer != null)
-			json.writeValue("cb", verbCbSer);
-		else
-			json.writeValue("cb", ActionCallbackSerialization.find(verbCb), verbCb == null ? null : String.class);	
+		if (verbCb != null) {
+			World w = ((BladeJson) json).getWorld();
+			Scene s = ((BladeJson) json).getScene();
+			json.writeValue("cb", ActionCallbackSerializer.serialize(w, s, verbCb));
+		}
 	}
 
 	@Override
-	public void read (Json json, JsonValue jsonData) {
-		wait = json.readValue("wait", Boolean.class, jsonData);
-		
-		verbCbSer = json.readValue("cb", String.class, jsonData);
+	public void read(Json json, JsonValue jsonData) {
+		sCb = json.readValue("cb", String.class, jsonData);
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/CameraAction.java b/blade-engine/src/com/bladecoder/engine/actions/CameraAction.java
index b66dc15dc..c2fcce5d5 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/CameraAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/CameraAction.java
@@ -15,122 +15,117 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
 import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.Param.Type;
 import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
 import com.bladecoder.engine.model.SceneCamera;
 import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.InterpolationMode;
+
+@ActionDescription("Set/Animates the camera position and zoom. Also can stablish the follow character parameter")
+public class CameraAction implements Action {
+	@ActionPropertyDescription("Sets the camera position relative to this actor.")
+	@ActionProperty(type = Type.ACTOR)
+	private String target;
 
-public class CameraAction extends BaseCallbackAction {
-	public static final String INFO = "Set/Animates the camera position and zoom. Also can stablish the follow character parameter";
-	public static final Param[] PARAMS = {
-			new Param("pos", "The target position", Type.VECTOR2),
-			new Param("zoom", "The target 'zoom'", Type.FLOAT),
-			new Param("duration",
-					"Duration of the animation in seconds. If not '0' and animation is triggered",
-					Type.FLOAT),
-			new Param("followActor", "Sets the actor to follow. 'none' puts no actor to follow",
-					Type.STRING),
-			new Param(
-					"wait",
-					"If this param is 'false' the text is showed and the action continues inmediatly",
-					Type.BOOLEAN, true) };
-
-	private String actorId, followActorId;
-	private float zoom=-1, duration;
+	@ActionProperty
+	@ActionPropertyDescription("The target position")
 	private Vector2 pos;
 
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		followActorId = params.get("followActorId");
+	@ActionProperty
+	@ActionPropertyDescription("The target 'zoom'. If not set, the current zoom is used.")
+	private Float zoom;
 
-		if (params.get("pos") != null)
-			pos = Param.parseVector2(params.get("pos"));
+	@ActionProperty
+	@ActionPropertyDescription("Duration of the animation in seconds. If not '0' and animation is triggered")
+	private Float duration;
 
-		if (params.get("zoom") != null)
-			zoom = Float.parseFloat(params.get("zoom"));
+	@ActionPropertyDescription("Sets the actor to follow. 'none' puts no actor to follow")
+	@ActionProperty(type = Type.ACTOR)
+	private String followActor;
 
-		if (params.get("duration") != null)
-			duration = Float.parseFloat(params.get("duration"));
-		else
-			duration = 0;
+	@ActionProperty
+	@ActionPropertyDescription("The interpolation mode")
+	private InterpolationMode interpolation;
 
-		if (params.get("wait") != null) {
-			setWait(Boolean.parseBoolean(params.get("wait")));
-		}
-		
-		if(duration == 0) setWait(false);
+	@ActionProperty(defaultValue = "true", required = true)
+	@ActionPropertyDescription("If this param is 'false' the text is showed and the action continues inmediatly")
+	private boolean wait = true;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public boolean run(ActionCallback cb) {
-		setVerbCb(cb);
+	public boolean run(VerbRunner cb) {
+
+		Vector2 pos2 = null;
+
+		Float zoom2 = zoom;
+
+		if (pos != null)
+			pos2 = new Vector2(pos);
 
 		float scale = EngineAssetManager.getInstance().getScale();
 
-		SceneCamera camera = World.getInstance().getSceneCamera();
-		
-		if(zoom == -1)
-			zoom = camera.getZoom();
-		
-		if(pos == null) {
-			pos = camera.getPosition();
-			pos.x /= scale;
-			pos.y /= scale;
-		}
+		SceneCamera camera = w.getSceneCamera();
 
-		if (followActorId != null) {
-			if (followActorId.equals("none"))
-				camera.updatePos(null);
-			else
-				camera.updatePos((SpriteActor) World.getInstance().getCurrentScene()
-						.getActor(followActorId, false));
+		if (zoom2 == null || zoom2 < 0)
+			zoom2 = camera.getZoom();
+
+		if (pos == null && target == null) {
+			pos2 = new Vector2(camera.getPosition());
+			pos2.x /= scale;
+			pos2.y /= scale;
 		}
 
-		if (duration == 0) {
-			camera.setZoom(zoom);
-			camera.setPosition(pos.x * scale, pos.y * scale);
-		} else {
-			camera.startAnimation(pos.x * scale, pos.y * scale, zoom, duration, getWait()?this:null);
+		if (target != null) {
+			BaseActor target = w.getCurrentScene().getActor(this.target, false);
+
+			float x = target.getX();
+			float y = target.getY();
+
+			if (target instanceof InteractiveActor) {
+				Vector2 refPoint = ((InteractiveActor) target).getRefPoint();
+				x += refPoint.x;
+				y += refPoint.y;
+			}
+
+			if (pos2 != null) {
+				pos2.x += x;
+				pos2.y += y;
+			} else {
+				pos2 = new Vector2(x, y);
+			}
 		}
-		
-		return getWait();
-	}
 
+		camera.stopAnim();
 
-	@Override
-	public void write(Json json) {
-		json.writeValue("actorId", actorId);
-		json.writeValue("followActorId", followActorId);
-		json.writeValue("pos", pos);
-		json.writeValue("zoom", zoom);
-		json.writeValue("duration", duration);
-		super.write(json);
-	}
+		if (followActor != null) {
+			if (followActor.equals("none"))
+				w.getCurrentScene().setCameraFollowActor(null);
+			else {
+				w.getCurrentScene()
+						.setCameraFollowActor((SpriteActor) w.getCurrentScene().getActor(followActor, false));
+			}
+		}
 
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		actorId = json.readValue("actorId", String.class, jsonData);
-		followActorId = json.readValue("followActorId", String.class, jsonData);
-		pos = json.readValue("pos", Vector2.class, jsonData);
-		zoom = json.readValue("zoom", Float.class, jsonData);
-		duration = json.readValue("duration", Float.class, jsonData);
-		super.read(json, jsonData);
-	}
+		if (duration == null || duration == 0) {
+			camera.setZoom(zoom2);
+			camera.setPosition(pos2.x * scale, pos2.y * scale);
+			return false;
+		} else {
+			camera.startAnimation(pos2.x * scale, pos2.y * scale, zoom2, duration, interpolation, wait ? cb : null);
+		}
 
-	@Override
-	public String getInfo() {
-		return INFO;
+		return wait;
 	}
 
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/CancelVerbAction.java b/blade-engine/src/com/bladecoder/engine/actions/CancelVerbAction.java
index a19945950..7e35af79b 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/CancelVerbAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/CancelVerbAction.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,63 +15,70 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
 import com.bladecoder.engine.actions.Param.Type;
 import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
 
 /**
  * Cancels a running verb.
- * 
+ *
  * @author rgarcia
  */
+@ActionDescription("Stops the named verb if it is in execution.")
 public class CancelVerbAction implements Action {
-	public static final String INFO = "Stops the named verb if it is in execution.";
-	public static final Param[] PARAMS = {
-		new Param("verb", "The verb to stop", Type.STRING, true), 
-		new Param("target", "If the verb is 'use', the target actor", Type.ACTOR)
-		};
-	
-	String actorId;
-	String verb;
-	String target;
-	
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		verb = params.get("verb");
-		target = params.get("target");
-	}
+    @ActionPropertyDescription("The target actor. Empty for the current actor.")
+    @ActionProperty(type = Type.ACTOR)
+    private String actor;
+
+    @ActionProperty
+    @ActionPropertyDescription("The verb to stop. Empty for the current verb.")
+    private String verb;
+
+    @ActionPropertyDescription("If the verb is 'use', the target actor")
+    @ActionProperty(type = Type.ACTOR)
+    private String target;
+
+    private World w;
+
+    @Override
+    public void init(World w) {
+        this.w = w;
+    }
+
+    @Override
+    public boolean run(VerbRunner cb) {
+
+        VerbRunner v = null;
+
+        if (verb == null) {
+            v = cb;
+        }
+
+        if (v == null && actor != null) {
+            BaseActor a = w.getCurrentScene()
+                    .getActor(actor, true);
+            v = ((InteractiveActor) a).getVerb(verb, target);
+        }
 
-	@Override
-	public boolean run(ActionCallback cb) {
+        if (v == null) {
+            v = w.getCurrentScene().getVerb(verb);
+        }
 
-		if(actorId != null) {
-			BaseActor actor = World.getInstance().getCurrentScene().getActor(actorId, true);
-		
-			actor.getVerbManager().cancelVerb(verb, actor.getState(), target);
-		} else {
-			Scene s = World.getInstance().getCurrentScene();
-			s.getVerbManager().cancelVerb(verb, s.getState(), target);
-		}
-		
-		return false;
-	}
+        if (v == null) {
+            v = w.getVerbManager().getVerb(verb, null, null);
+        }
 
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
+        if (v != null) {
+            // Cancel possible pending timer
+            w.getCurrentScene().getTimers().removeTimerWithCb(v);
+            v.cancel();
+        } else
+            EngineLogger.error("Cannot find VERB: " + verb + " for ACTOR: " + actor);
 
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
+        return false;
+    }
 
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ChooseAction.java b/blade-engine/src/com/bladecoder/engine/actions/ChooseAction.java
new file mode 100644
index 000000000..f7c10fa25
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/ChooseAction.java
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import java.util.List;
+
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Execute only one action inside the Choose/EndChoose block.")
+public class ChooseAction extends AbstractControlAction implements Serializable {
+	public enum ChooseCriteria {
+		ITERATE, RANDOM, CYCLE
+	}
+
+	/**
+	 * When the verb is a comma separated verb list, we use chooseCriteria as criteria to choose the verb to execute.
+	 */
+	@ActionProperty(required = true, defaultValue = "CYCLE")
+	@ActionPropertyDescription("The action to execute will be selected following this criteria.")
+	private ChooseCriteria chooseCriteria = ChooseCriteria.CYCLE;
+
+	/** Used when choose_criteria is 'iterate' or 'cycle' */
+	int chooseCount = -1;
+	
+	@Override
+	public void init(World w) {
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+
+		int startIp = cb.getIP();
+		int ip0 = startIp + 1;
+		final List<Action> actions = cb.getActions();
+
+		int ip = skipControlIdBlock(actions, startIp);
+		int numActions = ip - startIp - 1;
+
+		if(numActions <= 0)
+			return false;
+
+		switch (chooseCriteria) {
+			case ITERATE:
+				chooseCount++;
+				break;
+			case RANDOM:
+				chooseCount = MathUtils.random(0, numActions - 1);
+				break;
+			case CYCLE:
+				chooseCount = (chooseCount + 1) % numActions;
+				break;
+		}
+
+		cb.setIP(ip);
+
+		if(chooseCount < numActions) {
+			return actions.get(ip0 + chooseCount).run(cb);
+		}
+
+		return false;
+	}
+
+	@Override
+	public String getControlActionID() {
+		return caID;
+	}
+	
+	
+	@Override
+	public void write(Json json) {
+		json.writeValue("chooseCount", chooseCount);
+	}
+
+	@Override
+	public void read (Json json, JsonValue jsonData) {
+		chooseCount = json.readValue("chooseCount", int.class, 0, jsonData);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/CommentAction.java b/blade-engine/src/com/bladecoder/engine/actions/CommentAction.java
new file mode 100644
index 000000000..baedcd32a
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/CommentAction.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.graphics.Color;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.Text;
+import com.bladecoder.engine.model.TextManager;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription(name = "Comment", value = "Comment action for documentation porposes. Does nothing.")
+public class CommentAction implements Action {
+	@ActionProperty(required = false, type = Type.SMALL_TEXT)
+	@ActionPropertyDescription("The comment.")
+	private String comment;
+
+	@ActionProperty(required = true, defaultValue = "false")
+	@ActionPropertyDescription("When true, the comment will be showed on screen while testing.")
+	private boolean debug = false;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		if (EngineLogger.debugMode() && comment != null) {
+			EngineLogger.debug(comment);
+
+			if (debug)
+				w.getCurrentScene().getTextManager().addText(comment, TextManager.POS_SUBTITLE,
+						TextManager.POS_SUBTITLE, false, Text.Type.UI, Color.YELLOW, null, null, null, null, null);
+		}
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/DialogOptionAction.java b/blade-engine/src/com/bladecoder/engine/actions/DialogOptionAction.java
deleted file mode 100644
index 268898555..000000000
--- a/blade-engine/src/com/bladecoder/engine/actions/DialogOptionAction.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.actions;
-
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
-import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.model.Dialog;
-import com.bladecoder.engine.model.DialogOption;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.util.EngineLogger;
-
-public class DialogOptionAction implements Action {
-	public static final String INFO = "Change the selected dialog option properties";
-	public static final Param[] PARAMS = {
-		new Param("dialog", "The dialog", Type.STRING, true),	
-		new Param("option", "The option", Type.STRING, true),
-		new Param("visible", "Shows/Hide the dialog option", Type.BOOLEAN),
-		new Param("set_current", "Sets the selected option as the current dialog option", Type.BOOLEAN)		
-		};	
-	
-	
-	String actorId;
-	String dialog;
-	String option;
-	boolean setVisibility;
-	boolean setCurrent = false;
-	boolean visibility;
-
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		dialog = params.get("dialog");
-		option = params.get("option");
-
-		if (params.get("visible") != null) {
-			setVisibility = true;
-			visibility = Boolean.parseBoolean(params.get("visible"));
-		}
-
-		if (params.get("set_current") != null) {
-			setCurrent = Boolean.parseBoolean(params.get("set_current"));
-		}
-	}
-
-	@Override
-	public boolean run(ActionCallback cb) {
-
-		SpriteActor actor = (SpriteActor) World.getInstance().getCurrentScene()
-				.getActor(actorId, false);
-		Dialog d = actor.getDialog(dialog);
-
-		if (d == null) {
-			EngineLogger.error("DialogOptionAction: Dialog '" + dialog + "' not found");
-			return false;
-		}
-
-		DialogOption o = null;
-		
-		if (option != null) {
-			o = d.findSerOption(option);
-
-			if (o == null) {
-				EngineLogger.error("DialogOptionAction: Option '" + option + "' not found");
-				return false;
-			}
-		}
-
-		if (setVisibility && o != null)
-			o.setVisible(visibility);
-
-		if (setCurrent) {
-			World.getInstance().setCurrentDialog(actor.getDialog(dialog));
-			d.setCurrentOption(o);
-		}
-		
-		return false;
-	}
-	
-
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/DisableActionAction.java b/blade-engine/src/com/bladecoder/engine/actions/DisableActionAction.java
new file mode 100644
index 000000000..b9dd8edaa
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/DisableActionAction.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import java.io.StringWriter;
+
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonReader;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.ActionUtils;
+
+/**
+ * This action wraps an action that has been disabled.
+ * 
+ * @author rgarcia
+ */
+@ActionDescription("Helper action to allow disabled actions.")
+public class DisableActionAction implements Action {
+	@ActionProperty(required = true)
+	private String serializedAction;
+	
+	private Action action;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		return false;
+	}
+
+	public void setAction(Action a) {
+		action = a;
+		Json json = new Json();
+		StringWriter buffer = new StringWriter();
+		json.setWriter(buffer);
+		ActionUtils.writeJson(a, json);
+		serializedAction = buffer.toString();
+	}
+	
+	public Action getAction() {
+		if(action == null) {
+			Json json = new Json();
+			JsonValue root = new JsonReader().parse(serializedAction);
+			action =  ActionUtils.readJson(w, json, root);
+		}
+		
+		return action;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/DropItemAction.java b/blade-engine/src/com/bladecoder/engine/actions/DropItemAction.java
index 97c57a48b..b2755e44b 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/DropItemAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/DropItemAction.java
@@ -16,67 +16,101 @@
 package com.bladecoder.engine.actions;
 
 import java.text.MessageFormat;
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
 
 import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Disposable;
 import com.bladecoder.engine.actions.Param.Type;
 import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.Inventory;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.util.EngineLogger;
 
+@ActionDescription("Drops the selected inventory actor.")
 public class DropItemAction implements Action {
-	public static final String INFO = "Drops the inventory actor in the scene.";
-	public static final Param[] PARAMS = {
-		new Param("pos", "Position in the scene where de actor is dropped", Type.VECTOR2, false)
-		};	
-	
-	String itemId;
-	Vector2 pos;
-	
+	@ActionProperty
+	@ActionPropertyDescription("The 'id' from the inventory item to remove. If empty remove all items.")
+	private String actor;
+
+	@ActionProperty(type = Type.SCENE, required = false)
+	@ActionPropertyDescription("The target scene. If not selected the item is dropped in the current scene.")
+	private String scene = null;
+
+	@ActionProperty
+	@ActionPropertyDescription("Position in the scene where de actor is dropped")
+	private Vector2 pos;
+
+	@ActionProperty
+	@ActionPropertyDescription("Inventory name. If empty, the active inventory is used.")
+	private String inventory;
+
+	private World w;
+
 	@Override
-	public void setParams(HashMap<String, String> params) {
-		itemId = params.get("actor");
-		pos = Param.parseVector2(params.get("pos"));
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public boolean run(ActionCallback cb) {
-		float scale =  EngineAssetManager.getInstance().getScale();
-		
-		BaseActor actor = World.getInstance().getInventory().getItem(itemId);
-		
-		if(actor==null) {
-			EngineLogger.error(MessageFormat.format("DropItemAction -  Item not found: {0}", itemId));
-			return false;
+	public boolean run(VerbRunner cb) {
+		Scene ts = null;
+
+		if (scene == null)
+			ts = w.getCurrentScene();
+		else
+			ts = w.getScene(scene);
+
+		Inventory inv = null;
+
+		if (inventory == null) {
+			inv = w.getInventory();
+		} else {
+			inv = w.getInventories().get(inventory);
+			if (inv == null) {
+				EngineLogger.error("Inventory not found: " + inventory);
+				return false;
+			}
 		}
-		
-		World.getInstance().getInventory().removeItem(itemId);
-		
-		World.getInstance().getCurrentScene().addActor(actor);
-		
-		if(actor.isWalkObstacle() && actor.getScene().getPolygonalNavGraph() != null) {
-			actor.getScene().getPolygonalNavGraph().addDinamicObstacle(actor.getBBox());
+
+		BaseActor a;
+
+		if (actor != null) {
+			a = inv.get(actor);
+
+			if (a == null) {
+				EngineLogger.error(MessageFormat.format("DropItemAction -  Item not found: {0}", actor));
+				return false;
+			}
+
+			removeActor(inv, ts, a);
+		} else {
+			int n = inv.getNumItems();
+
+			for (int i = n - 1; i >= 0; i--) {
+				a = inv.get(i);
+
+				removeActor(inv, ts, a);
+			}
 		}
-		
-		if(pos != null)
-			((SpriteActor)actor).setPosition(pos.x * scale, pos.y * scale);
-		
+
 		return false;
 	}
 
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
+	private void removeActor(Inventory inv, Scene ts, BaseActor a) {
 
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
+		float scale = EngineAssetManager.getInstance().getScale();
+
+		inv.removeItem(a.getId());
+
+		if (ts != w.getCurrentScene() && w.getCachedScene(ts.getId()) == null && a instanceof Disposable)
+			((Disposable) a).dispose();
+
+		ts.addActor(a);
+
+		if (pos != null)
+			a.setPosition(pos.x * scale, pos.y * scale);
 	}
+
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/EndAction.java b/blade-engine/src/com/bladecoder/engine/actions/EndAction.java
new file mode 100644
index 000000000..3565668a5
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/EndAction.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+import java.util.List;
+
+@ActionDescription("Marks the end of a block for a control action")
+public class EndAction extends AbstractControlAction {
+
+    @Override
+    public void init(World w) {
+    }
+
+    @Override
+    public boolean run(VerbRunner cb) {
+        // FIXME: This is now more generic than before, but also less optimized (we always get our "parent")
+        final List<Action> actions = cb.getActions();
+        final int ip = cb.getIP();
+
+        final int parentIp = getParentControlAction(caID, actions, ip);
+        final AbstractControlAction parent = (AbstractControlAction) actions.get(parentIp);
+
+        if (parent instanceof RepeatAction) {
+            cb.setIP(parentIp - 1);
+        } else if (parent instanceof AbstractIfAction) {
+            int newIp = skipControlIdBlock(actions, parentIp); // goto Else
+            newIp = skipControlIdBlock(actions, newIp); // goto EndIf
+
+            cb.setIP(newIp);
+        }
+
+        return false;
+    }
+
+    private int getParentControlAction(String caID, List<Action> actions, int ip) {
+        do {
+            ip--;
+        } while (!(actions.get(ip) instanceof AbstractControlAction) || !((AbstractControlAction) actions.get(
+                ip)).getControlActionID().equals(caID));
+
+        return ip;
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/EndGameAction.java b/blade-engine/src/com/bladecoder/engine/actions/EndGameAction.java
new file mode 100644
index 000000000..dd93ac221
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/EndGameAction.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.BladeEngine;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.ui.UI;
+
+@ActionDescription("Ends the game and show the credits.")
+public class EndGameAction implements Action {
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+
+		UI ui = BladeEngine.getAppUI();
+		ui.setCurrentScreen(UI.Screens.CREDIT_SCREEN);
+
+		w.endGame();
+
+		return true;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/FrameAnimationAction.java b/blade-engine/src/com/bladecoder/engine/actions/FrameAnimationAction.java
deleted file mode 100644
index e24376b2b..000000000
--- a/blade-engine/src/com/bladecoder/engine/actions/FrameAnimationAction.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.actions;
-
-import java.text.MessageFormat;
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.BaseCallbackAction;
-import com.bladecoder.engine.actions.Param;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
-import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.anim.Tween;
-import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.util.EngineLogger;
-
-public class FrameAnimationAction extends BaseCallbackAction implements Action {
-	public static final String INFO = "Sets an actor frame animation";
-	public static final Param[] PARAMS = {
-		new Param("frame_animation", "The FA to set", Type.STRING, true),	
-		new Param("count", "The times to repeat. -1 to infinity repeat", Type.INTEGER),
-		new Param("wait", "If this param is 'false' the text is showed and the action continues inmediatly", Type.BOOLEAN, true),
-		new Param("repeat", "The repeat mode", Type.STRING, true, "no_repeat", new String[]{"repeat", "yoyo", "no_repeat", "reverse", "sprite defined"}),
-		new Param("x", "Puts actor 'x' position after sets the FA", Type.FLOAT),
-		new Param("y", "Puts actor 'y' position after sets the FA", Type.FLOAT),
-		new Param("dx", "Adds 'dx' to the actor position", Type.FLOAT),
-		new Param("dy", "Adds 'dy' to the actor position", Type.FLOAT),			
-		};		
-	
-	private static final int NO_POS = 0;
-	private static final int SET_POS_ABSOLUTE = 1;
-	private static final int SET_POS_RELATIVE = 2;
-	
-	private String fa;
-	private String actorId;
-	private float posx, posy;
-	private int setPos = NO_POS;
-	private boolean reverse = false;
-	private int repeat = Tween.FROM_FA;
-	private int count = 1;
-
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		fa = params.get("frame_animation");
-
-		if (params.get("x") != null) {
-			posx = Float.parseFloat(params.get("x"));
-			posy = Float.parseFloat(params.get("y"));
-			setPos = SET_POS_ABSOLUTE;
-		}
-		
-		if (params.get("dx") != null) {
-			posx = Float.parseFloat(params.get("dx"));
-			posy = Float.parseFloat(params.get("dy"));
-			setPos = SET_POS_RELATIVE;
-		}
-		
-		
-		if(params.get("count") != null) {
-			count = Integer.parseInt(params.get("count"));
-		}
-		
-		if(params.get("wait") != null) {
-			setWait(Boolean.parseBoolean(params.get("wait")));
-		}
-		
-		if(params.get("animation_type") != null) {
-			String repeatStr = params.get("animation_type");
-			if (repeatStr.equalsIgnoreCase("repeat")) {
-				repeat = Tween.REPEAT;
-			} else if (repeatStr.equalsIgnoreCase("yoyo")) {
-				repeat = Tween.PINGPONG;
-			} else if (repeatStr.equalsIgnoreCase("no_repeat")) {
-				repeat = Tween.NO_REPEAT;
-			} else if (repeatStr.equalsIgnoreCase("reverse")) {
-				repeat = Tween.REVERSE;				
-			} else {
-				repeat = Tween.FROM_FA;
-			}
-		}
-	}
-
-	@Override
-	public boolean run(ActionCallback cb) {
-		setVerbCb(cb);
-		EngineLogger.debug(MessageFormat.format("SET_FRAMEANIMATION_ACTION: {0}", fa));
-		
-		float scale =  EngineAssetManager.getInstance().getScale();
-
-		SpriteActor actor = (SpriteActor) World.getInstance().getCurrentScene().getActor(actorId, true);
-		
-		if (setPos == SET_POS_ABSOLUTE)
-			actor.setPosition(posx * scale, posy * scale);
-		else if (setPos == SET_POS_RELATIVE) {		
-			actor.setPosition(actor.getX() + posx * scale, actor.getY() + posy * scale);
-		}
-		
-		actor.startFrameAnimation(fa, repeat, count, getWait()?this:null);
-		
-		return getWait();
-	}
-
-	@Override
-	public void write(Json json) {		
-		json.writeValue("fa", fa);
-		json.writeValue("actorId", actorId);
-		json.writeValue("posx", posx);
-		json.writeValue("posy", posy);
-		json.writeValue("setPos", setPos);
-		json.writeValue("reverse", reverse);
-		json.writeValue("repeat", repeat);
-		json.writeValue("count", count);
-		super.write(json);	
-	}
-
-	@Override
-	public void read (Json json, JsonValue jsonData) {	
-		fa = json.readValue("fa", String.class, jsonData);
-		actorId = json.readValue("actorId", String.class, jsonData);
-		posx = json.readValue("posx", Float.class, jsonData);
-		posy = json.readValue("posy", Float.class, jsonData);
-		setPos = json.readValue("setPos", Integer.class, jsonData);
-		reverse = json.readValue("reverse", Boolean.class, jsonData);
-		repeat = json.readValue("repeat", Integer.class, jsonData);
-		count = json.readValue("count", Integer.class, jsonData);
-		super.read(json, jsonData);
-	}	
-	
-
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/GotoAction.java b/blade-engine/src/com/bladecoder/engine/actions/GotoAction.java
index 36f67b7bf..a06e9eaf1 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/GotoAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/GotoAction.java
@@ -15,131 +15,90 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.BaseCallbackAction;
-import com.bladecoder.engine.actions.Param;
-import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.Param.Type;
 import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.util.EngineLogger;
 
-public class GotoAction extends BaseCallbackAction {
-	public static final String INFO = "Walks to the selected position";
-	public static final Param[] PARAMS = {
-		new Param("pos", "The position to walk to", Type.VECTOR2),
-		new Param("target", "Walks to the actor position", Type.ACTOR),
-		new Param("wait", "If this param is 'false' the text is showed and the action continues inmediatly", Type.BOOLEAN, true),
-		};	
-	
-	private String actorId;
+@ActionDescription("Walks to the selected position")
+public class GotoAction implements Action {
+	public enum Align {
+		CENTER, LEFT, RIGHT
+	}
+
+	@ActionPropertyDescription("The walking actor")
+	@ActionProperty(type = Type.CHARACTER_ACTOR, required = true)
+	private String actor;
+
+	@ActionPropertyDescription("Walks to this actor")
+	@ActionProperty(type = Type.ACTOR)
+	private String target;
+
+	@ActionProperty
+	@ActionPropertyDescription("The absolute position to walk to if no target actor is selected. Relative to target if selected.")
 	private Vector2 pos;
-	private String targetId;
 
-	@Override
-	public boolean run(ActionCallback cb) {
-		setVerbCb(cb);
-		
-		float scale = EngineAssetManager.getInstance().getScale();
-		
-		SpriteActor actor = (SpriteActor) World.getInstance().getCurrentScene().getActor(actorId, false);
-		
-		if(targetId!=null) {
-			BaseActor target =  World.getInstance().getCurrentScene().getActor(targetId, false);
-			if(target != null) {
-				Rectangle bbox = target.getBBox().getBoundingRectangle();
-				actor.goTo(new Vector2(bbox.x, bbox.y), getWait()?this:null);
-			} else {
-				EngineLogger.error("GotoAction - Target actor doesn't exists: " + targetId);
-			}
-		} else 
-			actor.goTo(new Vector2(pos.x * scale, pos.y * scale), getWait()?this:null);
-		
-		return getWait();
-	}
+	@ActionProperty(required = true, defaultValue = "false")
+	@ActionPropertyDescription("Ignore the walking zone and walk in a straight line.")
+	private boolean ignoreWalkZone = false;
 
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
+	@ActionProperty(required = true, defaultValue = "true")
+	@ActionPropertyDescription("If this param is 'false' the text is showed and the action continues inmediatly")
+	private boolean wait = true;
 
-		if(params.get("pos") != null) {
-			pos = Param.parseVector2(params.get("pos"));
-		} else if(params.get("target") != null) {
-			targetId = params.get("target") ;	
-		}
-		
-		if(params.get("wait") != null) {
-			setWait(Boolean.parseBoolean(params.get("wait")));
-		}
-	}
-	
-	/**
-	 *  If 'player' if far from 'actor', we bring it close. 
-	 *  If 'player' is closed from 'actor' do nothing.
-	 *  
-	 *  TODO: DOESN'T WORK NOW
-	 *  
-	 * @param player
-	 * @param actor
-	 */
-	@SuppressWarnings("unused")
-	private void goNear(SpriteActor player, BaseActor actor) {
-		Rectangle rdest = actor.getBBox().getBoundingRectangle();
-
-		// Vector2 p0 = new Vector2(player.getSprite().getX(),
-		// player.getSprite().getY());
-		Vector2 p0 = new Vector2(player.getX(), player.getY());
-
-		// calculamos el punto más cercano al objeto
-		Vector2 p1 = new Vector2(rdest.x, rdest.y); // izquierda
-		Vector2 p2 = new Vector2(rdest.x + rdest.width, rdest.y); // derecha
-		Vector2 p3 = new Vector2(rdest.x + rdest.width / 2, rdest.y); // centro
-		float d1 = p0.dst(p1);
-		float d2 = p0.dst(p2);
-		float d3 = p0.dst(p3);
-		Vector2 pf;
-
-		if (d1 < d2 && d1 < d3) {
-			pf = p1;
-		} else if (d2 < d1 && d2 < d3) {
-			pf = p2;
-		} else {
-			pf = p3;
-		}
+	private World w;
 
-		player.goTo(pf, this);
-	}		
-	
 	@Override
-	public void write(Json json) {		
-		json.writeValue("pos", pos);
-		json.writeValue("targetId", targetId);
-		json.writeValue("actorId", actorId);
-		super.write(json);	
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public void read (Json json, JsonValue jsonData) {
-		pos = json.readValue("pos", Vector2.class, jsonData);
-		targetId = json.readValue("targetId", String.class, jsonData);
-		actorId = json.readValue("actorId", String.class, jsonData);
-		super.read(json, jsonData);
-	}	
-	
+	public boolean run(VerbRunner cb) {
 
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
+		CharacterActor actor = (CharacterActor) w.getCurrentScene().getActor(this.actor, false);
 
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
+		float x = actor.getX();
+		float y = actor.getY();
+
+		if (target != null) {
+			BaseActor targetActor = w.getCurrentScene().getActor(target, false);
+
+			if (targetActor == null) {
+				EngineLogger.error(target + " not found in the current scene.");
+				return false;
+			}
+
+			x = targetActor.getX();
+			y = targetActor.getY();
+
+			if (targetActor instanceof InteractiveActor && targetActor != actor) {
+				Vector2 refPoint = ((InteractiveActor) targetActor).getRefPoint();
+				x += refPoint.x;
+				y += refPoint.y;
+			}
+
+			if (pos != null) {
+				float scale = EngineAssetManager.getInstance().getScale();
+
+				x += pos.x * scale;
+				y += pos.y * scale;
+			}
+		} else if (pos != null) {
+			float scale = EngineAssetManager.getInstance().getScale();
+
+			x = pos.x * scale;
+			y = pos.y * scale;
+		}
+
+		actor.goTo(new Vector2(x, y), wait ? cb : null, ignoreWalkZone);
+
+		return wait;
 	}
+
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/IAchievementAPI.java b/blade-engine/src/com/bladecoder/engine/actions/IAchievementAPI.java
new file mode 100644
index 000000000..13a9ce543
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/IAchievementAPI.java
@@ -0,0 +1,7 @@
+package com.bladecoder.engine.actions;
+
+public interface IAchievementAPI {
+
+	void setAchievement(String name);
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/IfAttrAction.java b/blade-engine/src/com/bladecoder/engine/actions/IfAttrAction.java
new file mode 100644
index 000000000..21fdf453d
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/IfAttrAction.java
@@ -0,0 +1,202 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Inventory;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engine.util.PolygonUtils;
+
+@ActionDescription(name = "IfActorAttr", value = "Execute the actions inside the If/EndIf if the attribute has the specified value.")
+public class IfAttrAction extends AbstractIfAction {
+	public static final String ENDTYPE_VALUE = "else";
+
+	public enum ActorAttribute {
+		STATE, VISIBLE, INTERACTIVE, IN_INVENTORY, TARGET, IN_SCENE, LAYER, DIRECTION, IN_UI, INSIDE
+	}
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The target actor")
+	private SceneActorRef actor;
+
+	@ActionProperty(required = true, defaultValue = "STATE")
+	@ActionPropertyDescription("The actor attribute")
+	private ActorAttribute attr;
+
+	@ActionProperty
+	@ActionPropertyDescription("The attribute value")
+	private String value;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		Scene s = actor.getScene(w);
+
+		final String actorId = actor.getActorId();
+
+		if (attr.equals(ActorAttribute.STATE)) {
+			BaseActor a = s.getActor(actorId, true);
+			if (!(a instanceof InteractiveActor)) {
+				EngineLogger.error(getClass() + "- Actor not found: " + actorId);
+				return false;
+			}
+
+			InteractiveActor ia = (InteractiveActor) a;
+			if (!ActionUtils.compareNullStr(value, ia.getState())) {
+				gotoElse(cb);
+			}
+		} else if (attr.equals(ActorAttribute.VISIBLE)) {
+			BaseActor a = s.getActor(actorId, true);
+			if (a == null) {
+				EngineLogger.error(getClass() + "- Actor not found: " + actorId);
+				return false;
+			}
+
+			boolean val = Boolean.parseBoolean(value);
+			if (val != a.isVisible()) {
+				gotoElse(cb);
+			}
+		} else if (attr.equals(ActorAttribute.INTERACTIVE)) {
+			BaseActor a = s.getActor(actorId, true);
+			if (a == null) {
+				EngineLogger.error(getClass() + "- Actor not found: " + actorId);
+				return false;
+			}
+
+			boolean val = Boolean.parseBoolean(value);
+
+			if (a instanceof InteractiveActor) {
+				if (val != ((InteractiveActor) a).getInteraction()) {
+					gotoElse(cb);
+				}
+			} else if (val) {
+				gotoElse(cb);
+			}
+		} else if (attr.equals(ActorAttribute.IN_INVENTORY)) {
+			// 'value' can have the inventory name to search in
+			// or 'true/false' to search in the current inventory.
+
+			Inventory inventory = null;
+			boolean val = true;
+
+			if (value != null) {
+				inventory = w.getInventories().get(value);
+			}
+
+			if (inventory == null) {
+				// boolean mode: search in the current inventory
+				val = Boolean.parseBoolean(value);
+				inventory = w.getInventory();
+			}
+
+			SpriteActor item = null;
+
+			item = inventory.get(actorId);
+
+			if ((val && item == null) || (!val && item != null)) {
+				gotoElse(cb);
+			}
+		} else if (attr.equals(ActorAttribute.TARGET)) {
+
+			if (!ActionUtils.compareNullStr(value, cb.getCurrentTarget())) {
+				gotoElse(cb);
+			}
+		} else if (attr.equals(ActorAttribute.IN_SCENE)) {
+			boolean val = Boolean.parseBoolean(value);
+
+			BaseActor a2 = s.getActor(actorId, false);
+
+			if ((val && a2 == null) || (!val && a2 != null))
+				gotoElse(cb);
+		} else if (attr.equals(ActorAttribute.IN_UI)) {
+			boolean val = Boolean.parseBoolean(value);
+
+			BaseActor a2 = w.getUIActors().get(actorId);
+
+			if ((val && a2 == null) || (!val && a2 != null))
+				gotoElse(cb);
+		} else if (attr.equals(ActorAttribute.LAYER)) {
+			BaseActor a = s.getActor(actorId, true);
+			if (!(a instanceof InteractiveActor)) {
+				EngineLogger.error(getClass() + "- No not found: " + actorId);
+				return false;
+			}
+
+			InteractiveActor ia = (InteractiveActor) a;
+			if (!ActionUtils.compareNullStr(value, ia.getLayer())) {
+				gotoElse(cb);
+			}
+		} else if (attr.equals(ActorAttribute.DIRECTION)) {
+
+			BaseActor a = s.getActor(actorId, true);
+			if (!(a instanceof SpriteActor)) {
+				EngineLogger.error(getClass() + "- No not found: " + actorId);
+				return false;
+			}
+
+			SpriteActor sa = (SpriteActor) a;
+
+			if (sa.getRenderer() instanceof AnimationRenderer) {
+				String dir = null;
+
+				String anim = ((AnimationRenderer) sa.getRenderer()).getCurrentAnimationId();
+				int idx = anim.lastIndexOf('.');
+
+				if (idx != -1)
+					dir = anim.substring(idx + 1);
+
+				if (!ActionUtils.compareNullStr(value, dir)) {
+					gotoElse(cb);
+				}
+			}
+		} else if (attr.equals(ActorAttribute.INSIDE)) {
+			BaseActor a = s.getActor(actorId, true);
+			if (a == null) {
+				EngineLogger.error(getClass() + "- No not found: " + actorId);
+				return false;
+			}
+
+			BaseActor insideActor = w.getCurrentScene().getActor(value, false);
+
+			if (insideActor == null) {
+				EngineLogger.debug("Actor for inside test not found: " + value);
+				gotoElse(cb);
+				return false;
+			}
+
+			boolean inside = PolygonUtils.isPointInside(insideActor.getBBox(), a.getX(), a.getY(), true);
+
+			if (!inside) {
+				gotoElse(cb);
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ActionCallbackQueue.java b/blade-engine/src/com/bladecoder/engine/actions/IfInkVariableAction.java
similarity index 52%
rename from blade-engine/src/com/bladecoder/engine/actions/ActionCallbackQueue.java
rename to blade-engine/src/com/bladecoder/engine/actions/IfInkVariableAction.java
index 9e48ed872..dee0feab4 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/ActionCallbackQueue.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/IfInkVariableAction.java
@@ -15,35 +15,34 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
 
-import com.bladecoder.engine.actions.ActionCallback;
+@ActionDescription("Execute the actions inside the If/EndIf if the Ink variable has the specified value.")
+public class IfInkVariableAction extends AbstractIfAction {
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The variable name")
+	private String name;
 
-/**
- * This is a queue to group all cb that must be triggered in the next iteration.
- * This class is neccessary to avoid concurrency problems.
- * 
- * All ActionCb must be called at once outside update methods of Actors.
- * 
- * @author rgarcia
- *
- */
-public class ActionCallbackQueue {
-	private static final List<ActionCallback> queue = new ArrayList<ActionCallback>();
+	@ActionProperty
+	@ActionPropertyDescription("The value")
+	private String value;
 	
-	public static void add(ActionCallback cb) {
-		queue.add(cb);
-	}
+	private World w;
 	
-	public static void run() {
-		if(!queue.isEmpty()) {
-			ActionCallback[] array = queue.toArray(new ActionCallback[queue.size()]);
-			
-			queue.clear();
-			
-			for(ActionCallback cb: array)
-				cb.resume();
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		
+		if (! w.getInkManager().compareVariable(name, value)) {
+			gotoElse((VerbRunner) cb);
 		}
+
+		return false;
 	}
+
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/IfPropertyAction.java b/blade-engine/src/com/bladecoder/engine/actions/IfPropertyAction.java
new file mode 100644
index 000000000..5dbdbb9ac
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/IfPropertyAction.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engine.util.Config;
+
+@ActionDescription("Execute actions inside the If/EndIf if the game property has the specified value. Properties are created with the 'Property' action or set in the 'BladeEngine.properties' file. The next always exists: SAVED_GAME_VERSION, PREVIOUS_SCENE, CURRENT_CHAPTER, PLATFORM.")
+public class IfPropertyAction extends AbstractIfAction {
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The property name")
+	private String name;
+
+	@ActionProperty
+	@ActionPropertyDescription("The property value")
+	private String value;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		String valDest = w.getCustomProperty(name);
+
+		if (valDest == null)
+			valDest = Config.getInstance().getProperty(name, null);
+
+		if (valDest == null)
+			valDest = Config.getInstance().getPref(name, null);
+
+		if (!ActionUtils.compareNullStr(value, valDest)) {
+			gotoElse(cb);
+		}
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/IfSceneAttrAction.java b/blade-engine/src/com/bladecoder/engine/actions/IfSceneAttrAction.java
new file mode 100644
index 000000000..b9fa0602f
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/IfSceneAttrAction.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.ActionUtils;
+
+@ActionDescription("Execute actions inside the If/EndIf if the scene attribute has the specified value.")
+public class IfSceneAttrAction extends AbstractIfAction {
+
+	public enum SceneAttr {
+		STATE, CURRENT_SCENE, PLAYER, IN_CUTMODE
+	}
+
+	@ActionPropertyDescription("The scene to check its attribute")
+	@ActionProperty(type = Type.SCENE)
+	private String scene;
+
+	@ActionProperty(required = true, defaultValue = "state")
+	@ActionPropertyDescription("The scene attribute")
+	private SceneAttr attr;
+
+	@ActionProperty
+	@ActionPropertyDescription("The attribute value")
+	private String value;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		Scene s = (scene != null && !scene.isEmpty()) ? w.getScene(scene) : w.getCurrentScene();
+
+		if (attr == SceneAttr.STATE) {
+			if (!ActionUtils.compareNullStr(value, s.getState())) {
+				gotoElse(cb);
+			}
+		} else if (attr == SceneAttr.CURRENT_SCENE) {
+			String scn = w.getCurrentScene().getId();
+
+			if (((value != null && !value.isEmpty()) && !ActionUtils.compareNullStr(value, scn))
+					|| (scene != null && !scene.isEmpty() && !ActionUtils.compareNullStr(s.getId(), scn))) {
+				gotoElse(cb);
+			}
+		} else if (attr == SceneAttr.PLAYER) {
+			CharacterActor player = s.getPlayer();
+
+			String id = player != null ? player.getId() : null;
+
+			if (!ActionUtils.compareNullStr(value, id)) {
+				gotoElse(cb);
+			}
+		} else if (attr == SceneAttr.IN_CUTMODE) {
+			boolean val = Boolean.parseBoolean(value);
+
+			if (val != w.inCutMode()) {
+				gotoElse(cb);
+			}
+		}
+
+		return false;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/InkCancelAction.java b/blade-engine/src/com/bladecoder/engine/actions/InkCancelAction.java
new file mode 100644
index 000000000..4a1217184
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/InkCancelAction.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.ink.InkVerbRunner;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("Stops the selected Ink flow.")
+public class InkCancelAction implements Action {
+	@ActionPropertyDescription("The conversation flow. Empty for the default flow.")
+	@ActionProperty(required = false)
+	private String flow;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+
+		InkVerbRunner inkVerbRunner;
+
+		try {
+			if (flow == null) {
+				inkVerbRunner = w.getInkManager().getDefaultVerbRunner();
+				w.getInkManager().getStory().switchToDefaultFlow();
+			} else {
+				inkVerbRunner = w.getInkManager().getVerbRunners().get(flow);
+
+				if (inkVerbRunner == null) {
+					EngineLogger.debug("Flow not found: " + flow);
+					return false;
+				}
+
+				w.getInkManager().getStory().switchFlow(flow);
+			}
+
+			inkVerbRunner.cancel();
+			w.getInkManager().getStory().resetCallstack();
+
+		} catch (Exception e) {
+			EngineLogger.error("Error cancelling flow: " + flow == null ? "DEFAULT" : flow);
+		}
+
+		return false;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/InkNewStoryAction.java b/blade-engine/src/com/bladecoder/engine/actions/InkNewStoryAction.java
new file mode 100644
index 000000000..bb85b2b4e
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/InkNewStoryAction.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("Load an Ink story.")
+public class InkNewStoryAction implements Action {
+	@ActionPropertyDescription("The story to load")
+	@ActionProperty(required = true)
+	private String storyName;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		try {
+			w.getInkManager().newStory(storyName);
+		} catch (Exception e) {
+			EngineLogger.error("Cannot load Ink Story: " + storyName + " " + e.getMessage());
+		}
+
+		return false;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/InkRunAction.java b/blade-engine/src/com/bladecoder/engine/actions/InkRunAction.java
new file mode 100644
index 000000000..ef84ce037
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/InkRunAction.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("Jump an Ink knot or stich.")
+public class InkRunAction implements Action {
+	@ActionPropertyDescription("The knot/stich/function path to jump. Ej: 'myKnotName' or 'myKnotName.theStitchWithin'")
+	@ActionProperty(required = true)
+	private String path;
+
+	@ActionPropertyDescription("List of params (comma separated) for the path. Use the % prefix for numbers.")
+	@ActionProperty(required = false)
+	private String params;
+
+	@ActionPropertyDescription("The conversation flow. Empty selects the default flow.")
+	@ActionProperty(required = false)
+	private String flow;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("Waits for the action to finish.")
+	private boolean wait = true;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		try {
+			Object[] p = null;
+
+			if (params != null && !params.trim().isEmpty()) {
+				String[] split = params.split(",");
+
+				p = new Object[split.length];
+
+				for (int i = 0; i < split.length; i++) {
+					String v = split[i].trim();
+					Object val = v;
+
+					if (v.charAt(0) == '%') {
+						try {
+							val = Integer.parseInt(v.substring(1));
+						} catch (NumberFormatException e) {
+							// do nothing
+						}
+					}
+
+					p[i] = val;
+				}
+			}
+
+			w.getInkManager().runPath(path, p, flow, wait ? cb : null);
+		} catch (Exception e) {
+			EngineLogger.error("Cannot jump to: " + path + " " + e.getMessage());
+		}
+
+		return wait;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/InkVariable.java b/blade-engine/src/com/bladecoder/engine/actions/InkVariable.java
new file mode 100644
index 000000000..66e8118af
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/InkVariable.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("Sets the value of an Ink variable.")
+public class InkVariable implements Action {
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("Variable name")
+	private String name;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("Value")
+	private String value;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		try {
+			w.getInkManager().setVariable(name, value);
+		} catch (Exception e) {
+			EngineLogger.error("Cannot set Ink variable: " + name + " " + e.getMessage());
+		}
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/LeaveAction.java b/blade-engine/src/com/bladecoder/engine/actions/LeaveAction.java
index 6a15f4e2d..69f590436 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/LeaveAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/LeaveAction.java
@@ -15,55 +15,35 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
 import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.util.EngineLogger;
-
 
+@ActionDescription("Change the current scene.")
 public class LeaveAction implements Action {
-	public static final String INFO = "Change the current scene. The target scene must exists in the current chapter.";
-	public static final Param[] PARAMS = {
-		new Param("scene", "The target scene", Type.STRING, false),
-		new Param("chapter", "The target chapter", Type.CHAPTER, false)
-		};		
-	
-	String scene;
-	String chapter;
-
-	@Override
-	public boolean run(ActionCallback cb) {
+	@ActionPropertyDescription("The target scene")
+	@ActionProperty(type = Type.SCENE, required = true)
+	private String scene;
 
-		EngineLogger.debug("LEAVE ACTION");
-		
-		if(chapter == null || chapter.isEmpty())
-			World.getInstance().setCurrentScene(scene);
-		else
-			World.getInstance().loadXMLChapter(chapter, scene);
-		
-		return false;
-	}
+	@ActionPropertyDescription("Inits the scene and run the 'init' verb")
+	@ActionProperty(defaultValue = "true", required = true)
+	private boolean init = true;
 
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		scene = params.get("scene");
-		chapter = params.get("chapter");
-	}
+	@ActionPropertyDescription("The verb to run after loading. If null, 'init' verb will be run but only if init=true")
+	@ActionProperty
+	private String initVerb = null;
 
+	private World w;
 
 	@Override
-	public String getInfo() {
-		return INFO;
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
+	public boolean run(VerbRunner cb) {
+		w.setCurrentScene(scene, init, initVerb);
 
+		return true;
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/LoadChapterAction.java b/blade-engine/src/com/bladecoder/engine/actions/LoadChapterAction.java
new file mode 100644
index 000000000..5057059f9
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/LoadChapterAction.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("Load the specified Chapter. Scene can be empty to load the default scene.")
+public class LoadChapterAction implements Action {
+	@ActionPropertyDescription("The target chapter")
+	@ActionProperty(type = Type.CHAPTER, required = true)
+	private String chapter;
+
+	@ActionPropertyDescription("The target scene")
+	@ActionProperty(type=Type.STRING, required = false)
+	private String scene;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		try {
+			w.loadChapter(chapter, scene, false);
+		} catch (Exception e) {
+			EngineLogger.error(e.getMessage());
+		}
+		
+		return true;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/LookAtAction.java b/blade-engine/src/com/bladecoder/engine/actions/LookAtAction.java
index bd8c71181..edfd48f9b 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/LookAtAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/LookAtAction.java
@@ -15,85 +15,90 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
-import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.anim.FrameAnimation;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.InteractiveActor;
 import com.bladecoder.engine.model.Text;
 import com.bladecoder.engine.model.TextManager;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.util.EngineLogger;
 
+@ActionDescription("Shows the text and puts the player looking at the selected actor direction")
 public class LookAtAction implements Action {
-	public static final String INFO = "Shows the text and sets the player to lookat in the selected actor direction";
-	public static final Param[] PARAMS = {
-		new Param("speech", "The 'soundId' to play if selected", Type.STRING),
-		new Param("text", "The 'text' to show", Type.STRING),
-		new Param("direction", "The direction to lookat. If empty, the player lookat to the actor", 
-				Type.STRING, false, "", new String[] {"", 
-				FrameAnimation.FRONT, FrameAnimation.BACK,FrameAnimation.LEFT,
-				FrameAnimation.RIGHT,	FrameAnimation.FRONTLEFT,
-				FrameAnimation.FRONTRIGHT,FrameAnimation.BACKLEFT,
-				FrameAnimation.BACKRIGHT})
-		};			
-
-	private String soundId;
-	private String text;
+	public enum Direction {
+		FRONT(AnimationRenderer.FRONT), BACK(AnimationRenderer.BACK), LEFT(AnimationRenderer.LEFT),
+		RIGHT(AnimationRenderer.RIGHT), FRONTLEFT(AnimationRenderer.FRONTLEFT),
+		FRONTRIGHT(AnimationRenderer.FRONTRIGHT), BACKLEFT(AnimationRenderer.BACKLEFT),
+		BACKRIGHT(AnimationRenderer.BACKRIGHT);
 
-	private String actorId;
-	
-	private String direction;
+		private final String direction;
 
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
+		Direction(String direction) {
+			this.direction = direction;
+		}
 
-		soundId = params.get("speech");
-		text = params.get("text");
-		direction = params.get("direction");
+		public String getDirection() {
+			return direction;
+		}
 	}
 
-	@Override
-	public boolean run(ActionCallback cb) {
+	@ActionPropertyDescription("The target actor")
+	@ActionProperty(type = Type.ACTOR)
+	private String actor;
 
-		EngineLogger.debug("LOOKAT ACTION");
-		BaseActor actor = (BaseActor) World.getInstance().getCurrentScene().getActor(actorId, true);
+	@ActionPropertyDescription("The 'text' to show")
+	@ActionProperty(type = Type.SMALL_TEXT)
+	private String text;
 
-		SpriteActor player = World.getInstance().getCurrentScene().getPlayer();
-		
-		if(direction!=null) player.lookat(direction);
-		else if(actor!=null && player != null) {
-			Rectangle bbox = actor.getBBox().getBoundingRectangle();
-			player.lookat(new Vector2(bbox.x, bbox.y));
-		}
+	@ActionPropertyDescription("The 'voice' file to play if selected.")
+	@ActionProperty(type = Type.VOICE)
+	private String voiceId;
 
-		if (soundId != null)
-			actor.playSound(soundId);
+	@ActionProperty
+	@ActionPropertyDescription("The direction to lookat. If empty, the player lookat to the actor")
+	private Direction direction;
 
-		if(text !=null)
-			World.getInstance().getTextManager().addSubtitle(text, TextManager.POS_SUBTITLE,
-					TextManager.POS_SUBTITLE, false, Text.Type.RECTANGLE, Color.BLACK, null);
-		
-		return false;
-	}
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the text is shown and the action continues inmediatly")
+	private boolean wait = true;
 
+	private World w;
 
 	@Override
-	public String getInfo() {
-		return INFO;
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public Param[] getParams() {
-		return PARAMS;
+	public boolean run(VerbRunner cb) {
+
+		// EngineLogger.debug("LOOKAT ACTION");
+		InteractiveActor a = (InteractiveActor) w.getCurrentScene().getActor(actor, true);
+
+		if (w.getInventory().get(actor) == null) {
+			CharacterActor player = w.getCurrentScene().getPlayer();
+
+			if (direction != null && player != null)
+				player.lookat(direction.getDirection());
+			else if (a != null && player != null) {
+				Rectangle bbox = a.getBBox().getBoundingRectangle();
+				player.lookat(new Vector2(bbox.width / 2 + bbox.x, bbox.y));
+			}
+		}
+
+		if (text != null) {
+			String actorId = w.getCurrentScene().getPlayer() != null ? w.getCurrentScene().getPlayer().getId() : null;
+
+			w.getCurrentScene().getTextManager().addText(text, TextManager.POS_SUBTITLE, TextManager.POS_SUBTITLE,
+					false, Text.Type.SUBTITLE, null, null, actorId, voiceId, null, wait ? cb : null);
+
+			return wait;
+		}
+
+		return false;
 	}
+
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/MoveToSceneAction.java b/blade-engine/src/com/bladecoder/engine/actions/MoveToSceneAction.java
new file mode 100644
index 000000000..0ccec89dd
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/MoveToSceneAction.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.utils.Disposable;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.assets.AssetConsumer;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("Move the actor to the selected scene")
+public class MoveToSceneAction implements Action {
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The selected actor")
+	private SceneActorRef actor;
+
+	@ActionPropertyDescription("The target scene. The current scene if empty.")
+	@ActionProperty(type = Type.SCENE)
+	private String scene;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		final Scene s = actor.getScene(w);
+
+		final String actorId = actor.getActorId();
+
+		if (actorId == null) {
+			// if called in a scene verb and no actor is specified, we do nothing
+			EngineLogger.error(getClass() + ": No actor specified");
+			return false;
+		}
+
+		BaseActor a = s.getActor(actorId, false);
+
+		if (a == null) {
+			EngineLogger.error(getClass() + "- Actor not found: " + actorId + " in scene: " + s.getId());
+			return false;
+		}
+
+		s.removeActor(a);
+
+		Scene ts = null;
+
+		if (scene == null)
+			ts = w.getCurrentScene();
+		else
+			ts = w.getScene(scene);
+
+		// Dispose if s is the current scene or a cached scene and the target is not the
+		// current scene or a cache scene
+		if ((s == w.getCurrentScene() || w.getCachedScene(ts.getId()) != null)
+				&& !(ts == w.getCurrentScene() || w.getCachedScene(ts.getId()) != null) && a instanceof Disposable) {
+			((Disposable) a).dispose();
+		}
+
+		// We must load assets when the target scene is the current scene or when
+		// the scene is cached.
+		if ((ts == w.getCurrentScene() || w.getCachedScene(ts.getId()) != null)
+				&& !(s == w.getCurrentScene() || w.getCachedScene(s.getId()) != null) && a instanceof AssetConsumer) {
+			((AssetConsumer) a).loadAssets();
+			EngineAssetManager.getInstance().finishLoading();
+			((AssetConsumer) a).retrieveAssets();
+		}
+
+		ts.addActor(a);
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/MusicAction.java b/blade-engine/src/com/bladecoder/engine/actions/MusicAction.java
index 084060c6e..b331fafc2 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/MusicAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/MusicAction.java
@@ -15,47 +15,65 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
-import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.MusicDesc;
+import com.bladecoder.engine.model.MusicManager;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 
+@ActionDescription("Plays/Stops music.")
 public class MusicAction implements Action {
-	public static final String INFO = "Play/Stop the music of the current scene";
-	public static final Param[] PARAMS = { new Param("play",
-			"Play/Stops the music of the scene", Type.BOOLEAN, true), };
-
-	String play;
-
+	
+	@ActionProperty
+	@ActionPropertyDescription("The music filename to play. If empty, the current music will be stopped.")
+	private String filename;
+	
+	@ActionProperty(required = true, defaultValue = "false")
+	@ActionPropertyDescription("Music Loop")
+	private boolean loop = false;
+	
+	@ActionProperty(required = true, defaultValue = "0")
+	@ActionPropertyDescription("The music starts to play after the delay.")
+	private float initialDelay = 0;
+	
+	@ActionProperty(required = true, defaultValue = "-1")
+	@ActionPropertyDescription("Time for repeating the music when no looping. -1 for no repeat.")
+	private float repeatDelay = -1;
+	
+	@ActionProperty(required = true, defaultValue = "true")
+	@ActionPropertyDescription("Stops the music when leaving the current scene.")
+	private boolean stopWhenLeaving = true;
+	
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription("Volume of the music [0-1].")
+	private float volume = 1.0f;
+	
+	private World w;
+	
 	@Override
-	public void setParams(HashMap<String, String> params) {
-		play = params.get("play");
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public boolean run(ActionCallback cb) {
-
-		boolean p = Boolean.parseBoolean(play);
-
-		if (p)
-			World.getInstance().getCurrentScene().playMusic();
-		else
-			World.getInstance().getCurrentScene().stopMusic();
+	public boolean run(VerbRunner cb) {
+		MusicManager musicEngine = w.getMusicManager();
+		
+		if(filename == null) {
+			musicEngine.setMusic(null);
+		} else {
+			MusicDesc md = new MusicDesc();
+			
+			md.setFilename(filename);
+			md.setLoop(loop);
+			md.setInitialDelay(initialDelay);
+			md.setRepeatDelay(repeatDelay);
+			md.setStopWhenLeaving(stopWhenLeaving);
+			md.setVolume(volume);
+			
+			musicEngine.setMusic(md);
+		}
 		
 		return false;
 	}
 
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/MusicVolumeAction.java b/blade-engine/src/com/bladecoder/engine/actions/MusicVolumeAction.java
new file mode 100644
index 000000000..149c625a7
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/MusicVolumeAction.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.MusicManager;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Change the volume of the current playing music.")
+public class MusicVolumeAction implements Action {
+	
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription("Volume of the music [0-1].")
+	private float volume = 1.0f;
+	
+	@ActionProperty(required = true, defaultValue = "0.0")
+	@ActionPropertyDescription("For volume fade")
+	private float duration;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the action continues inmediatly")
+	private boolean wait = true;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		MusicManager musicEngine = w.getMusicManager();
+		
+		if(duration==0) {
+			musicEngine.setVolume(volume);
+			return false;
+		} else {
+			w.getMusicManager().fade(volume, duration, wait?cb:null);
+		}
+		
+		return wait;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/OpenURLAction.java b/blade-engine/src/com/bladecoder/engine/actions/OpenURLAction.java
new file mode 100644
index 000000000..e36881adf
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/OpenURLAction.java
@@ -0,0 +1,24 @@
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.Gdx;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Open an URL in the default Browser")
+public class OpenURLAction implements Action {
+	@ActionProperty(required=true)
+	@ActionPropertyDescription("The URL")
+	private String url;
+	
+	@Override
+	public void init(World w) {
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		
+		Gdx.net.openURI(url);
+		
+		return false;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/Param.java b/blade-engine/src/com/bladecoder/engine/actions/Param.java
index 718699de0..0e61e19a3 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/Param.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/Param.java
@@ -15,23 +15,27 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.Polygon;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.math.Vector3;
 
 public class Param {
 	public enum Type {
-		STRING, BOOLEAN, FLOAT, INTEGER, VECTOR2, VECTOR3, DIMENSION, ACTOR, SCENE, CHAPTER
-	};
+		STRING, BOOLEAN, FLOAT, INTEGER, VECTOR2, VECTOR3, DIMENSION, ACTOR, CHARACTER_ACTOR, INTERACTIVE_ACTOR, SPRITE_ACTOR, WALKZONE_ACTOR, SCENE, CHAPTER, FILE, OPTION, SCENE_ACTOR, ACTOR_ANIMATION, LAYER, EDITABLE_OPTION, SCENE_CHARACTER_ACTOR, SCENE_INTERACTIVE_ACTOR, SCENE_SPRITE_ACTOR, SCENE_WALKZONE_ACTOR, TEXT, SMALL_TEXT, BIG_TEXT, COLOR, SOUND, TEXT_STYLE, ATLAS_ASSET, MUSIC_ASSET, SOUND_ASSET, PARTICLE_ASSET, FONT_ASSET, NOT_SET, VOICE
+	}
+
+	public static final String NUMBER_PARAM_SEPARATOR = ",";
+	public static final String STRING_PARAM_SEPARATOR = "#";
 
-	public String name;
-	public String desc;
-	public Type type;
-	public boolean mandatory;
-	public String defaultValue;
-	public String[] options; // availables values for combos
+	public final String name;
+	public final String desc;
+	public final Type type;
+	public final boolean mandatory;
+	public final String defaultValue;
+	public final Object[] options; // availables values for combos
 
-	public Param(String name, String desc, Type type, boolean mandatory, String defaultValue, String[] options) {
+	public Param(String name, String desc, Type type, boolean mandatory, String defaultValue, Object[] options) {
 		this.name = name;
 		this.desc = desc;
 		this.type = type;
@@ -39,31 +43,36 @@ public Param(String name, String desc, Type type, boolean mandatory, String defa
 		this.defaultValue = defaultValue;
 		this.options = options;
 	}
-	
+
 	public Param(String name, String desc, Type type, boolean mandatory, String defaultValue) {
 		this(name, desc, type, mandatory, defaultValue, null);
 	}
-	
+
 	public Param(String name, String desc, Type type, boolean mandatory) {
 		this(name, desc, type, mandatory, null, null);
 	}
-	
+
 	public Param(String name, String desc, Type type) {
 		this(name, desc, type, false, null, null);
 	}
 
 	public static Vector2 parseVector2(String s) {
-		
-		if(s==null)
+
+		if (s == null || s.isEmpty())
 			return null;
-		
+
 		Vector2 v = null;
 
-		int idx = s.indexOf(',');
+		int idx = s.indexOf(NUMBER_PARAM_SEPARATOR.charAt(0));
+
+		// Also allow '_' character as separator because is more usable inside
+		// Ink files.
+		if (idx == -1)
+			idx = s.indexOf('_');
 
 		if (idx != -1) {
 			try {
-				float x = Float.parseFloat(s.substring(0,idx));
+				float x = Float.parseFloat(s.substring(0, idx));
 				float y = Float.parseFloat(s.substring(idx + 1));
 
 				v = new Vector2(x, y);
@@ -78,12 +87,12 @@ public static Vector2 parseVector2(String s) {
 	public static Vector3 parseVector3(String s) {
 		Vector3 v = null;
 
-		int idx = s.indexOf(',');
-		int idx2 = s.lastIndexOf(',');
+		int idx = s.indexOf(NUMBER_PARAM_SEPARATOR.charAt(0));
+		int idx2 = s.lastIndexOf(NUMBER_PARAM_SEPARATOR.charAt(0));
 
 		if (idx != -1 && idx2 != -1 && idx != idx2) {
 			try {
-				float x = Float.parseFloat(s.substring(0,idx));
+				float x = Float.parseFloat(s.substring(0, idx));
 				float y = Float.parseFloat(s.substring(idx + 1, idx2));
 				float z = Float.parseFloat(s.substring(idx2 + 1));
 
@@ -95,53 +104,67 @@ public static Vector3 parseVector3(String s) {
 
 		return v;
 	}
-	
-	public static Polygon parsePolygon(String s) {
-		Polygon p = null;
-		
-		String[] vs = s.split(",");
-		
-		if(vs.length < 6)
-			return null;
-		
+
+	public static void parsePolygon(Polygon p, String s) {
+
+		String[] vs = s.split(NUMBER_PARAM_SEPARATOR);
+
+		if (vs.length < 6)
+			return;
+
 		float verts[] = new float[vs.length];
-		
-		for(int i = 0; i < vs.length; i++) {
+
+		for (int i = 0; i < vs.length; i++) {
 			verts[i] = Float.parseFloat(vs[i]);
 		}
-		
-		p = new Polygon(verts);
 
-		return p;
+		p.setVertices(verts);
+
 	}
-	
-	public static Polygon parsePolygon(String v, String pos) {
-		Polygon p = parsePolygon(v);
+
+	public static void parsePolygon(Polygon p, String v, String pos) {
+		parsePolygon(p, v);
 		Vector2 v2 = parseVector2(pos);
 		p.setPosition(v2.x, v2.y);
-		
-		return p;
 	}
-	
+
 	public static String toStringParam(Polygon p) {
 		StringBuilder sb = new StringBuilder();
-		float[]verts = p.getVertices();
-		
+		float[] verts = p.getVertices();
+
 		sb.append(verts[0]);
-		
-		for(int i = 1; i < verts.length; i++) {
-			sb.append(',');
-			sb.append(verts[i]);	
+
+		for (int i = 1; i < verts.length; i++) {
+			sb.append(NUMBER_PARAM_SEPARATOR);
+			sb.append(verts[i]);
 		}
-		
+
 		return sb.toString();
 	}
 
+	public static Color parseColor(String color) {
+		if (color == null || color.trim().isEmpty()) {
+			return null; // the default color in the style will be used
+		}
+
+		switch (color.trim()) {
+		case "black":
+			return Color.BLACK;
+		case "white":
+			return Color.WHITE;
+		default:
+			return Color.valueOf(color);
+		}
+	}
+
 	public static String toStringParam(Vector2 v) {
-		return v.x + "," + v.y;
+		if (v == null)
+			return null;
+
+		return v.x + NUMBER_PARAM_SEPARATOR + v.y;
 	}
 
 	public static String toStringParam(Vector3 v) {
-		return v.x + "," + v.y + "," + v.z;
+		return v.x + NUMBER_PARAM_SEPARATOR + v.y + NUMBER_PARAM_SEPARATOR + v.z;
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/PickUpAction.java b/blade-engine/src/com/bladecoder/engine/actions/PickUpAction.java
index 74eb9e035..de1031534 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/PickUpAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/PickUpAction.java
@@ -15,80 +15,83 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
 import com.bladecoder.engine.actions.Param.Type;
 import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Inventory;
 import com.bladecoder.engine.model.Scene;
 import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
 
+@ActionDescription("Puts the selected actor in the inventory.")
 public class PickUpAction implements Action {
-	public static final String INFO = "Puts the selected actor in the inventory.";
-	public static final Param[] PARAMS = {
-		new Param("scene", "If not empty, pickup the actor from the selected scene", Type.SCENE),
-		new Param("frame_animation", "The sprite to show while in inventory. If empty, the sprite will be 'actorid.inventory'", Type.STRING)
-		};
-	
-	String actorId;
-	String fa;
-	String scene;
+	@ActionProperty(type = Type.SCENE_SPRITE_ACTOR, required = true)
+	@ActionPropertyDescription("The target actor")
+	private SceneActorRef actor;
+
+	@ActionProperty
+	@ActionPropertyDescription("The animation/sprite to show while in inventory. If empty, the animation will be 'actorid.inventory'")
+	private String animation;
+
+	@ActionProperty
+	@ActionPropertyDescription("Inventory name. If empty, the active inventory is used.")
+	private String inventory;
+
+	private World w;
 
 	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		fa = params.get("frame_animation");
-		scene = params.get("scene");
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public boolean run(ActionCallback cb) {
-
-		BaseActor actor = null;
-		
-		Scene scn;
-		
-		if(scene != null) {
-			scn = World.getInstance().getScene(scene);
-			actor = scn.getActor(actorId, false);
-			actor.loadAssets();
-			EngineAssetManager.getInstance().finishLoading();
-			actor.retrieveAssets();
-		} else {
-			scn = World.getInstance().getCurrentScene();
-			actor = scn.getActor(actorId, false);
+	public boolean run(VerbRunner cb) {
+		Scene scn = this.actor.getScene(w);
+		InteractiveActor actor = (InteractiveActor) scn.getActor(this.actor.getActorId(), false);
+
+		if (actor == null) {
+			EngineLogger.error("PickUpAction - Actor not found:" + this.actor.getActorId());
+
+			return false;
 		}
-		
+
 		scn.removeActor(actor);
-		
+
 		if (actor instanceof SpriteActor) {
 			SpriteActor a = (SpriteActor) actor;
 
-			if(fa != null)
-				a.startFrameAnimation(fa, null);
-			else
-				a.startFrameAnimation(a.getId() + ".inventory", null);
-			
-			World.getInstance().getInventory().addItem(a);
-		}
-		
-		return false;
-	}
-	
+			if (scn != w.getCurrentScene() && w.getCachedScene(scn.getId()) == null) {
+				a.loadAssets();
+				EngineAssetManager.getInstance().finishLoading();
+				a.retrieveAssets();
+			}
 
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
+			if (a.getRenderer() instanceof AnimationRenderer) {
+				if (animation != null)
+					a.startAnimation(animation, null);
+				else if (((AnimationRenderer) a.getRenderer()).getAnimations().get(a.getId() + ".inventory") != null)
+					a.startAnimation(a.getId() + ".inventory", null);
+			}
 
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
+			Inventory inv = null;
+
+			if (inventory == null) {
+				inv = w.getInventory();
+			} else {
+				inv = w.getInventories().get(inventory);
+				if (inv == null) {
+					EngineLogger.error("Inventory not found: " + inventory);
+					return false;
+				}
+			}
+
+			inv.addItem(a);
+		}
+
+		return false;
 	}
 
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/PlaySoundAction.java b/blade-engine/src/com/bladecoder/engine/actions/PlaySoundAction.java
new file mode 100644
index 000000000..6c03c0dda
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/PlaySoundAction.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Play/Stop a sound")
+public class PlaySoundAction implements Action {
+	@ActionPropertyDescription("The 'soundId' to play. ")
+	@ActionProperty(required = true, type = Type.SOUND)
+	private String sound;
+	
+	@ActionProperty(required = true, defaultValue = "false")
+	@ActionPropertyDescription("When 'true' stops the sound instead of playing it.")
+	private boolean stop = false;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		
+		if(!stop)	{
+			w.getCurrentScene().getSoundManager().playSound(sound);
+		} else {
+			w.getCurrentScene().getSoundManager().stopSound(sound);
+		}
+		
+		return false;
+	}
+
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/PosAnimationAction.java b/blade-engine/src/com/bladecoder/engine/actions/PosAnimationAction.java
deleted file mode 100644
index 91326ffca..000000000
--- a/blade-engine/src/com/bladecoder/engine/actions/PosAnimationAction.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.actions;
-
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.BaseCallbackAction;
-import com.bladecoder.engine.actions.Param;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
-import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.anim.Tween;
-import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.util.EngineLogger;
-
-public class PosAnimationAction extends BaseCallbackAction {
-	public static final String INFO = "Throws a position type animation";
-	public static final Param[] PARAMS = {
-		new Param("pos", "The target position", Type.VECTOR2, true),
-		new Param("speed", "Duration of the animation in seconds", Type.FLOAT, true, "1.0"),
-		new Param("count", "The times to repeat", Type.INTEGER),
-		new Param("wait", "If this param is 'false' the text is showed and the action continues inmediatly", Type.BOOLEAN, true),
-		new Param("repeat", "The repeat mode", Type.STRING, true, "repeat", new String[]{"repeat", "yoyo", "no_repeat"}),
-		};		
-	
-	private String actorId;
-	private float speed;
-	private Vector2 pos;
-	private int repeat = Tween.NO_REPEAT;
-	private int count = 1;
-
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-
-		// get final position. We need to scale the coordinates to the current resolution
-		pos = Param.parseVector2(params.get("pos"));
-		
-		speed = Float.parseFloat(params.get("speed"));
-		
-		if(params.get("count") != null) {
-			count = Integer.parseInt(params.get("count"));
-		}
-		
-		if(params.get("wait") != null) {
-			setWait(Boolean.parseBoolean(params.get("wait")));
-		}
-		
-		if(params.get("repeat") != null) {
-			String repeatStr = params.get("repeat");
-			if (repeatStr.equalsIgnoreCase("repeat")) {
-				repeat = Tween.REPEAT;
-			} else if (repeatStr.equalsIgnoreCase("yoyo")) {
-				repeat = Tween.PINGPONG;
-			} else if (repeatStr.equalsIgnoreCase("no_repeat")) {
-				repeat = Tween.NO_REPEAT;
-			} else {
-				repeat = Tween.FROM_FA;
-			}
-		}
-	}
-
-	@Override
-	public boolean run(ActionCallback cb) {
-		setVerbCb(cb);
-		EngineLogger.debug("SET_POSANIMATION_ACTION");
-		
-		float scale = EngineAssetManager.getInstance().getScale();
-
-		SpriteActor actor = (SpriteActor) World.getInstance().getCurrentScene().getActor(actorId, false);
-		
-		actor.startPosAnimation(repeat, count, speed, pos.x * scale, pos.y * scale, getWait()?this:null);
-		
-		return getWait();
-	}
-
-	@Override
-	public void write(Json json) {		
-		json.writeValue("actorId", actorId);
-		json.writeValue("pos", pos);
-		json.writeValue("speed", speed);
-		json.writeValue("repeat", repeat);
-		json.writeValue("count", count);
-		super.write(json);	
-	}
-
-	@Override
-	public void read (Json json, JsonValue jsonData) {	
-		actorId = json.readValue("actorId", String.class, jsonData);
-		pos = json.readValue("pos", Vector2.class, jsonData);
-		speed = json.readValue("speed", Float.class, jsonData);
-		repeat = json.readValue("repeat", Integer.class, jsonData);
-		count = json.readValue("count", Integer.class, jsonData);
-		super.read(json, jsonData);
-	}	
-	
-
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/PositionAction.java b/blade-engine/src/com/bladecoder/engine/actions/PositionAction.java
new file mode 100644
index 000000000..c1c66914f
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/PositionAction.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Sets actor position.")
+public class PositionAction implements Action {
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The actor to change his position")
+	private SceneActorRef actor;
+
+	@ActionProperty
+	@ActionPropertyDescription("Obtain the target position from this actor.")
+	private SceneActorRef target;
+
+	@ActionProperty
+	@ActionPropertyDescription("The absolute position to set if no target is selected. Relative if target is selected.")
+	private Vector2 position;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		Scene s = actor.getScene(w);
+
+		BaseActor a = s.getActor(actor.getActorId(), true);
+
+		float x = a.getX();
+		float y = a.getY();
+
+		if (target != null) {
+			Scene ts = target.getScene(w);
+			BaseActor anchorActor = ts.getActor(target.getActorId(), false);
+
+			x = anchorActor.getX();
+			y = anchorActor.getY();
+
+			if (anchorActor instanceof InteractiveActor && a != anchorActor) {
+				Vector2 refPoint = ((InteractiveActor) anchorActor).getRefPoint();
+				x += refPoint.x;
+				y += refPoint.y;
+			}
+			
+			if(position != null){
+				float scale = EngineAssetManager.getInstance().getScale();
+				
+				x += position.x * scale;
+				y += position.y * scale;
+			}
+		} else if (position != null) {
+			float scale = EngineAssetManager.getInstance().getScale();
+			x = position.x * scale;
+			y = position.y * scale;
+
+		}
+
+		a.setPosition(x, y);
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/PositionAnimAction.java b/blade-engine/src/com/bladecoder/engine/actions/PositionAnimAction.java
new file mode 100644
index 000000000..380a70b35
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/PositionAnimAction.java
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.anim.SpritePosTween;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.InterpolationMode;
+
+@ActionDescription("Sets an actor Position animation")
+public class PositionAnimAction implements Action {
+    public enum Mode {
+        DURATION, SPEED
+    }
+
+    @ActionPropertyDescription("The moving actor")
+    @ActionProperty(type = Type.SPRITE_ACTOR, required = true)
+    private String actor;
+
+    @ActionPropertyDescription("Sets the position from this actor")
+    @ActionProperty(type = Type.ACTOR)
+    private String target;
+
+    @ActionProperty
+    @ActionPropertyDescription("The absolute world position if no target is selected. Relative to target if selected.")
+    private Vector2 pos;
+
+    @ActionProperty(required = true, defaultValue = "1.0")
+    @ActionPropertyDescription("Duration or speed in pixels/sec. mode")
+    private float speed;
+
+    @ActionProperty(required = true)
+    @ActionPropertyDescription("Duration or speed of the animation")
+    private Mode mode;
+
+    @ActionProperty(required = true, defaultValue = "-1")
+    @ActionPropertyDescription("The times to repeat. -1 for infinity")
+    private int count = -1;
+
+    @ActionProperty(required = true)
+    @ActionPropertyDescription("If this param is 'false' the text is showed and the action continues immediately")
+    private boolean wait = true;
+
+    @ActionProperty(required = true, defaultValue = "NO_REPEAT")
+    @ActionPropertyDescription("The repeat mode")
+    private Tween.Type repeat = Tween.Type.NO_REPEAT; // FIXME: This adds more
+    // types not present
+    // here before
+
+    @ActionProperty
+    @ActionPropertyDescription("The target actor")
+    private InterpolationMode interpolation;
+
+    private World w;
+
+    @Override
+    public void init(World w) {
+        this.w = w;
+    }
+
+    @Override
+    public boolean run(VerbRunner cb) {
+
+        float scale = EngineAssetManager.getInstance().getScale();
+
+        BaseActor a = w.getCurrentScene().getActor(actor, true);
+
+        float x = a.getX();
+        float y = a.getY();
+
+        if (target != null) {
+            BaseActor target = w.getCurrentScene().getActor(this.target, false);
+
+            x = target.getX();
+            y = target.getY();
+
+            if (target instanceof InteractiveActor && target != a) {
+                Vector2 refPoint = ((InteractiveActor) target).getRefPoint();
+                x += refPoint.x;
+                y += refPoint.y;
+            }
+
+            if (pos != null) {
+                x += pos.x * scale;
+                y += pos.y * scale;
+            }
+        } else if (pos != null) {
+            x = pos.x * scale;
+            y = pos.y * scale;
+        }
+
+        if (!(a instanceof SpriteActor)) {
+            a.setPosition(x, y);
+
+            return false;
+        } else {
+            // WARNING: only spriteactors support animation
+            float s;
+
+            if (mode != null && mode == Mode.SPEED) {
+                Vector2 p0 = new Vector2(a.getX(), a.getY());
+
+                s = p0.dst(x, y) / (scale * speed);
+            } else {
+                s = speed;
+            }
+
+            SpritePosTween t = new SpritePosTween();
+            t.start((SpriteActor) a, repeat, count, x, y, s, interpolation, wait ? cb : null);
+
+            ((SpriteActor) a).addTween(t);
+        }
+
+        return wait;
+    }
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/PropertyAction.java b/blade-engine/src/com/bladecoder/engine/actions/PropertyAction.java
index 384a3869b..743fef4e8 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/PropertyAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/PropertyAction.java
@@ -15,64 +15,32 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
-import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 
+@ActionDescription("Sets a global game property. Properties are created by the user but the next ones always exists: SAVED_GAME_VERSION, PREVIOUS_SCENE, CURRENT_CHAPTER, PLATFORM")
 public class PropertyAction implements Action {
-	public static final String INFO = "Set/Remove a global property of the game";
-	public static final Param[] PARAMS = {
-		new Param("type", "Property type", Type.STRING, true, "actor", new String[] {"world", "scene", "actor"}),
-		new Param("prop", "Property name", Type.STRING, true), 
-		new Param("value", "Property value", Type.STRING, true),
-		};		
-	
-	String actorId;
-	String op;
-	String prop;
-	String value;
-	String type;
-	
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		
-		prop = params.get("prop");
-		value = params.get("value");
-		type = params.get("type");
-	}
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("Property name")
+	private String prop;
 
-	@Override
-	public boolean run(ActionCallback cb) {
-		
-		if(type.equals("world")) {
-			World.getInstance().setCustomProperty(prop, value);
-		} else if(type.equals("scene")) {
-			Scene s = World.getInstance().getCurrentScene();
-			s.setCustomProperty(prop, value);
-		} else {
-			BaseActor actor = World.getInstance().getCurrentScene().getActor(actorId, true);
-			actor.setCustomProperty(prop, value);
-		}
-		
-		return false;
-	}
+	@ActionProperty
+	@ActionPropertyDescription("Property value")
+	private String value;
+
+	private World w;
 
 	@Override
-	public String getInfo() {
-		return INFO;
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public Param[] getParams() {
-		return PARAMS;
+	public boolean run(VerbRunner cb) {
+
+		w.setCustomProperty(prop, value);
+
+		return false;
 	}
 
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/RandomPositionAction.java b/blade-engine/src/com/bladecoder/engine/actions/RandomPositionAction.java
new file mode 100644
index 000000000..5089916f3
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/RandomPositionAction.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Sets actor position randomly.")
+public class RandomPositionAction implements Action {
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The actor to change his position")
+	private SceneActorRef actor;
+
+	@ActionProperty
+	@ActionPropertyDescription("Obtain the target position from this actor.")
+	private SceneActorRef target;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("Maximum xy values. The absolute position to set if no target is selected. Relative if target is selected.")
+	private Vector2 maxPosition;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("Minimum xy values. The absolute position to set if no target is selected. Relative if target is selected.")
+	private Vector2 minPosition;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		Scene s = actor.getScene(w);
+
+		BaseActor a = s.getActor(actor.getActorId(), true);
+
+		float x = a.getX();
+		float y = a.getY();
+
+		float rx = (float) (minPosition.x + Math.random() * (maxPosition.x - minPosition.x));
+		float ry = (float) (minPosition.y + Math.random() * (maxPosition.y - minPosition.y));
+
+		if (target != null) {
+			Scene ts = target.getScene(w);
+			BaseActor anchorActor = ts.getActor(target.getActorId(), false);
+
+			x = anchorActor.getX();
+			y = anchorActor.getY();
+
+			if (anchorActor instanceof InteractiveActor && a != anchorActor) {
+				Vector2 refPoint = ((InteractiveActor) anchorActor).getRefPoint();
+				x += refPoint.x;
+				y += refPoint.y;
+			}
+
+			float scale = EngineAssetManager.getInstance().getScale();
+
+			x += rx * scale;
+			y += ry * scale;
+		} else {
+			float scale = EngineAssetManager.getInstance().getScale();
+			x = rx * scale;
+			y = ry * scale;
+		}
+
+		a.setPosition(x, y);
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/RemoveInventoryItemAction.java b/blade-engine/src/com/bladecoder/engine/actions/RemoveInventoryItemAction.java
index e4f6a471d..81a141bbc 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/RemoveInventoryItemAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/RemoveInventoryItemAction.java
@@ -15,47 +15,59 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
 import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
 
+@Deprecated
+@ActionDescription("Remove items from the inventory. Deprecated: Use DropItem action instead.")
 public class RemoveInventoryItemAction implements Action {
-	public static final String INFO = "Remove items from the inventory. If the removed items are not referenced in other actions.\n" +
-			"WARNING: This action does not 'dispose' the item.";
-	public static final Param[] PARAMS = {
-		new Param("id", "The 'actorid' from the inventory item to remove. If empty remove all items.", Type.ACTOR)
-		};		
+	@ActionPropertyDescription("The 'actorid' from the inventory item to remove. If empty remove all items.")
+	@ActionProperty(type = Type.ACTOR)
+	private String id;
+	
+	@ActionPropertyDescription("The scene where the inventory items will be dropped.")
+	@ActionProperty(type = Type.SCENE, required=true)
+	private String scene;
 	
-	String itemId;
+	private World w;
 	
 	@Override
-	public void setParams(HashMap<String, String> params) {
-		itemId = params.get("id");
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public boolean run(ActionCallback cb) {
+	public boolean run(VerbRunner cb) {
 		
-		if(itemId!=null)
-			World.getInstance().getInventory().removeItem(itemId);
-		else
-			World.getInstance().getInventory().removeAllItems();
+		Scene s =  w.getScene(scene);
+		
+		if(id != null) {
+			SpriteActor a = w.getInventory().removeItem(id);
+			
+			if(a!=null) {
+				if(s != w.getCurrentScene())
+					a.dispose();
+				
+				s.addActor(a);
+			} else {
+				EngineLogger.debug("RemoveInventoryAction - Inventory actor not found: " + id);
+			}
+		} else {
+			int n = w.getInventory().getNumItems();
+			
+			for(int i = 0; i < n; i++) {
+				SpriteActor a = w.getInventory().get(i);			
+				s.addActor(a);
+			}
+			
+			w.getInventory().removeAllItems();
+		}	
 		
 		return false;
 	}
 
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/RepeatAction.java b/blade-engine/src/com/bladecoder/engine/actions/RepeatAction.java
new file mode 100644
index 000000000..be1cb1399
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/RepeatAction.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Repeats the actions inside the Repeat/EndRepeat actions.")
+public class RepeatAction extends AbstractControlAction implements Serializable {
+	@ActionProperty(required = true, defaultValue = "1")
+	@ActionPropertyDescription("Repeat the actions the specified times. -1 to infinity")
+	private int repeat = 1;
+
+	private int currentRepeat = 0;
+	
+	@Override
+	public void init(World w) {
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		VerbRunner v = (VerbRunner)cb;
+		
+		currentRepeat++;
+		
+		if(currentRepeat > repeat && repeat >= 0) {
+			final int ip = skipControlIdBlock(v.getActions(), v.getIP());
+
+			v.setIP(ip);
+			currentRepeat = 0;
+		}
+		
+		return false;
+	}
+	
+	
+	@Override
+	public void write(Json json) {
+		json.writeValue("currentRepeat", currentRepeat);
+	}
+
+	@Override
+	public void read (Json json, JsonValue jsonData) {
+		currentRepeat = json.readValue("currentRepeat", int.class, 0, jsonData);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/RotateAction.java b/blade-engine/src/com/bladecoder/engine/actions/RotateAction.java
new file mode 100644
index 000000000..765912879
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/RotateAction.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.anim.SpriteRotateTween;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.InterpolationMode;
+
+@ActionDescription(name = "RotateAnim", value = "Sets an actor Rotate animation")
+public class RotateAction implements Action {
+	@ActionPropertyDescription("The target actor")
+	@ActionProperty(type = Type.SPRITE_ACTOR)
+	private String actor;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The target rotation")
+	private float rotation;
+
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription("Duration of the animation in seconds")
+	private float speed;
+
+	@ActionProperty
+	@ActionPropertyDescription("The The times to repeat")
+	private int count = 1;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the transition is showed and the action continues inmediatly")
+	private boolean wait = true;
+
+	@ActionProperty(required = true, defaultValue = "REPEAT")
+	@ActionPropertyDescription("The repeat mode")
+	private Tween.Type repeat = Tween.Type.REPEAT;
+
+	@ActionProperty
+	@ActionPropertyDescription("The interpolation mode")
+	private InterpolationMode interpolation;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		SpriteActor a = (SpriteActor) w.getCurrentScene().getActor(actor, true);
+
+		SpriteRotateTween t = new SpriteRotateTween();
+		t.start(a, repeat, count, rotation, speed, interpolation, wait ? cb : null);
+
+		a.addTween(t);
+
+		return wait;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/RunOnceAction.java b/blade-engine/src/com/bladecoder/engine/actions/RunOnceAction.java
new file mode 100644
index 000000000..3917f6055
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/RunOnceAction.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Execute the actions inside the RunOnce/EndRunOnce only once.")
+public class RunOnceAction extends AbstractControlAction implements Serializable {
+	boolean executed = false;
+	
+	
+	@Override
+	public void init(World w) {
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		VerbRunner v = (VerbRunner)cb;
+		
+		if (executed) {
+			final int ip = skipControlIdBlock(v.getActions(), v.getIP());
+
+			v.setIP(ip);
+		}
+		
+		executed=true;
+		
+		return false;
+	}
+
+	
+	@Override
+	public void write(Json json) {
+		json.writeValue("executed", executed);
+	}
+
+	@Override
+	public void read (Json json, JsonValue jsonData) {
+		executed = json.readValue("executed", boolean.class, false, jsonData);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/RunVerbAction.java b/blade-engine/src/com/bladecoder/engine/actions/RunVerbAction.java
index 4344b7e63..f99557298 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/RunVerbAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/RunVerbAction.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,179 +15,144 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.BaseCallbackAction;
-import com.bladecoder.engine.actions.Param;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
 import com.bladecoder.engine.model.Verb;
-import com.bladecoder.engine.model.VerbManager;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.util.EngineLogger;
 
-public class RunVerbAction extends BaseCallbackAction {
-
-	public static final String INFO = "Runs an actor verb";
-	public static final Param[] PARAMS = {
-			new Param("verb", "The 'verbId' to run", Type.STRING, true),
-			new Param("target", "Aditional actor for 'use' verb", Type.ACTOR),
-			new Param("repeat", "Repeat the verb the specified times. -1 to infinity",
-					Type.INTEGER),
-			new Param(
-					"wait",
-					"If this param is 'false' the text is showed and the action continues inmediatly",
-					Type.BOOLEAN, true) };
-
-	String actorId;
-	String verb;
-	String target;
-	int ip = -1;
-	int repeat = 1;
-	int currentRepeat = 0;
-
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		verb = params.get("verb");
-		target = params.get("target");
-
-		if (params.get("wait") != null) {
-			setWait(Boolean.parseBoolean(params.get("wait")));
-		}
-
-		if (params.get("repeat") != null) {
-			repeat = Integer.parseInt(params.get("repeat"));
-		}
-	}
-
-	@Override
-	public boolean run(ActionCallback cb) {
-		setVerbCb(cb);
-		currentRepeat = 0;
-
-		ip = 0;
-		nextStep();
-		return getWait();
-	}
-
-	private Verb getVerb(String verb, String target) {
-		Verb v = null;
-
-		if (actorId != null) {
-			BaseActor a = World.getInstance().getCurrentScene()
-					.getActor(actorId, true);
-			v = a.getVerb(verb, target);
-		} else {
-			v = World.getInstance().getCurrentScene().getVerb(verb);
-		}
-
-		if (v == null) {
-			v = VerbManager.getDefaultVerbs().get(verb);
-		}
-
-		return v;
-	}
-
-	public void nextStep() {
-
-		boolean stop = false;
-
-		Verb v = getVerb(verb, target);
-
-		if (v == null) {
-			EngineLogger
-					.error(MessageFormat
-							.format("Verb ''{0}'' not found for actor ''{1}'' and target ''{2}''",
-									verb, actorId, target));
-
-			return;
-		}
-
-		ArrayList<Action> actions = v.getActions();
-
-		while (currentRepeat < repeat) {
-			while (ip < actions.size() && !stop) {
-				Action a = actions.get(ip);
-
-				try {
-					if(a.run(this))
-						stop = true;
-					else
-						ip++;
-				} catch (Exception e) {
-					EngineLogger.error("EXCEPTION EXECUTING ACTION: "
-							+ a.getClass().getSimpleName(), e);
-				}
-			}
-			
-			if(!stop) {
-				currentRepeat++;
-				if (currentRepeat < repeat && repeat != -1) {
-					ip = 0;
-				} 
-			}
-		}
-
-		if (getWait() && !stop) {
-			super.resume();
-		}
-	}
-
-	@Override
-	public void resume() {
-		ip++;
-		nextStep();
-	}
-
-	public void cancel() {
-		Verb v = getVerb(verb, target);
-
-		if (v != null)
-			v.cancel();
-		else {
-			EngineLogger
-					.error(MessageFormat
-							.format("Cancel: Verb ''{0}'' not found for actor ''{1}'' and target ''{2}''",
-									verb, actorId, target));
-		}
-	}
-
-	@Override
-	public void write(Json json) {
-		json.writeValue("actorId", actorId);
-		json.writeValue("ip", ip);
-		json.writeValue("repeat", repeat);
-		json.writeValue("currentRepeat", currentRepeat);
-		json.writeValue("verb", verb);
-		json.writeValue("target", target);
-		super.write(json);
-	}
-
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		actorId = json.readValue("actorId", String.class, jsonData);
-		ip = json.readValue("ip", Integer.class, jsonData);
-		repeat = json.readValue("repeat", Integer.class, jsonData);
-		currentRepeat = json
-				.readValue("currentRepeat", Integer.class, jsonData);
-		verb = json.readValue("verb", String.class, jsonData);
-		target = json.readValue("target", String.class, jsonData);
-		super.read(json, jsonData);
-	}
-
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
+import java.text.MessageFormat;
+import java.util.ArrayList;
+
+@ActionDescription("Runs an actor verb")
+public class RunVerbAction implements VerbRunner, Action {
+    @ActionPropertyDescription("The actor with the verb. If empty, the verb is searched in the scene and in the " +
+            "world.")
+    @ActionProperty(type = Type.INTERACTIVE_ACTOR)
+    private String actor;
+
+    @ActionProperty(required = true)
+    @ActionPropertyDescription("The 'verbId' to run")
+    private String verb;
+
+    @ActionProperty
+    @ActionPropertyDescription("Aditional actor for 'use' verb")
+    private String target;
+
+    @ActionProperty(required = true)
+    @ActionPropertyDescription("If this param is 'false' the text is showed and the action continues inmediatly")
+    private boolean wait = true;
+
+    private World w;
+
+    @Override
+    public void init(World w) {
+        this.w = w;
+    }
+
+    @Override
+    public boolean run(VerbRunner cb) {
+
+        run(cb.getCurrentTarget(), wait ? cb : null);
+
+        return wait;
+    }
+
+    private Verb getVerb() {
+        Verb v = null;
+
+        Scene s = w.getCurrentScene();
+
+        if (actor != null) {
+            InteractiveActor a = (InteractiveActor) s.getActor(actor, true);
+
+            v = a.getVerbManager().getVerb(verb, a.getState(), target);
+        }
+
+        if (v == null) {
+            v = s.getVerbManager().getVerb(verb, s.getState(), target);
+        }
+
+        if (v == null) {
+            v = w.getVerbManager().getVerb(verb, null, target);
+        }
+
+        return v;
+    }
+
+    @Override
+    public void resume() {
+        getVerb().resume();
+    }
+
+    @Override
+    public void cancel() {
+
+        // check if the actor has been moved during the execution
+        if (actor != null) {
+            InteractiveActor a = (InteractiveActor) w.getCurrentScene().getActor(actor, true);
+
+            if (a == null)
+                return;
+        }
+
+        Verb v = getVerb();
+
+        if (v != null) {
+            v.cancel();
+        } else {
+            // When cancelling, the verb may not be found because it depends on the actor state
+            // so, we must continue without failing
+            EngineLogger.debug("Cancel Verb - Cannot find VERB: " + verb + " for ACTOR: " + actor);
+        }
+    }
+
+    @Override
+    public String getCurrentTarget() {
+        return getVerb().getCurrentTarget();
+    }
+
+    @Override
+    public ArrayList<Action> getActions() {
+        Verb v = getVerb();
+
+        if (v == null) {
+            if (actor != null)
+                EngineLogger.error(MessageFormat.format(
+                        "Verb ''{0}'' not found for actor ''{1}({3})'' and target ''{2}''.", verb, actor, target,
+                        ((InteractiveActor) w.getCurrentScene().getActor(actor, true)).getState()));
+            else
+                EngineLogger.error(MessageFormat.format("Verb ''{0}'' not found.", verb));
+
+            return new ArrayList<Action>(0);
+        }
+
+        return v.getActions();
+    }
+
+    @Override
+    public void run(String currentTarget, ActionCallback cb) {
+        Verb v = getVerb();
+
+        if (v == null) {
+            EngineLogger.error("Cannot find VERB: " + verb + " for ACTOR: " + actor);
+        }
+
+        if (v != null) {
+            v.run(currentTarget, cb);
+        }
+    }
+
+    @Override
+    public int getIP() {
+        return getVerb().getIP();
+    }
+
+    @Override
+    public void setIP(int ip) {
+        getVerb().setIP(ip);
+    }
+
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SayAction.java b/blade-engine/src/com/bladecoder/engine/actions/SayAction.java
index 8ec119808..f9b2a3bc8 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/SayAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/SayAction.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,204 +15,93 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.BaseCallbackAction;
-import com.bladecoder.engine.actions.Param;
 import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.anim.Tween;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.InteractiveActor;
 import com.bladecoder.engine.model.Text;
 import com.bladecoder.engine.model.TextManager;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.util.EngineLogger;
-
-public class SayAction extends BaseCallbackAction {
-	public static final String INFO = "Says a text";
-	public static final Param[] PARAMS = {
-			new Param("text", "The 'text' to show", Type.STRING),
-			new Param(
-					"pos",
-					"The position of the text. If null, the position will be calc based in actor",
-					Type.VECTOR2),
-			new Param("speech", "The 'soundId' to play if selected",
-					Type.STRING),
-			new Param(
-					"wait",
-					"If this param is 'false' the text is showed and the action continues inmediatly",
-					Type.BOOLEAN, true),
-			new Param(
-					"type",
-					"The type of the text: 'talk', 'rectangle' (default) and 'plain'",
-					Type.STRING, true, "rectangle", new String[] { "rectangle",
-							"talk", "plain" }), 
-			new Param("animation",	"The animation to put when talking instead the default talk animation.",
-									Type.STRING)					
-	};
-
-	private String soundId;
-	private String text;
-
-	private String actorId;
-
-	private Text.Type type = Text.Type.RECTANGLE;
-
-	private String previousFA = null;
-	private String talkFA = null;
-	private Vector2 pos = null;
-
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-
-		soundId = params.get("speech");
-		text = params.get("text");
-		talkFA = params.get("animation");
-
-		if (params.get("wait") != null) {
-			setWait(Boolean.parseBoolean(params.get("wait")));
-		}
-
-		if (params.get("type") != null) {
-			if (params.get("type").equals("talk")) {
-				type = Text.Type.TALK;
-			} else if (params.get("type").equals("rectangle")) {
-				type = Text.Type.RECTANGLE;
-			} else if (params.get("type").equals("plain")) {
-				type = Text.Type.PLAIN;
-			}
-		}
-
-		if (params.get("pos") != null) {
-			pos = Param.parseVector2(params.get("pos"));
-		}
-	}
-
-	@Override
-	public boolean run(ActionCallback cb) {
-		setVerbCb(cb);	
-		EngineLogger.debug("SAY ACTION");
-		BaseActor actor = World.getInstance().getCurrentScene()
-				.getActor(actorId, false);
-
-		if (type == Text.Type.TALK)
-			restoreStandPose((SpriteActor) actor);
-
-		if (soundId != null)
-			actor.playSound(soundId);
-
-		if (text != null) {
-			float x, y;
-			boolean quee = false;
-
-			if (pos != null) {
-				x = pos.x;
-				y = pos.y;
-			} else {
-
-				if (type == Text.Type.RECTANGLE) {
-					x = y = TextManager.POS_SUBTITLE;
-				} else {
-					// WorldCamera c = World.getInstance().getCamera();
-					// Vector3 p = c.scene2screen(pos.x, pos.y +
-					// ((SpriteActor)actor).getHeight());
-
-					x = actor.getX();
-					y = actor.getY()
-							+ actor.getBBox().getBoundingRectangle()
-									.getHeight();
-					// quee = true;
-				}
-			}
-
-			if (type == Text.Type.TALK) {
-				previousFA = ((SpriteActor) actor).getRenderer()
-						.getCurrentFrameAnimationId();
-				
-				if(talkFA != null)
-					((SpriteActor) actor).startFrameAnimation(
-							talkFA, Tween.FROM_FA, 0, null);
-				else
-					((SpriteActor) actor).startFrameAnimation(
-						getTalkFA(previousFA), Tween.FROM_FA, 0, null);
-			}
-
-			World.getInstance().getTextManager()
-						.addSubtitle(text, x, y, quee, type, Color.BLACK, getWait()?this:null);
-		}
-		
-		return getWait();
-	}
-
-	@Override
-	public void resume() {
-		if (this.type == Text.Type.TALK) {
-			SpriteActor actor = (SpriteActor) World.getInstance()
-					.getCurrentScene().getActor(actorId, false);
-			actor.startFrameAnimation(previousFA, Tween.FROM_FA, 0, null);
-		}
-
-		super.resume();
-	}
-
-	private void restoreStandPose(SpriteActor a) {
-		if (a == null)
-			return;
-
-		String fa = a.getRenderer().getCurrentFrameAnimationId();
-
-		if (fa.startsWith("talk.")) { // If the actor was already talking we
-										// restore the actor to the 'stand' pose
-			int idx = fa.indexOf('.');
-			String prevFA = "stand" + fa.substring(idx);
-			a.startFrameAnimation(prevFA, null);
-		}
-	}
-
-	private String getTalkFA(String prevFA) {
-		if (prevFA.endsWith("left"))
-			return "talk.left";
-		else if (prevFA.endsWith("right"))
-			return "talk.right";
-
-		return "talk";
-	}
-
-	@Override
-	public void write(Json json) {
-
-		json.writeValue("soundId", soundId);
-		json.writeValue("text", text);
-		json.writeValue("actorId", actorId);
-		json.writeValue("previousFA", previousFA);
-		json.writeValue("type", type);
-		json.writeValue("talkFA", talkFA);
-		super.write(json);
-	}
-
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		soundId = json.readValue("soundId", String.class, jsonData);
-		text = json.readValue("text", String.class, jsonData);
-		actorId = json.readValue("actorId", String.class, jsonData);
-		previousFA = json.readValue("previousFA", String.class, jsonData);
-		type = json.readValue("type", Text.Type.class, jsonData);
-		talkFA = json.readValue("talkFA", String.class, jsonData);
-		super.read(json, jsonData);
-	}
-
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
+
+@ActionDescription("Says a text")
+public class SayAction implements Action {
+    @ActionPropertyDescription("The target actor.")
+    @ActionProperty(type = Type.CHARACTER_ACTOR, required = true)
+    private String actor;
+
+    @ActionPropertyDescription("The 'text' to show.")
+    @ActionProperty(type = Type.SMALL_TEXT)
+    private String text;
+
+    @ActionPropertyDescription("The 'voice' file to play if selected.")
+    @ActionProperty(type = Type.VOICE)
+    private String voiceId;
+
+    @ActionProperty(required = true, defaultValue = "SUBTITLE")
+    @ActionPropertyDescription("The type of the text.")
+    private Text.Type type = Text.Type.SUBTITLE;
+
+    @ActionPropertyDescription("The animation to set when talking.")
+    @ActionProperty(required = false)
+    private String animation;
+
+    @ActionPropertyDescription("The style to use (an entry in your `ui.json` in the `com.bladecoder.engine.ui" +
+            ".TextManagerUI$TextManagerUIStyle` section)")
+    @ActionProperty(type = Type.TEXT_STYLE, required = false)
+    private String style;
+
+    @ActionProperty(defaultValue = "false")
+    @ActionPropertyDescription("Queue the text if other text is showing, or show it immediately.")
+    private boolean queue = false;
+
+    @ActionProperty(required = true)
+    @ActionPropertyDescription("If this param is 'false' the text is showed and the action continues inmediatly")
+    private boolean wait = true;
+
+    private World w;
+
+    @Override
+    public void init(World w) {
+        this.w = w;
+    }
+
+    @Override
+    public boolean run(VerbRunner cb) {
+        float x = TextManager.POS_SUBTITLE, y = TextManager.POS_SUBTITLE;
+        Color color = null;
+
+        if (text == null) {
+            // if text is null, we stop showing the current text if any
+            while (w.getCurrentScene().getTextManager().getCurrentText() != null)
+                w.getCurrentScene().getTextManager().next();
+            return false;
+        }
+
+        InteractiveActor a = (InteractiveActor) w.getCurrentScene().getActor(actor, false);
+
+        if (type == Text.Type.TALK && a != null) {
+            Rectangle boundingRectangle = a.getBBox().getBoundingRectangle();
+
+            x = boundingRectangle.getX() + boundingRectangle.getWidth() / 2;
+            y = boundingRectangle.getY() + boundingRectangle.getHeight();
+
+            color = ((CharacterActor) a).getTextColor();
+
+            Vector2 talkingTextPos = ((CharacterActor) a).getTalkingTextPos();
+
+            if (talkingTextPos != null) {
+                x += talkingTextPos.x;
+                y += talkingTextPos.y;
+            }
+        }
+
+        w.getCurrentScene().getTextManager().addText(text, x, y, queue, type, color, style,
+                a != null ? a.getId() : actor, voiceId, animation, wait ? cb : null);
+
+        return wait;
+
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SayDialogAction.java b/blade-engine/src/com/bladecoder/engine/actions/SayDialogAction.java
index ece6333de..abf1a5d13 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/SayDialogAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/SayDialogAction.java
@@ -15,160 +15,83 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.BaseCallbackAction;
-import com.bladecoder.engine.actions.Param;
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
-import com.bladecoder.engine.model.BaseActor;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.model.CharacterActor;
 import com.bladecoder.engine.model.DialogOption;
-import com.bladecoder.engine.model.SpriteActor;
 import com.bladecoder.engine.model.Text;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
 
-public class SayDialogAction extends BaseCallbackAction {
+@ActionDescription("Says the selected option from the current dialog. This action does the next steps:\n"
+		+ "\n- Sets the player 'talk' animation and say the player text"
+		+ "\n- Restore the previous player animation and set the target actor 'talk' animation and say the response text"
+		+ "\n- Restore the target actor animation")
+public class SayDialogAction implements Action {
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the text is showed and the action continues inmediatly")
+	private boolean wait = true;
 
-	public static final String INFO = 
-			"Says the selected option from the current dialog. This action does the next steps:\n" +
-			"\n- Sets the player 'talk' animation and say the player text" +
-			"\n- Restore the previous player animation and set the target actor 'talk' animation and say the response text" + 
-			"\n- Restore the target actor animation";
-	public static final Param[] PARAMS = {
-		};
-
-	private boolean characterTurn = false;
-	private String characterName;
-	private String responseText;
-	
-	private String previousFA;
+	private World w;
 
 	@Override
-	public void setParams(HashMap<String, String> params) {
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public boolean run(ActionCallback cb) {
-		setVerbCb(cb);
-		World w = World.getInstance();
-		DialogOption o = World.getInstance().getCurrentDialog().getCurrentOption();
-		String playerText = o.getText();
-		responseText = o.getResponseText();
-		characterName = w.getCurrentDialog().getActor();
-		
-		characterTurn = true;
-		previousFA = null;
-		
-		// If the player or the character is talking restore to 'stand' pose
-		restoreStandPose(w.getCurrentScene().getPlayer());
-		
-		if(w.getCurrentScene().getActor(characterName, false) instanceof SpriteActor)
-			restoreStandPose((SpriteActor)w.getCurrentScene().getActor(characterName, false));
+	public boolean run(VerbRunner cb) {
 
-		if (playerText != null) {
-			SpriteActor player = World.getInstance().getCurrentScene().getPlayer();
+		if (w.getCurrentDialog() == null || w.getCurrentDialog().getCurrentOption() == null) {
+			EngineLogger.debug("SayDialogAction WARNING: Current dialog doesn't found.");
 
-//			WorldCamera c = World.getInstance().getCamera();
-//			Vector3 p = c.scene2screen(pos.x, pos.y + player.getHeight());
+			return false;
+		}
 
-			World.getInstance().getTextManager()
-					.addSubtitle(playerText, player.getX(), player.getY() + player.getHeight(), false, Text.Type.TALK, Color.BLACK, this);
+		DialogOption o = w.getCurrentDialog().getCurrentOption();
+		String playerText = o.getText();
+		String responseText = o.getResponseText();
 
-			previousFA = player.getRenderer().getCurrentFrameAnimationId(); 
-			player.startFrameAnimation(getTalkFA(previousFA), null);
+		if (playerText != null) {
+			CharacterActor player = w.getCurrentScene().getPlayer();
 
-		} else {
-			resume();
-		}
-		
-		return getWait();
-	}
+			Rectangle boundingRectangle = player.getBBox().getBoundingRectangle();
+			float x = boundingRectangle.getX() + boundingRectangle.getWidth() / 2;
+			float y = boundingRectangle.getY() + boundingRectangle.getHeight();
 
-	@Override
-	public void resume() {
+			Vector2 talkingTextPos = player.getTalkingTextPos();
 
-		World w = World.getInstance();
-		BaseActor actor = w.getCurrentScene().getActor(characterName, false);
-		
-		if (characterTurn) {
-			characterTurn = false;
-			
-			if(previousFA!= null){
-				SpriteActor player = World.getInstance().getCurrentScene().getPlayer();
-				player.startFrameAnimation(previousFA, null);
+			if (talkingTextPos != null) {
+				x += talkingTextPos.x;
+				y += talkingTextPos.y;
 			}
 
-			if (responseText != null) {
+			w.getCurrentScene().getTextManager().addText(playerText, x, y, false, Text.Type.TALK, player.getTextColor(),
+					null, player.getId(), o.getVoiceId(), null, responseText == null && wait ? cb : null);
+		}
 
-//				WorldCamera c = World.getInstance().getCamera();
-//				Vector3 p = c.scene2screen(pos.x, pos.y + actor.getHeight());
+		if (responseText != null) {
+			CharacterActor actor = w.getCurrentDialog().getActor();
 
-				World.getInstance()
-						.getTextManager()
-						.addSubtitle(responseText, actor.getX(), actor.getY() + actor.getBBox().getBoundingRectangle().getHeight() , false, Text.Type.TALK,
-								Color.BLACK, this);
+			String responseVoiceId = o.getResponseVoiceId();
 
-				if(actor instanceof SpriteActor) {
-					previousFA = ((SpriteActor)actor).getRenderer().getCurrentFrameAnimationId(); 
-					((SpriteActor)actor).startFrameAnimation(getTalkFA(previousFA), null);
-				}
-			} else {
-				super.resume();
-			}
-		} else {
-			if(actor instanceof SpriteActor) {
-				((SpriteActor)actor).startFrameAnimation(previousFA, null);
-			}
-			super.resume();			
-		}
-	}
-	
-	private void restoreStandPose(SpriteActor a) {
-		if(a == null) return;
-		
-		String fa = a.getRenderer().getCurrentFrameAnimationId();
-		
-		if(fa.startsWith("talk.")){ // If the actor was already talking we restore the actor to the 'stand' pose
-			int idx = fa.indexOf('.');
-			String prevFA = "stand" + fa.substring(idx);
-			a.startFrameAnimation(prevFA, null);
-		}
-	}
-	
-	private String getTalkFA(String prevFA) {
-		if(prevFA.endsWith("left")) return "talk.left";
-		else if(prevFA.endsWith("right")) return "talk.right";
-		
-		return "talk";
-	}
+			Rectangle boundingRectangle = actor.getBBox().getBoundingRectangle();
+			float x = boundingRectangle.getX() + boundingRectangle.getWidth() / 2;
+			float y = boundingRectangle.getY() + boundingRectangle.getHeight();
+			
+			Vector2 talkingTextPos = actor.getTalkingTextPos();
 
-	@Override
-	public void write(Json json) {
-		json.writeValue("previousFA", previousFA);
-		json.writeValue("responseText", responseText);
-		json.writeValue("characterTurn", characterTurn);
-		json.writeValue("characterName", characterName);
-		super.write(json);
-	}
+			if (talkingTextPos != null) {
+				x += talkingTextPos.x;
+				y += talkingTextPos.y;
+			}
 
-	@Override
-	public void read (Json json, JsonValue jsonData) {
-		previousFA = json.readValue("previousFA", String.class, jsonData);
-		responseText = json.readValue("responseText", String.class, jsonData);
-		characterTurn = json.readValue("characterTurn", Boolean.class, jsonData);
-		characterName = json.readValue("characterName", String.class, jsonData);
-		super.read(json, jsonData);
-	}
-	
+			w.getCurrentScene().getTextManager().addText(responseText, x, y, true, Text.Type.TALK, actor.getTextColor(),
+					null, actor.getId(), responseVoiceId, null, wait ? cb : null);
+		}
 
-	@Override
-	public String getInfo() {
-		return INFO;
+		return wait;
 	}
 
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ScaleAction.java b/blade-engine/src/com/bladecoder/engine/actions/ScaleAction.java
new file mode 100644
index 000000000..e6b8ee3cd
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/ScaleAction.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.anim.SpriteScaleTween;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.InterpolationMode;
+
+@ActionDescription(name = "ScaleAnim", value = "Proportional Scale animation for sprite actors")
+public class ScaleAction implements Action {
+	@ActionPropertyDescription("The target actor")
+	@ActionProperty(type = Type.SPRITE_ACTOR)
+	private String actor;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The target scale")
+	private float scale;
+
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription("Duration of the animation in seconds")
+	private float speed;
+
+	@ActionProperty
+	@ActionPropertyDescription("The The times to repeat")
+	private int count = -1;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the transition is showed and the action continues inmediatly")
+	private boolean wait = true;
+
+	@ActionProperty(required = true, defaultValue = "NO_REPEAT")
+	@ActionPropertyDescription("The repeat mode")
+	private Tween.Type repeat = Tween.Type.NO_REPEAT;
+
+	@ActionProperty
+	@ActionPropertyDescription("The interpolation mode")
+	private InterpolationMode interpolation;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		SpriteActor a = (SpriteActor) w.getCurrentScene().getActor(actor, true);
+
+		SpriteScaleTween t = new SpriteScaleTween();
+		t.start(a, repeat, count, scale, scale, speed, interpolation, wait ? cb : null);
+
+		a.addTween(t);
+
+		return wait;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ScaleAnimActionXY.java b/blade-engine/src/com/bladecoder/engine/actions/ScaleAnimActionXY.java
new file mode 100644
index 000000000..1215f3dd7
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/ScaleAnimActionXY.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.anim.SpriteScaleTween;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.InterpolationMode;
+
+@ActionDescription(name = "ScaleAnimXY", value = "Scale animation for sprite actors")
+public class ScaleAnimActionXY implements Action {
+	@ActionPropertyDescription("The target actor")
+	@ActionProperty(type = Type.SPRITE_ACTOR)
+	private String actor;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The target scale")
+	private Vector2 scale;
+
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription("Duration of the animation in seconds")
+	private float speed;
+
+	@ActionProperty
+	@ActionPropertyDescription("The The times to repeat")
+	private int count = 1;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the transition is showed and the action continues inmediatly")
+	private boolean wait = true;
+
+	@ActionProperty(required = true, defaultValue = "REPEAT")
+	@ActionPropertyDescription("The repeat mode")
+	private Tween.Type repeat = Tween.Type.REPEAT;
+
+	@ActionProperty
+	@ActionPropertyDescription("The interpolation mode")
+	private InterpolationMode interpolation;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		SpriteActor a = (SpriteActor) w.getCurrentScene().getActor(actor, true);
+
+		SpriteScaleTween t = new SpriteScaleTween();
+		t.start(a, repeat, count, scale.x, scale.y, speed, interpolation, wait ? cb : null);
+
+		a.addTween(t);
+
+		return wait;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SceneActorRef.java b/blade-engine/src/com/bladecoder/engine/actions/SceneActorRef.java
new file mode 100644
index 000000000..a20ed2338
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/SceneActorRef.java
@@ -0,0 +1,77 @@
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
+
+public class SceneActorRef {
+	private final String sceneId, actorId;
+
+	public SceneActorRef() {
+		this(null, null);
+	}
+
+	public SceneActorRef(String sceneId, String actorId) {
+		this.sceneId = sceneId;
+		this.actorId = actorId;
+	}
+	
+	public SceneActorRef(String sceneActor) {
+		if (sceneActor == null) {
+			sceneId = null;
+			actorId = null;
+			return;
+		}
+
+		int idx = sceneActor.indexOf(Param.STRING_PARAM_SEPARATOR.charAt(0));
+		
+		// Also allow '.' character as separator because is more usable inside Ink files.
+		if(idx == -1)
+			idx = sceneActor.indexOf('.');
+
+		if (idx != -1) {
+			sceneId = sceneActor.substring(0, idx);
+			actorId = sceneActor.substring(idx + 1);
+		} else {
+			sceneId = null;
+			actorId = sceneActor;
+		}
+	}
+
+	public String getSceneId() {
+		return sceneId;
+	}
+
+	public String getActorId() {
+		return actorId;
+	}
+
+	public Scene getScene(World world) {
+		if (sceneId != null && !sceneId.trim().isEmpty()) {
+			return world.getScene(sceneId);
+		} else {
+			return world.getCurrentScene();
+		}
+	}
+	
+	
+	public BaseActor getActor(World w, boolean searchInventory) {
+		Scene scn = getScene(w);
+		
+		if(scn == null)
+			scn = w.getCurrentScene();
+		
+		return scn.getActor(actorId, searchInventory);
+	}
+
+	public BaseActor getActor(World w) {
+		return getActor(w, true);
+	}
+	
+	public String toString() {
+		if( sceneId==null || sceneId.isEmpty())
+			return actorId;
+		
+		return sceneId + Param.STRING_PARAM_SEPARATOR + actorId;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ScreenPositionAction.java b/blade-engine/src/com/bladecoder/engine/actions/ScreenPositionAction.java
new file mode 100644
index 000000000..0dd01ceaf
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/ScreenPositionAction.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.bladecoder.engine.BladeEngine;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.ui.SceneScreen;
+import com.bladecoder.engine.ui.UI.Screens;
+
+@ActionDescription("Sets actor position in screen coordinates. This is used to show an actor in the same screen position when the scene has scrolled.")
+public class ScreenPositionAction implements Action {
+	public enum Anchor {
+		NONE, CENTER, TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT, TOP, BOTTOM, LEFT, RIGHT
+	}
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The target actor")
+	private SceneActorRef actor;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The position to set")
+	private Vector2 position;
+
+	@ActionProperty(defaultValue = "NONE")
+	@ActionPropertyDescription("The position can be relative to an anchor.")
+	private Anchor anchor = Anchor.NONE;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		Scene s = actor.getScene(w);
+
+		BaseActor a = s.getActor(actor.getActorId(), true);
+
+		if (position != null) {
+			float scale = EngineAssetManager.getInstance().getScale();
+
+			Viewport viewport = ((SceneScreen) BladeEngine.getAppUI().getScreen(Screens.SCENE_SCREEN)).getViewport();
+
+			Vector3 v = new Vector3(position.x * scale, position.y * scale, 0);
+
+			if (anchor == Anchor.CENTER) {
+				v.x += viewport.getWorldWidth() / 2;
+				v.y += viewport.getWorldHeight() / 2;
+			} else if (anchor == Anchor.TOP_LEFT) {
+				v.x += 0;
+				v.y += viewport.getWorldHeight();
+			} else if (anchor == Anchor.TOP_RIGHT) {
+				v.x += viewport.getWorldWidth();
+				v.y += viewport.getWorldHeight();
+			} else if (anchor == Anchor.BOTTOM_RIGHT) {
+				v.x += viewport.getWorldWidth();
+				v.y += 0;
+			} else if (anchor == Anchor.BOTTOM_LEFT) {
+				v.x += 0;
+				v.y += 0;
+			} else if (anchor == Anchor.TOP) {
+				v.x += viewport.getWorldWidth() / 2;
+				v.y += viewport.getWorldHeight();
+			} else if (anchor == Anchor.BOTTOM) {
+				v.x += viewport.getWorldWidth() / 2;
+				v.y += 0;
+			} else if (anchor == Anchor.LEFT) {
+				v.x += 0;
+				v.y += viewport.getWorldHeight() / 2;
+			} else if (anchor == Anchor.RIGHT) {
+				v.x += viewport.getWorldWidth();
+				v.y += viewport.getWorldHeight() / 2;
+			}
+
+			v.x *= viewport.getScreenWidth() / viewport.getWorldWidth();
+			v.y *= viewport.getScreenHeight() / viewport.getWorldHeight();
+
+			v.y = Gdx.graphics.getHeight() - v.y;
+
+			if (w.getUIActors().getActors().contains(a))
+				w.getUIActors().getCamera().unproject(v, 0, 0, viewport.getScreenWidth(), viewport.getScreenHeight());
+			else
+				w.getCurrentScene().getCamera().unproject(v, 0, 0, viewport.getScreenWidth(),
+						viewport.getScreenHeight());
+
+			a.setPosition(v.x, v.y);
+		}
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SetAchievementAction.java b/blade-engine/src/com/bladecoder/engine/actions/SetAchievementAction.java
new file mode 100644
index 000000000..146e698da
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/SetAchievementAction.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Set an achievement.")
+public class SetAchievementAction implements Action {
+	public static IAchievementAPI achievementAPI;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("Achievement name")
+	private String name;
+
+	@Override
+	public void init(World w) {
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		if (achievementAPI != null)
+			achievementAPI.setAchievement(name);
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SetActiveAction.java b/blade-engine/src/com/bladecoder/engine/actions/SetActiveAction.java
deleted file mode 100644
index b76bf1fbf..000000000
--- a/blade-engine/src/com/bladecoder/engine/actions/SetActiveAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.actions;
-
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
-import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.World;
-
-public class SetActiveAction implements Action {
-	public static final String INFO = "Change the visible/interaction properties for the selected actor.";
-	public static final Param[] PARAMS = {
-		new Param("visible", "sets the actor visibility", Type.BOOLEAN), 
-		new Param("interaction", "when 'true' the actor responds to the user input", Type.BOOLEAN)
-		};		
-	
-	String actorId;
-	String visible;
-	String interaction;
-	
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		
-		visible = params.get("visible");
-		interaction = params.get("interaction");
-	}
-
-	@Override
-	public boolean run(ActionCallback cb) {
-		BaseActor actor = World.getInstance().getCurrentScene().getActor(actorId, true);
-		
-		if(visible != null) actor.setVisible(Boolean.parseBoolean(visible));
-		if(interaction != null) actor.setInteraction(Boolean.parseBoolean( interaction));
-		
-		return false;
-	}
-
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SetActorAttrAction.java b/blade-engine/src/com/bladecoder/engine/actions/SetActorAttrAction.java
new file mode 100644
index 000000000..7e9101708
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/SetActorAttrAction.java
@@ -0,0 +1,269 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Disposable;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.assets.AssetConsumer;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SceneLayer;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("Change actor attributes.")
+public class SetActorAttrAction implements Action {
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The target actor")
+	private SceneActorRef actor;
+
+	@ActionProperty
+	@ActionPropertyDescription("Sets the actor visibility")
+	private Boolean visible;
+
+	@ActionProperty
+	@ActionPropertyDescription("When 'true' the actor responds to the user input")
+	private Boolean interaction;
+
+	@ActionPropertyDescription("The actor layer")
+	@ActionProperty(type = Type.LAYER)
+	private String layer;
+
+	@ActionProperty
+	@ActionPropertyDescription("The order to draw bigger is near")
+	private Float zIndex;
+
+	@ActionProperty
+	@ActionPropertyDescription("Enable/Disable the Fake Depth for the actor")
+	private Boolean fakeDepth;
+
+	@ActionProperty
+	@ActionPropertyDescription("Sets the actor scale proportionally")
+	private Float scale;
+
+	@ActionProperty
+	@ActionPropertyDescription("Sets the actor scale non proportionally")
+	private Vector2 scaleXY;
+
+	@ActionProperty
+	@ActionPropertyDescription("Sets the actor rotation")
+	private Float rotation;
+
+	@ActionPropertyDescription("The tint to draw the actor (RRGGBBAA).")
+	@ActionProperty(type = Type.COLOR)
+	private Color tint;
+
+	@ActionProperty
+	@ActionPropertyDescription("Sets the actor as an UI Actor. UI actors persists between scenes and are not affected by the scroll.")
+	private Boolean uiActor;
+
+	@ActionProperty
+	@ActionPropertyDescription("Sets the actor 'stand' animation. Only supported for character actors.")
+	private String standAnimation;
+
+	@ActionProperty
+	@ActionPropertyDescription("Sets the actor 'walk' animation. Only supported for character actors.")
+	private String walkAnimation;
+	@ActionProperty
+	@ActionPropertyDescription("Sets the actor 'talk' animation. Only supported for character actors.")
+	private String talkAnimation;
+
+	@ActionProperty
+	@ActionPropertyDescription("Sets the actor speed for walking. Only supported for character actors.")
+	private Float walkingSpeed;
+
+	@ActionProperty
+	@ActionPropertyDescription("Sets the position of the text when talking. Relative to the character position.")
+	private Vector2 talkingTextPos;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		Scene s = actor.getScene(w);
+
+		BaseActor a = s.getActor(actor.getActorId(), true);
+
+		if (a == null) {
+			EngineLogger.error("SetActorAttr - Actor not found:" + this.actor.getActorId());
+
+			return false;
+		}
+
+		if (visible != null)
+			a.setVisible(visible);
+
+		if (interaction != null) {
+			if (a instanceof InteractiveActor)
+				((InteractiveActor) a).setInteraction(interaction);
+			else
+				EngineLogger.error("'Interaction' property not supported for actor:" + a.getId());
+		}
+
+		if (layer != null) {
+			if (a instanceof InteractiveActor) {
+				InteractiveActor iActor = (InteractiveActor) a;
+
+				String oldLayer = iActor.getLayer();
+
+				s.getLayer(oldLayer).remove(iActor);
+
+				iActor.setLayer(layer);
+
+				SceneLayer l = s.getLayer(layer);
+				l.add(iActor);
+
+				if (!l.isDynamic())
+					l.orderByZIndex();
+			} else
+				EngineLogger.error("'layer' property not supported for actor:" + a.getId());
+		}
+
+		if (zIndex != null) {
+			if (a instanceof InteractiveActor) {
+				InteractiveActor iActor = (InteractiveActor) a;
+
+				iActor.setZIndex(zIndex);
+				SceneLayer l = s.getLayer(iActor.getLayer());
+
+				if (!l.isDynamic())
+					l.orderByZIndex();
+			} else
+				EngineLogger.error("'zIndex' property not supported for actor:" + a.getId());
+		}
+
+		if (scale != null) {
+			if (a instanceof SpriteActor)
+				((SpriteActor) a).setScale(scale);
+			else
+				EngineLogger.error("'scale' property not supported for actor:" + a.getId());
+		}
+
+		if (scaleXY != null) {
+			if (a instanceof SpriteActor)
+				((SpriteActor) a).setScale(scaleXY.x, scaleXY.y);
+			else
+				EngineLogger.error("'scale' property not supported for actor:" + a.getId());
+		}
+
+		if (rotation != null) {
+			if (a instanceof SpriteActor)
+				((SpriteActor) a).setRot(rotation);
+			else
+				EngineLogger.error("'rotation' property not supported for actor:" + a.getId());
+		}
+
+		if (tint != null) {
+			if (a instanceof SpriteActor)
+				((SpriteActor) a).setTint(tint.cpy());
+			else
+				EngineLogger.error("'tint' property not supported for actor:" + a.getId());
+		}
+
+		if (fakeDepth != null) {
+			if (a instanceof SpriteActor) {
+				((SpriteActor) a).setFakeDepth(fakeDepth);
+			} else
+				EngineLogger.error("'fakeDepth' property not supported for actor:" + a.getId());
+		}
+
+		if (standAnimation != null) {
+			if (a instanceof CharacterActor)
+				((CharacterActor) a).setStandAnim(standAnimation);
+			else
+				EngineLogger.error("'standAnimation' property not supported for actor:" + a.getId());
+		}
+
+		if (walkAnimation != null) {
+			if (a instanceof CharacterActor)
+				((CharacterActor) a).setWalkAnim(walkAnimation);
+			else
+				EngineLogger.error("'walkAnimation' property not supported for actor:" + a.getId());
+		}
+
+		if (talkAnimation != null) {
+			if (a instanceof CharacterActor)
+				((CharacterActor) a).setTalkAnim(talkAnimation);
+			else
+				EngineLogger.error("'talkAnimation' property not supported for actor:" + a.getId());
+		}
+
+		if (walkingSpeed != null) {
+			if (a instanceof CharacterActor)
+				((CharacterActor) a).setWalkingSpeed(walkingSpeed);
+			else
+				EngineLogger.error("'walkingSpeed' property not supported for actor:" + a.getId());
+		}
+
+		if (uiActor != null) {
+			if (a instanceof InteractiveActor) {
+				if (uiActor)
+					setUIActor(s, (InteractiveActor) a);
+				else
+					removeUIActor(s, (InteractiveActor) a);
+			} else
+				EngineLogger.error("'uiActor' property not supported for actor:" + a.getId());
+		}
+
+		if (talkingTextPos != null) {
+			if (a instanceof CharacterActor)
+				((CharacterActor) a).setTalkingTextPos(talkingTextPos);
+			else
+				EngineLogger.error("'talkingTextPos' property not supported for actor:" + a.getId());
+		}
+
+		return false;
+	}
+
+	private void setUIActor(Scene scn, InteractiveActor actor) {
+
+		scn.removeActor(actor);
+
+		if (scn != w.getCurrentScene() && w.getCachedScene(scn.getId()) == null && actor instanceof AssetConsumer) {
+			((AssetConsumer) actor).loadAssets();
+			EngineAssetManager.getInstance().finishLoading();
+			((AssetConsumer) actor).retrieveAssets();
+		}
+
+		w.getUIActors().addActor(actor);
+	}
+
+	private void removeUIActor(Scene scn, InteractiveActor actor) {
+		InteractiveActor a = w.getUIActors().removeActor(actor.getId());
+
+		if (a != null) {
+			if (scn != w.getCurrentScene() && a instanceof Disposable)
+				((Disposable) a).dispose();
+
+			scn.addActor(a);
+		} else {
+			EngineLogger.debug("UIActor not found: " + actor.getId());
+		}
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SetCutmodeAction.java b/blade-engine/src/com/bladecoder/engine/actions/SetCutmodeAction.java
index 35e658d5b..655dc58c3 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/SetCutmodeAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/SetCutmodeAction.java
@@ -15,43 +15,27 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
-import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 
+@ActionDescription(name = "Cutmode", value="Set/Unset the cutmode.")
 public class SetCutmodeAction implements Action {
-	public static final String INFO = "Set/Unset the cutmode. Also shows/hide the inventory";
-	public static final Param[] PARAMS = {
-		new Param("value", "when 'true' sets the scene in 'cutmode'", Type.BOOLEAN, true, "true")
-		};	
+	@ActionProperty(required = true, defaultValue = "true")
+	@ActionPropertyDescription("when 'true' sets the scene in 'cutmode'")
+	private boolean value = true;
 	
-	boolean value = true;
+	private World w;
 	
 	@Override
-	public void setParams(HashMap<String, String> params) {	
-		if(params.get("value") != null)
-			value = Boolean.parseBoolean(params.get("value"));
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public boolean run(ActionCallback cb) {
-		World.getInstance().setCutMode(value);
+	public boolean run(VerbRunner cb) {
+		w.setCutMode(value);
 		
 		return false;
 	}
 
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SetDescAction.java b/blade-engine/src/com/bladecoder/engine/actions/SetDescAction.java
new file mode 100644
index 000000000..99e630f1a
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/SetDescAction.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription(value = "Sets the actor description")
+public class SetDescAction implements Action {
+	@ActionProperty(type = Type.SCENE_INTERACTIVE_ACTOR, required = true)
+	@ActionPropertyDescription("The target actor")
+	private SceneActorRef actor;
+
+	@ActionProperty
+	@ActionPropertyDescription("The actor 'desc'")
+	private String text;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		final Scene s = actor.getScene(w);
+
+		String actorId = actor.getActorId();
+		if (actorId == null) {
+			EngineLogger.error("SetDesc - Actor not set.");
+			return false;
+		}
+
+		InteractiveActor a = (InteractiveActor) s.getActor(actorId, true);
+
+		if (a != null)
+			a.setDesc(text);
+		else
+			EngineLogger.error("SetDesc - Actor not found: " + actorId);
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SetDialogOptionAttrAction.java b/blade-engine/src/com/bladecoder/engine/actions/SetDialogOptionAttrAction.java
new file mode 100644
index 000000000..1352ff9fc
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/SetDialogOptionAttrAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.DialogOption;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+@ActionDescription("Change the selected dialog option properties")
+public class SetDialogOptionAttrAction implements Action {
+	@ActionProperty(type = Type.SCENE_CHARACTER_ACTOR, required = true)
+	@ActionPropertyDescription("The target actor")
+	private SceneActorRef actor;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The dialog")
+	private String dialog;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The option")
+	private int option;
+
+	@ActionProperty
+	@ActionPropertyDescription("Show/Hide the dialog option")
+	private Boolean visible;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		final Scene s = actor.getScene(w);
+
+		CharacterActor a = (CharacterActor) s.getActor(actor.getActorId(), true);
+
+		Dialog d = a.getDialog(dialog);
+
+		if (d == null) {
+			EngineLogger.error("SetDialogOptionAttrAction: Dialog '" + dialog + "' not found");
+			return false;
+		}
+
+		DialogOption o = d.getOptions().get(option);
+
+		if (o == null) {
+			EngineLogger.error("SetDialogOptionAttrAction: Option '" + option + "' not found");
+			return false;
+		}
+
+		if (visible != null)
+			o.setVisible(visible);
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SetPlayerAction.java b/blade-engine/src/com/bladecoder/engine/actions/SetPlayerAction.java
new file mode 100644
index 000000000..5e058aea4
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/SetPlayerAction.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Inventory;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Sets the scene player")
+public class SetPlayerAction implements Action {
+
+	@ActionProperty(type = Type.SCENE_CHARACTER_ACTOR)
+	@ActionPropertyDescription("The scene player")
+	private SceneActorRef actor;
+
+	@ActionProperty
+	@ActionPropertyDescription("The inventory 'id' for the player. If empty, the inventory will not change.")
+	private String inventory;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+		Scene s = actor == null ? w.getCurrentScene() : actor.getScene(w);
+		BaseActor a = actor == null || actor.getActorId() == null ? null : s.getActor(actor.getActorId(), true);
+
+		s.setPlayer((CharacterActor) a);
+
+		if (inventory != null && !inventory.equals(w.getCurrentInventory())) {
+			Inventory old = w.getInventory();
+
+			w.setInventory(inventory);
+			w.getInventory().loadAssets();
+			EngineAssetManager.getInstance().finishLoading();
+			w.getInventory().retrieveAssets();
+
+			old.dispose();
+
+		}
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SetSceneStateAction.java b/blade-engine/src/com/bladecoder/engine/actions/SetSceneStateAction.java
new file mode 100644
index 000000000..f4c40e215
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/SetSceneStateAction.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription(name="SceneState", value="Sets the scene state")
+public class SetSceneStateAction implements Action {
+	@ActionPropertyDescription("The scene")
+	@ActionProperty(type = Type.SCENE)
+	private String scene;
+
+	@ActionProperty
+	@ActionPropertyDescription("The scene 'state'")
+	private String state;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {			
+		Scene s = (scene != null && !scene.isEmpty())? w.getScene(scene): w.getCurrentScene();
+		
+		s.setState(state);
+		
+		return false;
+	}
+
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SetStateAction.java b/blade-engine/src/com/bladecoder/engine/actions/SetStateAction.java
index 0e40a59a9..9e5c84710 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/SetStateAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/SetStateAction.java
@@ -15,52 +15,44 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
 import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
 
+@ActionDescription(name = "ActorState", value = "Sets the actor state")
 public class SetStateAction implements Action {
-	public static final String INFO = "Sets the actor state";
-	public static final Param[] PARAMS = {
-		new Param("state", "The actor 'state'", Type.STRING)
-		};		
-	
-	String actorId;
-	String state;
-	
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		state = params.get("state");
-	}
+	@ActionProperty(type = Type.SCENE_INTERACTIVE_ACTOR, required = true)
+	@ActionPropertyDescription("The target actor")
+	private SceneActorRef actor;
 
-	@Override
-	public boolean run(ActionCallback cb) {
-		if(actorId != null) {
-			BaseActor actor = World.getInstance().getCurrentScene().getActor(actorId, true);
-		
-			actor.setState(state);
-		} else {
-			World.getInstance().getCurrentScene().setState(state);
-		}
-		
-		return false;
-	}
+	@ActionProperty
+	@ActionPropertyDescription("The actor 'state'")
+	private String state;
 
+	private World w;
 
 	@Override
-	public String getInfo() {
-		return INFO;
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public Param[] getParams() {
-		return PARAMS;
+	public boolean run(VerbRunner cb) {
+		final Scene s = actor.getScene(w);
+
+		String actorId = actor.getActorId();
+
+		InteractiveActor a = (InteractiveActor) s.getActor(actorId, true);
+
+		if (a != null)
+			a.setState(state);
+		else
+			EngineLogger.error("SetState - Actor not found: " + actorId);
+
+		return false;
 	}
+
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SetWalkzoneAction.java b/blade-engine/src/com/bladecoder/engine/actions/SetWalkzoneAction.java
new file mode 100644
index 000000000..0839cdc13
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/SetWalkzoneAction.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription(name = "SetWalkzone", value = "Set the scene walkzone.")
+public class SetWalkzoneAction implements Action {
+	@ActionProperty(type = Type.SCENE_WALKZONE_ACTOR, required = false)
+	@ActionPropertyDescription("The target actor")
+	private SceneActorRef actor;
+
+	private World w;
+
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+
+		if (actor == null) {
+			w.getCurrentScene().setWalkZone(null);
+		} else {
+			Scene s = actor.getScene(w);
+
+			s.setWalkZone(actor.getActorId());
+			
+			// We must recalc the walkzone when the target scene is the current scene or when
+			// the scene is cached.
+			if(s == w.getCurrentScene() || 
+					w.getCachedScene(s.getId()) != null) {
+				s.calcWalkzone();
+			}
+		}
+
+		return false;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/ShowInventoryAction.java b/blade-engine/src/com/bladecoder/engine/actions/ShowInventoryAction.java
index a7b089ec7..023f9f99e 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/ShowInventoryAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/ShowInventoryAction.java
@@ -15,43 +15,27 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
-import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 
+@ActionDescription("Shows/Hide the inventory")
 public class ShowInventoryAction implements Action {
-	public static final String INFO = "Shows/Hide the inventory";
-	public static final Param[] PARAMS = {
-		new Param("value", "when 'true' sets the scene in 'cutmode'", Type.BOOLEAN, true, "true")
-		};	
+	@ActionProperty(required = true, defaultValue = "true")
+	@ActionPropertyDescription("When 'true' shows the inventory button to show the inventory.")
+	private boolean value = true;
 	
-	boolean value = true;
+	private World w;
 	
 	@Override
-	public void setParams(HashMap<String, String> params) {	
-		if(params.get("value") != null)
-			value = Boolean.parseBoolean(params.get("value"));
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public boolean run(ActionCallback cb) {
-		World.getInstance().showInventory(value);
+	public boolean run(VerbRunner cb) {
+		w.showInventory(value);
 		
 		return false;
 	}
 
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/SoundAction.java b/blade-engine/src/com/bladecoder/engine/actions/SoundAction.java
index 58b7bc8d2..a460a064c 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/SoundAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/SoundAction.java
@@ -15,54 +15,41 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
 import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 
+@Deprecated
+@ActionDescription("Play/Stop a sound. Deprecated: Use PlaySound action instead.")
 public class SoundAction implements Action {
-	public static final String INFO = "Play/Stop a sound";
-	public static final Param[] PARAMS = {
-		new Param("play", "The 'soundId' to play", Type.STRING),
-		new Param("stop", "The 'soundId' to stop", Type.STRING)
-		};		
-	
-	String actorId;
-	String play;
-	String stop;
-	
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		play = params.get("play");
-		stop = params.get("stop");
-	}
+	@ActionPropertyDescription("The target actor")
+	@ActionProperty(type = Type.INTERACTIVE_ACTOR, required = true)
+	private String actor;
 
-	@Override
-	public boolean run(ActionCallback cb) {
-		
-		BaseActor actor = World.getInstance().getCurrentScene().getActor(actorId, true);
-		
-		if(play!= null)	actor.playSound(play);
-		
-		if(stop!= null)	actor.stopSound(stop);
-		
-		return false;
-	}
+	@ActionPropertyDescription("The actor 'soundId' to play. If empty the current sound will be stopped.")
+	@ActionProperty(type = Type.STRING)
+	private String play;
 
+	private World w;
 
 	@Override
-	public String getInfo() {
-		return INFO;
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public Param[] getParams() {
-		return PARAMS;
+	public boolean run(VerbRunner cb) {
+
+		if ("$PLAYER".equals(actor))
+			actor = w.getCurrentScene().getPlayer().getId();
+
+		if (play != null) {
+			w.getCurrentScene().getSoundManager().playSound(actor + "_" + play);
+		} else {
+			w.getCurrentScene().getSoundManager().stopCurrentSound(actor);
+		}
+
+		return false;
 	}
+
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/TalktoAction.java b/blade-engine/src/com/bladecoder/engine/actions/TalktoAction.java
index 011fc606f..4efaab007 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/TalktoAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/TalktoAction.java
@@ -15,49 +15,37 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.Param;
-
 import com.bladecoder.engine.actions.Param.Type;
-import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 
+@ActionDescription("Sets the dialog mode")
 public class TalktoAction implements Action {
-	public static final String INFO = "Sets the dialog mode";
-	public static final Param[] PARAMS = {
-		new Param("dialog", "The 'dialogId' to show", Type.STRING, true)
-		};		
+	@ActionPropertyDescription("The target actor")
+	@ActionProperty(type = Type.CHARACTER_ACTOR, required = true)
+	private String actor;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("The 'dialogId' to show")
+	private String dialog;
 	
-	String actorId;
-	String dialog;
+	private World w;
 	
 	@Override
-	public void setParams(HashMap<String, String> params) {
-		actorId = params.get("actor");
-		dialog = params.get("dialog");
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public boolean run(ActionCallback cb) {
+	public boolean run(VerbRunner cb) {
 		
-		BaseActor actor = World.getInstance().getCurrentScene().getActor(actorId, false);
+		CharacterActor a = (CharacterActor)w.getCurrentScene().getActor(actor, false);
 		
-		World.getInstance().setCurrentDialog(actor.getDialog(dialog));
+		w.setCurrentDialog(a.getDialog(dialog));
 		
 		return false;
 	}
 
 
-	@Override
-	public String getInfo() {
-		return INFO;
-	}
-
-	@Override
-	public Param[] getParams() {
-		return PARAMS;
-	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/TextAction.java b/blade-engine/src/com/bladecoder/engine/actions/TextAction.java
new file mode 100644
index 000000000..035cb2cf6
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/TextAction.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.Text;
+import com.bladecoder.engine.model.TextManager;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+
+@ActionDescription("Draw a text in the screen")
+public class TextAction implements Action {
+	@ActionPropertyDescription("The 'text' to show")
+	@ActionProperty(type = Type.SMALL_TEXT)
+	private String text;
+
+	@ActionPropertyDescription("The 'voice' file to play if selected.")
+	@ActionProperty(type = Type.VOICE)
+	private String voiceId;
+
+	@ActionPropertyDescription("The style to use (an entry in your `ui.json` in the `com.bladecoder.engine.ui.TextManagerUI$TextManagerUIStyle` section)")
+	@ActionProperty(type = Type.TEXT_STYLE, required = true, defaultValue = "default")
+	private String style;
+
+	@ActionPropertyDescription("The color to use for the font (RRGGBBAA). If not set, the default color defined in the style is used.")
+	@ActionProperty(type = Type.COLOR)
+	private Color color;
+
+	@ActionProperty
+	@ActionPropertyDescription("Obtain the text position from this actor.")
+	private SceneActorRef target;
+
+	@ActionProperty
+	@ActionPropertyDescription("The position of the text. -1 for center. Absolute if no target is selected. Relative if the target is selected.")
+	private Vector2 pos;
+
+	@ActionProperty(required = true, defaultValue = "SUBTITLE")
+	@ActionPropertyDescription("The type of the text.")
+	private Text.Type type = Text.Type.PLAIN;
+
+	@ActionProperty(defaultValue = "false")
+	@ActionPropertyDescription("Queue the text if other text is showing, or show it immediately.")
+	private boolean queue = false;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the text is showed and the action continues inmediatly")
+	private boolean wait = true;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {
+
+		if (text == null)
+			return false;
+
+		float x = TextManager.POS_CENTER, y = TextManager.POS_CENTER;
+
+		if (target != null) {
+			Scene ts = target.getScene(w);
+			BaseActor anchorActor = ts.getActor(target.getActorId(), true);
+
+			x = anchorActor.getX();
+			y = anchorActor.getY();
+
+			if (anchorActor instanceof InteractiveActor) {
+				Vector2 refPoint = ((InteractiveActor) anchorActor).getRefPoint();
+				x += refPoint.x;
+				y += refPoint.y;
+			}
+
+			if (pos != null) {
+				float scale = EngineAssetManager.getInstance().getScale();
+
+				x += pos.x * scale;
+				y += pos.y * scale;
+			}
+		} else if (pos != null) {
+			float scale = EngineAssetManager.getInstance().getScale();
+
+			if (pos.x != TextManager.POS_CENTER)
+				x = pos.x * scale;
+
+			if (pos.y != TextManager.POS_CENTER)
+				y = pos.y * scale;
+
+		} else {
+
+			if (type == Text.Type.SUBTITLE) {
+				x = y = TextManager.POS_SUBTITLE;
+			}
+		}
+
+		w.getCurrentScene().getTextManager().addText(text, x, y, queue, type, color, style, null, voiceId, null,
+				wait ? cb : null);
+
+		return wait;
+
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/TintAnimAction.java b/blade-engine/src/com/bladecoder/engine/actions/TintAnimAction.java
new file mode 100644
index 000000000..4cb25d45b
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/actions/TintAnimAction.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.actions;
+
+import com.badlogic.gdx.graphics.Color;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.anim.SpriteTintTween;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.InterpolationMode;
+
+@ActionDescription(value= "Sets an actor Color animation")
+public class TintAnimAction implements Action {
+	@ActionPropertyDescription("The target actor")
+	@ActionProperty(type = Type.SPRITE_ACTOR, required=true)
+	private String actor;
+
+	@ActionProperty(type = Type.COLOR, required = true)
+	@ActionPropertyDescription( "The target color (RRGGBBAA).")
+	private Color color;
+
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription("Duration of the animation in seconds")
+	private float speed;
+
+	@ActionProperty
+	@ActionPropertyDescription("The The times to repeat")
+	private int count = 1;
+
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the transition is showed and the action continues inmediatly")
+	private boolean wait = true;
+
+	@ActionProperty(required = true, defaultValue = "NO_REPEAT")
+	@ActionPropertyDescription("The repeat mode")
+	private Tween.Type repeat = Tween.Type.NO_REPEAT;
+
+	@ActionProperty
+	@ActionPropertyDescription("The interpolation mode")
+	private InterpolationMode interpolation;
+	
+	private World w;
+	
+	@Override
+	public void init(World w) {
+		this.w = w;
+	}
+
+	@Override
+	public boolean run(VerbRunner cb) {				
+		SpriteActor a = (SpriteActor) w.getCurrentScene().getActor(actor, true);
+
+		
+		SpriteTintTween t = new SpriteTintTween();
+		t.start(a, repeat, count, color, speed, interpolation,
+				wait ? cb : null);
+		
+		a.addTween(t);
+		
+		return wait;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/actions/TransitionAction.java b/blade-engine/src/com/bladecoder/engine/actions/TransitionAction.java
index 6f75f99b8..cd22130d4 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/TransitionAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/TransitionAction.java
@@ -15,93 +15,43 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.BaseCallbackAction;
-import com.bladecoder.engine.actions.Param;
 import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.Param.Type;
 import com.bladecoder.engine.model.Transition;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 
-public class TransitionAction extends BaseCallbackAction {
-	public static final String INFO = "Sets a transition effect (FADEIN/FADEOUT)";
-	public static final Param[] PARAMS = {
-		new Param("time", "Duration of the transition", Type.FLOAT, true, "1.0"),
-		new Param("color", "The color to fade ('white', 'black' or RRGGBBAA).", Type.STRING, true, "black"),
-		new Param("type", "The transition type (fadein/fadeout)", Type.STRING, true, "fadein", new String[] {"fadein", "fadeout"}),
-		new Param("wait", "If this param is 'false' the transition is showed and the action continues inmediatly", Type.BOOLEAN, true),
-		};		
-	
+@ActionDescription("Sets a transition effect (FADEIN/FADEOUT)")
+public class TransitionAction implements Action {
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription("Duration of the transition")
 	private float time = 1;
-	Color c = new Color(0,0,0,1);
-	Transition.Type type = Transition.Type.FADE_IN;
-	
-	@Override
-	public boolean run(ActionCallback cb) {
-		setVerbCb(cb);
-		Transition t = new Transition();
-		t.create(time, c, type, getWait()?this:null);
-		
-		World.getInstance().getCurrentScene().setTransition(t);
-		
-		return getWait();
-	}
 
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		
-		if(params.get("time") != null) {
-			time = Float.parseFloat(params.get("time"));
-		}
-		
-		if(params.get("type") != null) {
-			if(params.get("type").equals("fadeout"))
-				type = Transition.Type.FADE_OUT;
-		}
-		
-		if(params.get("color") != null && !params.get("color").trim().isEmpty()) {
-			String color = params.get("color").trim();
-		
-			if(color.equals("black"))
-				c =  new Color(0,0,0,1);
-			else if(color.equals("white"))
-				c = new Color(1,1,1,1);
-			else
-				c = Color.valueOf(color);
-		}
-		
-		if(params.get("wait") != null) {
-			setWait(Boolean.parseBoolean(params.get("wait")));
-		}
-	}
-	
-	@Override
-	public void write(Json json) {		
-		json.writeValue("time", time);
-		json.writeValue("color", c);
-		json.writeValue("type", type);
-		super.write(json);	
-	}
+	@ActionPropertyDescription("The color to fade ('white', 'black' or RRGGBBAA).")
+	@ActionProperty(type = Type.COLOR, required = true, defaultValue = "black")
+	private Color color = new Color(0,0,0,1);
 
-	@Override
-	public void read (Json json, JsonValue jsonData) {
-		time = json.readValue("time", Float.class, jsonData);
-		c = json.readValue("color", Color.class, jsonData);
-		type = json.readValue("type", Transition.Type.class, jsonData);
-		super.read(json, jsonData);
-	}	
-	
+	@ActionProperty(required = true, defaultValue = "FADE_IN")
+	@ActionPropertyDescription("The transition type (fadein/fadeout)")
+	private Transition.Type type = Transition.Type.FADE_IN;     // FIXME: This adds NONE as a valid value
 
+	@ActionProperty(required = true)
+	@ActionPropertyDescription("If this param is 'false' the transition is showed and the action continues inmediatly")
+	private boolean wait = true;
+	
+	private World w;
+	
 	@Override
-	public String getInfo() {
-		return INFO;
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public Param[] getParams() {
-		return PARAMS;
+	public boolean run(VerbRunner cb) {
+		Transition t = w.getTransition();
+		t.create(time, color, type, wait?cb:null);
+		
+		return wait;
 	}
+
 }
diff --git a/blade-engine/src/com/bladecoder/engine/actions/WaitAction.java b/blade-engine/src/com/bladecoder/engine/actions/WaitAction.java
index 89635233e..4e2c3eb6b 100644
--- a/blade-engine/src/com/bladecoder/engine/actions/WaitAction.java
+++ b/blade-engine/src/com/bladecoder/engine/actions/WaitAction.java
@@ -15,56 +15,26 @@
  ******************************************************************************/
 package com.bladecoder.engine.actions;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.actions.BaseCallbackAction;
-import com.bladecoder.engine.actions.Param;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
-import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.model.VerbRunner;
 import com.bladecoder.engine.model.World;
 
-public class WaitAction extends BaseCallbackAction {
-	public static final String INFO = "Pause the action";
-	public static final Param[] PARAMS = {
-		new Param("time", "The time for the pause in seconds", Type.FLOAT, true, "1.0")
-		};		
-	
-	private float time;
-	
-
-	@Override
-	public boolean run(ActionCallback cb) {
-		setVerbCb(cb);
-		World.getInstance().addTimer(time, this);
-		return getWait();
-	}
+@ActionDescription("Pause the action")
+public class WaitAction implements Action {
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription("The time pause in seconds")
 
-	@Override
-	public void setParams(HashMap<String, String> params) {
-		time = Float.parseFloat(params.get("time"));
-	}
+	private float time;
 	
-	@Override
-	public void write(Json json) {		
-		json.writeValue("time", time);
-		super.write(json);	
-	}
-
-	@Override
-	public void read (Json json, JsonValue jsonData) {
-		time = json.readValue("time", Float.class, jsonData);
-		super.read(json, jsonData);
-	}	
+	private World w;
 	
-
 	@Override
-	public String getInfo() {
-		return INFO;
+	public void init(World w) {
+		this.w = w;
 	}
 
 	@Override
-	public Param[] getParams() {
-		return PARAMS;
+	public boolean run(VerbRunner cb) {
+		w.getCurrentScene().addTimer(time, cb);
+		return true;
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/anim/AnimationDesc.java b/blade-engine/src/com/bladecoder/engine/anim/AnimationDesc.java
new file mode 100644
index 000000000..dcbcab3ee
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/anim/AnimationDesc.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.anim;
+
+import com.badlogic.gdx.math.Vector2;
+
+public class AnimationDesc {
+	public String id;
+	public String source;
+	public float duration;
+	public Vector2 inD;
+	public Vector2 outD;
+	public Tween.Type animationType;
+	public int count;
+
+	public String sound;
+
+	public boolean preload;
+	public boolean disposeWhenPlayed;
+
+	public AnimationDesc() {
+
+	}
+
+	public void set(String id, String source, float duration, int count, Tween.Type animationType,
+			String sound, Vector2 inD, Vector2 outD, boolean preload, boolean disposeWhenPlayed) {
+		this.id = id;
+		this.duration = duration;
+		this.animationType = animationType;
+		this.count = count;
+
+		this.source = source;
+		this.sound = sound;
+
+		this.inD = inD;
+		this.outD = outD;
+
+		this.preload = preload;
+		this.disposeWhenPlayed = disposeWhenPlayed;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/anim/AtlasFrameAnimation.java b/blade-engine/src/com/bladecoder/engine/anim/AtlasAnimationDesc.java
similarity index 89%
rename from blade-engine/src/com/bladecoder/engine/anim/AtlasFrameAnimation.java
rename to blade-engine/src/com/bladecoder/engine/anim/AtlasAnimationDesc.java
index 3cdf452db..cb079a8d9 100644
--- a/blade-engine/src/com/bladecoder/engine/anim/AtlasFrameAnimation.java
+++ b/blade-engine/src/com/bladecoder/engine/anim/AtlasAnimationDesc.java
@@ -15,11 +15,9 @@
  ******************************************************************************/
 package com.bladecoder.engine.anim;
 
-import com.bladecoder.engine.anim.FrameAnimation;
-
 import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
 import com.badlogic.gdx.utils.Array;
 
-public class AtlasFrameAnimation extends FrameAnimation {
+public class AtlasAnimationDesc extends AnimationDesc {
 	public transient Array<AtlasRegion> regions;
 }
diff --git a/blade-engine/src/com/bladecoder/engine/anim/CameraTween.java b/blade-engine/src/com/bladecoder/engine/anim/CameraTween.java
index b06899342..254391963 100644
--- a/blade-engine/src/com/bladecoder/engine/anim/CameraTween.java
+++ b/blade-engine/src/com/bladecoder/engine/anim/CameraTween.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,74 +15,76 @@
  ******************************************************************************/
 package com.bladecoder.engine.anim;
 
-import com.bladecoder.engine.anim.Tween;
-
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
 import com.bladecoder.engine.model.SceneCamera;
+import com.bladecoder.engine.util.InterpolationMode;
 
 /**
  * Tween for camera position and zoom animation
  */
-public class CameraTween extends Tween {
-	
-	private float startX, startY, startZoom;
-	private float targetX, targetY, targetZoom;
-	
-	public CameraTween() {
-	}
+public class CameraTween extends Tween<SceneCamera> {
+
+    private float startX, startY, startZoom;
+    private float targetX, targetY, targetZoom;
+
+    public CameraTween() {
+    }
+
+    public void start(SceneCamera camera, Tween.Type repeatType, int count, float targetX, float targetY,
+                      float targetZoom, float duration, InterpolationMode interpolation, ActionCallback cb) {
+
+        this.target = camera;
+
+        Vector2 currentPos = camera.getPosition();
+
+        startX = currentPos.x;
+        startY = currentPos.y;
+        startZoom = camera.getZoom();
+        this.targetX = targetX;
+        this.targetY = targetY;
+        this.targetZoom = targetZoom;
+
+        setDuration(duration);
+        setType(repeatType);
+        setCount(count);
+        setInterpolation(interpolation);
+
+        if (cb != null) {
+            setCb(cb);
+        }
+    }
+
+    @Override
+    public void updateTarget() {
+        target.setZoom(startZoom + getPercent() * (targetZoom - startZoom));
+        target.setPosition(startX + getPercent() * (targetX - startX),
+                startY + getPercent() * (targetY - startY));
+    }
 
-	public void start( SceneCamera camera, int repeatType, int count, float targetX, float targetY, float targetZoom, float duration, ActionCallback cb) {
-		
-		Vector2 currentPos = camera.getPosition();
-		
-		startX = currentPos.x;
-		startY = currentPos.y;
-		startZoom = camera.getZoom();
-		this.targetX = targetX;
-		this.targetY = targetY;
-		this.targetZoom = targetZoom;
-		
-		setDuration(duration);
-		setType(repeatType);
-		setCount(count);
+    @Override
+    public void write(Json json) {
+        super.write(json);
 
-		if (cb != null) {
-			setCb(cb);
-		}
-	}
-	
-	public void update(float delta, SceneCamera camera) {
-		update(delta);
-		
-		camera.setZoom(startZoom + getPercent() * (targetZoom- startZoom));
-		camera.setPosition(startX + getPercent() * (targetX - startX),
-				startY + getPercent() * (targetY - startY));
-	}
-	
-	@Override
-	public void write(Json json) {
-		super.write(json);
+        json.writeValue("startX", startX);
+        json.writeValue("startY", startY);
+        json.writeValue("startZoom", startZoom);
+        json.writeValue("targetX", targetX);
+        json.writeValue("targetY", targetY);
+        json.writeValue("targetZoom", targetZoom);
+    }
 
-		json.writeValue("startX", startX);
-		json.writeValue("startY", startY);
-		json.writeValue("startZoom", startZoom);
-		json.writeValue("targetX", targetX);
-		json.writeValue("targetY", targetY);
-		json.writeValue("targetZoom", targetZoom);
-	}
+    @Override
+    public void read(Json json, JsonValue jsonData) {
+        super.read(json, jsonData);
 
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		super.read(json, jsonData);	
-		
-		startX = json.readValue("startX", Float.class, jsonData);
-		startY = json.readValue("startY", Float.class, jsonData);
-		startZoom = json.readValue("startZoom", Float.class, jsonData);
-		targetX = json.readValue("targetX", Float.class, jsonData);
-		targetY = json.readValue("targetY", Float.class, jsonData);
-		targetZoom = json.readValue("targetZoom", Float.class, jsonData);
-	}
+        startX = json.readValue("startX", Float.class, jsonData);
+        startY = json.readValue("startY", Float.class, jsonData);
+        startZoom = json.readValue("startZoom", Float.class, jsonData);
+        targetX = json.readValue("targetX", Float.class, jsonData);
+        targetY = json.readValue("targetY", Float.class, jsonData);
+        targetZoom = json.readValue("targetZoom", Float.class, jsonData);
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/anim/FATween.java b/blade-engine/src/com/bladecoder/engine/anim/FATween.java
index a54a6b851..2277e3759 100644
--- a/blade-engine/src/com/bladecoder/engine/anim/FATween.java
+++ b/blade-engine/src/com/bladecoder/engine/anim/FATween.java
@@ -15,22 +15,20 @@
  ******************************************************************************/
 package com.bladecoder.engine.anim;
 
-import com.bladecoder.engine.anim.Tween;
-
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
 import com.bladecoder.engine.model.AtlasRenderer;
 
 /**
  * Tween for spriteactor position animation
  */
-public class FATween extends Tween {
+public class FATween extends Tween<AtlasRenderer> {
 	
 	public FATween() {
 	}
 
-	public void start(AtlasRenderer target, int repeatType, int count, float duration, ActionCallback cb) {		
+	public void start(AtlasRenderer target, Tween.Type repeatType, int count, float duration, ActionCallback cb) {
+		this.target = target;
+		
 		setDuration(duration);
 		setType(repeatType);
 		setCount(count);
@@ -42,21 +40,8 @@ public void start(AtlasRenderer target, int repeatType, int count, float duratio
 		restart();
 	}
 	
-	public void update(AtlasRenderer a, float delta) {
-		update(delta);
-		
-		if(!isComplete())
-			a.setFrame((int)(getPercent() * a.getNumFrames()));
-	}
-	
-	@Override
-	public void write(Json json) {
-		super.write(json);
-	}
-
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		super.read(json, jsonData);	
-
+	public void updateTarget() {
+		if(!isComplete() && getPercent() < 1.0f)
+			target.setFrame((int)(getPercent() * target.getNumFrames()));
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/anim/FrameAnimation.java b/blade-engine/src/com/bladecoder/engine/anim/FrameAnimation.java
deleted file mode 100644
index f99363e08..000000000
--- a/blade-engine/src/com/bladecoder/engine/anim/FrameAnimation.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.anim;
-
-import com.badlogic.gdx.math.Vector2;
-
-public class FrameAnimation {
-	public final static String BACK = "back";
-	public final static String FRONT = "front";
-	public final static String RIGHT = "right";
-	public final static String LEFT = "left";
-	public final static String BACKRIGHT = "backright";
-	public final static String BACKLEFT = "backleft";
-	public final static String FRONTRIGHT = "frontright";
-	public final static String FRONTLEFT = "frontleft";
-	public final static String STAND_ANIM = "stand";
-	public final static String WALK_ANIM = "walk";
-	public final static String TALK_ANIM = "talk";	
-		
-	
-	public	String id;
-	public  String source;
-	public	float duration;
-	public	float delay;
-	public  Vector2 inD;
-	public  Vector2 outD;
-	public	int animationType;
-	public	int count;
-	
-	public String sound;
-	
-	public boolean preload;
-	public boolean disposeWhenPlayed;
-	
-	public FrameAnimation() {
-		
-	}
-	
-	public void set(String id, String source, float duration, 
-			float delay, int count, int animationType, String sound, 
-			Vector2 inD, Vector2 outD, boolean preload, boolean disposeWhenPlayed) {
-		this.id = id;
-		this.duration = duration;
-		this.delay = delay;
-		this.animationType = animationType;
-		this.count = count;
-		
-		this.source = source;
-		this.sound = sound;
-		
-		this.inD = inD;
-		this.outD = outD;
-		
-		this.preload = preload;
-		this.disposeWhenPlayed = disposeWhenPlayed;
-	}
-	
-	public static String getFlipId(String id) {
-		StringBuilder sb = new StringBuilder();
-
-		if (id.endsWith(LEFT)) {
-			sb.append(id.substring(0, id.length() - 4));
-			sb.append(RIGHT);
-		} else if (id.endsWith(RIGHT)) {
-			sb.append(id.substring(0, id.length() - 5));
-			sb.append(LEFT);
-		}
-
-		return sb.toString();
-	}
-	
-	private final static float DIRECTION_ASPECT_TOLERANCE = 2.5f;
-
-	public static String getFrameDirection(float x, float y, Vector2 pf) {
-		float dx = pf.x - x;
-		float dy = pf.y - y;
-		float ratio = Math.abs(dx / dy);
-
-		if (ratio < 1.0)
-			ratio = 1.0f / ratio;
-
-		// EngineLogger.debug("P0: " + p0 + " PF: " + pf + " dx: " + dx +
-		// " dy: "
-		// + dy + " RATIO: " + ratio);
-
-		if (ratio < DIRECTION_ASPECT_TOLERANCE) { // DIAGONAL MOVEMENT
-			if (dy > 0) { // UP. MOVEMENT
-				if (dx > 0) { // TO THE RIGHT
-					return BACKRIGHT;
-				} else { // TO THE LEFT
-					return BACKLEFT;
-				}
-
-			} else { // DOWN. MOVEMENT
-				if (dx > 0) { // TO THE RIGHT
-					return FRONTRIGHT;
-				} else { // TO THE LEFT
-					return FRONTLEFT;
-				}
-			}
-		} else { // HOR OR VERT MOVEMENT
-			if (Math.abs(dx) > Math.abs(dy)) { // HOR. MOVEMENT
-				if (dx > 0) { // TO THE RIGHT
-					return RIGHT;
-				} else { // TO THE LEFT
-					return LEFT;
-				}
-
-			} else { // VERT. MOVEMENT
-				if (dy > 0) { // TO THE TOP
-					return BACK;
-				} else { // TO THE BOTTOM
-					return FRONT;
-				}
-			}
-		}
-	}	
-}
diff --git a/blade-engine/src/com/bladecoder/engine/anim/MusicVolumeTween.java b/blade-engine/src/com/bladecoder/engine/anim/MusicVolumeTween.java
new file mode 100644
index 000000000..256a8679a
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/anim/MusicVolumeTween.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.anim;
+
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.model.MusicManager;
+import com.bladecoder.engine.util.InterpolationMode;
+
+/**
+ * Tween for Music fade in/out
+ */
+public class MusicVolumeTween extends Tween<MusicManager> {
+	
+	private float startVolume;
+	private float targetVolume;
+	
+	public MusicVolumeTween() {
+	}
+
+	public void start(MusicManager mm, float tVolume, float duration, InterpolationMode interpolation, ActionCallback cb) {	
+		this.target = mm;
+		
+		startVolume = mm.getVolume();
+		targetVolume = tVolume;
+		
+		setDuration(duration);
+		setType(Type.NO_REPEAT);
+		setCount(1);
+		setInterpolation(interpolation);
+
+		if (cb != null) {
+			setCb(cb);
+		}
+		
+		restart();
+	}
+
+	@Override
+	public void updateTarget() {
+		target.setVolume(startVolume + getPercent() * (targetVolume - startVolume));
+	}
+	
+	@Override
+	public void write(Json json) {
+		super.write(json);
+
+		json.writeValue("startVolume", startVolume);
+		json.writeValue("targetVolume", targetVolume);
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		super.read(json, jsonData);	
+		
+		startVolume = json.readValue("startVolume", Float.class, 1f, jsonData);
+		targetVolume = json.readValue("targetVolume", Float.class, 1f, jsonData);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/anim/SpineAnimationDesc.java b/blade-engine/src/com/bladecoder/engine/anim/SpineAnimationDesc.java
new file mode 100644
index 000000000..5d75b8ada
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/anim/SpineAnimationDesc.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.anim;
+
+
+public class SpineAnimationDesc extends AnimationDesc {
+	public String atlas;
+}
diff --git a/blade-engine/src/com/bladecoder/engine/anim/SpriteAlphaTween.java b/blade-engine/src/com/bladecoder/engine/anim/SpriteAlphaTween.java
new file mode 100644
index 000000000..6d3145d5e
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/anim/SpriteAlphaTween.java
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.anim;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.util.InterpolationMode;
+
+/**
+ * Tween for SpriteActor alpha animation
+ */
+public class SpriteAlphaTween extends Tween<SpriteActor> {
+
+	private float startAlpha;
+	private float targetAlpha;
+
+	public SpriteAlphaTween() {
+	}
+
+	public void start(SpriteActor target, Type repeatType, int count, float tAlpha, float duration,
+			InterpolationMode interpolation, ActionCallback cb) {
+
+		setTarget(target);
+
+		if (target.getTint() == null) {
+			target.setTint(Color.WHITE.cpy());
+		} else {
+			// to set the flag dirty
+			target.setTint(target.getTint());
+		}
+
+		startAlpha = target.getTint().a;
+		targetAlpha = tAlpha;
+
+		setDuration(duration);
+		setType(repeatType);
+		setCount(count);
+		setInterpolation(interpolation);
+
+		if (cb != null) {
+			setCb(cb);
+		}
+
+		restart();
+	}
+
+	@Override
+	public void updateTarget() {
+		target.getTint().a = startAlpha + getPercent() * (targetAlpha - startAlpha);
+	}
+
+	@Override
+	public void write(Json json) {
+		super.write(json);
+
+		json.writeValue("startAlpha", startAlpha);
+		json.writeValue("targetAlpha", targetAlpha);
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		super.read(json, jsonData);
+
+		startAlpha = json.readValue("startAlpha", float.class, 1.0f, jsonData);
+		targetAlpha = json.readValue("targetAlpha", float.class, 1.0f, jsonData);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/anim/SpritePosTween.java b/blade-engine/src/com/bladecoder/engine/anim/SpritePosTween.java
index 5cb0d0206..984f0cc1e 100644
--- a/blade-engine/src/com/bladecoder/engine/anim/SpritePosTween.java
+++ b/blade-engine/src/com/bladecoder/engine/anim/SpritePosTween.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,67 +15,87 @@
  ******************************************************************************/
 package com.bladecoder.engine.anim;
 
-import com.bladecoder.engine.anim.Tween;
-
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
 import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.util.InterpolationMode;
 
 /**
  * Tween for spriteactor position animation
+ * <p>
+ * TODO: Y speed depends on scale if fake depth is used
  */
-public class SpritePosTween extends Tween {
-	
-	private float startX, startY;
-	private float targetX, targetY;
-	
-	public SpritePosTween() {
-	}
-
-	public void start(SpriteActor target, int repeatType, int count, float tx, float ty, float duration, ActionCallback cb) {
-		
-		startX = target.getX();
-		startY = target.getY();
-		targetX = tx;
-		targetY = ty;
-		
-		setDuration(duration);
-		setType(repeatType);
-		setCount(count);
-
-		if (cb != null) {
-			setCb(cb);
-		}
-		
-		restart();
-	}
-	
-	public void update(SpriteActor a, float delta) {
-		update(delta);
-		
-		a.setPosition(startX + getPercent() * (targetX - startX),
-				startY + getPercent() * (targetY - startY));
-	}
-	
-	@Override
-	public void write(Json json) {
-		super.write(json);
-
-		json.writeValue("startX", startX);
-		json.writeValue("startY", startY);
-		json.writeValue("targetX", targetX);
-		json.writeValue("targetY", targetY);
-	}
-
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		super.read(json, jsonData);	
-		
-		startX = json.readValue("startX", Float.class, jsonData);
-		startY = json.readValue("startY", Float.class, jsonData);
-		targetX = json.readValue("targetX", Float.class, jsonData);
-		targetY = json.readValue("targetY", Float.class, jsonData);
-
-	}
+public class SpritePosTween extends Tween<SpriteActor> {
+
+    private float startX, startY;
+    private float targetX, targetY;
+    private InterpolationMode interpolationX;
+    private InterpolationMode interpolationY;
+
+    public SpritePosTween() {
+    }
+
+    public void start(SpriteActor target, Tween.Type repeatType, int count, float tx, float ty, float duration,
+                      InterpolationMode interpolation, ActionCallback cb) {
+        start(target, repeatType, count, tx, ty, duration, interpolation, interpolation, cb);
+    }
+
+    public void start(SpriteActor target, Tween.Type repeatType, int count, float tx, float ty, float duration,
+                      InterpolationMode interpolationX, InterpolationMode interpolationY, ActionCallback cb) {
+
+        this.target = target;
+        startX = target.getX();
+        startY = target.getY();
+        targetX = tx;
+        targetY = ty;
+
+        setDuration(duration);
+        setType(repeatType);
+        setCount(count);
+
+        this.interpolationX = interpolationX;
+        this.interpolationY = interpolationY;
+
+        if (cb != null) {
+            setCb(cb);
+        }
+
+        restart();
+    }
+
+    @Override
+    public void updateTarget() {
+
+        float percentX = getPercent(interpolationX);
+        float percentY = getPercent(interpolationY);
+
+        target.setPosition(startX + percentX * (targetX - startX),
+                startY + percentY * (targetY - startY));
+    }
+
+    @Override
+    public void write(Json json) {
+        super.write(json);
+
+        json.writeValue("startX", startX);
+        json.writeValue("startY", startY);
+        json.writeValue("targetX", targetX);
+        json.writeValue("targetY", targetY);
+        json.writeValue("interpolationX", interpolationX);
+        json.writeValue("interpolationY", interpolationY);
+    }
+
+    @Override
+    public void read(Json json, JsonValue jsonData) {
+        super.read(json, jsonData);
+
+        startX = json.readValue("startX", Float.class, jsonData);
+        startY = json.readValue("startY", Float.class, jsonData);
+        targetX = json.readValue("targetX", Float.class, jsonData);
+        targetY = json.readValue("targetY", Float.class, jsonData);
+        interpolationX = json.readValue("interpolationX", InterpolationMode.class, jsonData);
+        interpolationY = json.readValue("interpolationY", InterpolationMode.class, jsonData);
+
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/anim/SpriteRotateTween.java b/blade-engine/src/com/bladecoder/engine/anim/SpriteRotateTween.java
new file mode 100644
index 000000000..916771d8e
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/anim/SpriteRotateTween.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.anim;
+
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.util.InterpolationMode;
+
+/**
+ * Tween for spriteactor scale animation
+ */
+public class SpriteRotateTween extends Tween<SpriteActor> {
+	
+	private float startRot;
+	private float targetRot;
+	
+	public SpriteRotateTween() {
+	}
+
+	public void start(SpriteActor target, Type repeatType, int count, float tRot, float duration, InterpolationMode interpolation, ActionCallback cb) {
+		this.target = target;
+		
+		startRot = target.getRot();
+		targetRot = tRot;
+		
+		setDuration(duration);
+		setType(repeatType);
+		setCount(count);
+		setInterpolation(interpolation);
+
+		if (cb != null) {
+			setCb(cb);
+		}
+		
+		restart();
+	}
+
+	@Override
+	public void updateTarget() {
+		target.setRot(startRot + getPercent() * (targetRot - startRot));
+	}
+	
+	@Override
+	public void write(Json json) {
+		super.write(json);
+
+		json.writeValue("startRot", startRot);
+		json.writeValue("targetRot", targetRot);
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		super.read(json, jsonData);	
+		
+		startRot = json.readValue("startRot", Float.class, jsonData);
+		targetRot = json.readValue("targetRot", Float.class, jsonData);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/anim/SpriteScaleTween.java b/blade-engine/src/com/bladecoder/engine/anim/SpriteScaleTween.java
new file mode 100644
index 000000000..2835b08e4
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/anim/SpriteScaleTween.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.anim;
+
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.util.InterpolationMode;
+
+/**
+ * Tween for spriteactor scale animation
+ */
+public class SpriteScaleTween extends Tween<SpriteActor> {
+
+	private float startSclX, startSclY;
+	private float targetSclX, targetSclY;
+
+	public SpriteScaleTween() {
+	}
+
+	public void start(SpriteActor target, Type repeatType, int count, float tSclX, float tSclY, float duration,
+			InterpolationMode interpolation, ActionCallback cb) {
+		this.target = target;
+
+		startSclX = target.getScaleX();
+		startSclY = target.getScaleY();
+		targetSclX = tSclX;
+		targetSclY = tSclY;
+
+		setDuration(duration);
+		setType(repeatType);
+		setCount(count);
+		setInterpolation(interpolation);
+
+		if (cb != null) {
+			setCb(cb);
+		}
+
+		restart();
+	}
+
+	@Override
+	public void updateTarget() {
+		float percent = getPercent();
+		
+		target.setScale(startSclX + percent * (targetSclX - startSclX),
+				startSclY + percent * (targetSclY - startSclY));
+	}
+
+	@Override
+	public void write(Json json) {
+		super.write(json);
+
+		json.writeValue("startSclX", startSclX);
+		json.writeValue("startSclY", startSclY);
+		
+		json.writeValue("targetSclX", targetSclX);
+		json.writeValue("targetSclY", targetSclY);
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		super.read(json, jsonData);
+
+		startSclX = json.readValue("startSclX", Float.class, jsonData);
+		startSclY = json.readValue("startSclY", Float.class, jsonData);
+		
+		targetSclX = json.readValue("targetSclX", Float.class, jsonData);
+		targetSclY = json.readValue("targetSclY", Float.class, jsonData);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/anim/SpriteTintTween.java b/blade-engine/src/com/bladecoder/engine/anim/SpriteTintTween.java
new file mode 100644
index 000000000..13253e422
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/anim/SpriteTintTween.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.anim;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.util.InterpolationMode;
+
+/**
+ * Tween for SpriteActor tint animation
+ */
+public class SpriteTintTween extends Tween<SpriteActor> {
+
+	private Color startColor;
+	private Color targetColor;
+
+	public SpriteTintTween() {
+	}
+
+	public void start(SpriteActor target, Type repeatType, int count, Color tColor, float duration,
+			InterpolationMode interpolation, ActionCallback cb) {
+
+		setTarget(target);
+
+		if (target.getTint() == null) {
+			target.setTint(Color.WHITE.cpy());
+		} else {
+			// to set the flag dirty
+			target.setTint(target.getTint());
+		}
+
+		startColor = target.getTint().cpy();
+		targetColor = tColor.cpy();
+
+		setDuration(duration);
+		setType(repeatType);
+		setCount(count);
+		setInterpolation(interpolation);
+
+		if (cb != null) {
+			setCb(cb);
+		}
+
+		restart();
+	}
+
+	@Override
+	public void updateTarget() {
+
+		target.getTint().a = startColor.a + getPercent() * (targetColor.a - startColor.a);
+		target.getTint().r = startColor.r + getPercent() * (targetColor.r - startColor.r);
+		target.getTint().g = startColor.g + getPercent() * (targetColor.g - startColor.g);
+		target.getTint().b = startColor.b + getPercent() * (targetColor.b - startColor.b);
+	}
+
+	@Override
+	public void write(Json json) {
+		super.write(json);
+
+		json.writeValue("startColor", startColor);
+		json.writeValue("targetColor", targetColor);
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		super.read(json, jsonData);
+
+		startColor = json.readValue("startColor", Color.class, Color.WHITE, jsonData);
+		targetColor = json.readValue("targetColor", Color.class, Color.WHITE, jsonData);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/anim/Timers.java b/blade-engine/src/com/bladecoder/engine/anim/Timers.java
index 5ac4e2bd7..6549feb70 100644
--- a/blade-engine/src/com/bladecoder/engine/anim/Timers.java
+++ b/blade-engine/src/com/bladecoder/engine/anim/Timers.java
@@ -16,64 +16,105 @@
 package com.bladecoder.engine.anim;
 
 import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.util.ActionCallbackSerialization;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.serialization.ActionCallbackSerializer;
+import com.bladecoder.engine.serialization.BladeJson;
 
 public class Timers {
-	
-	ArrayList<Timer> timers = new ArrayList<Timer>();
+	private final List<Timer> timers = new ArrayList<>(3);
+	private final transient List<Timer> timersTmp = new ArrayList<>(3);
 
 	public void addTimer(float time, ActionCallback cb) {
 		Timer t = new Timer();
-		
+
 		t.time = time;
 		t.cb = cb;
-		
-		timers.add(t);		
+
+		timers.add(t);
 	}
-	
+
 	public void clear() {
 		timers.clear();
 	}
-	
+
+	public boolean isEmpty() {
+		return timers.isEmpty();
+	}
+
+	public void removeTimerWithCb(ActionCallback cb) {
+		final Iterator<Timer> it = timers.iterator();
+
+		while (it.hasNext()) {
+			final Timer t = it.next();
+			if (t.cb == cb) {
+				it.remove();
+
+				return;
+			}
+		}
+	}
+
 	public void update(float delta) {
-		
-		for(int i = timers.size() - 1; i >= 0 ; i--) {
-			Timer t = timers.get(i);
-			
+		final Iterator<Timer> it = timers.iterator();
+		while (it.hasNext()) {
+			final Timer t = it.next();
+
 			t.currentTime += delta;
-			
-			if(t.currentTime >= t.time) {
-				timers.remove(i);
-				ActionCallbackQueue.add(t.cb);			
-				i--;
+
+			if (t.currentTime >= t.time) {
+				it.remove();
+
+				// we add the timers to call the 'cb' later because the 'cb' can add new timers
+				// while iterating.
+				timersTmp.add(t);
+			}
+		}
+
+		if (timersTmp.size() > 0) {
+			// process ended timers
+			for (Timer t : timersTmp) {
+				// t.cb can be null if the cb is not found when loading. This can happen because InkManager ended the verb.
+				if(t.cb != null)
+					t.cb.resume();
 			}
+
+			timersTmp.clear();
 		}
 	}
-	
-	static class Timer implements Serializable {
-		float time;
-		float currentTime = 0;
-		ActionCallback cb;
-		
+
+	private static class Timer implements Serializable {
+		private float time;
+		private float currentTime = 0;
+		private ActionCallback cb;
+
 		@Override
-		public void write(Json json) {	
+		public void write(Json json) {
 			json.writeValue("time", time);
-			json.writeValue("currentTime", currentTime);	
-			json.writeValue("cb", ActionCallbackSerialization.find(cb), cb == null ? null : String.class);	
+			json.writeValue("currentTime", currentTime);
+
+			if (cb != null) {
+				World w = ((BladeJson) json).getWorld();
+				Scene s = ((BladeJson) json).getScene();
+				json.writeValue("cb", ActionCallbackSerializer.serialize(w, s, cb));
+			}
 		}
 
 		@Override
-		public void read (Json json, JsonValue jsonData) {
+		public void read(Json json, JsonValue jsonData) {
 			time = json.readValue("time", Float.class, jsonData);
 			currentTime = json.readValue("currentTime", Float.class, jsonData);
-			String cbSer = json.readValue("cb", String.class, jsonData);
-			cb = ActionCallbackSerialization.find(cbSer);
-		}		
+
+			BladeJson bjson = (BladeJson) json;
+			cb = ActionCallbackSerializer.find(bjson.getWorld(), bjson.getScene(),
+					json.readValue("cb", String.class, jsonData));
+		}
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/anim/Tween.java b/blade-engine/src/com/bladecoder/engine/anim/Tween.java
index 92661714a..927dc5d25 100644
--- a/blade-engine/src/com/bladecoder/engine/anim/Tween.java
+++ b/blade-engine/src/com/bladecoder/engine/anim/Tween.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,197 +15,222 @@
  ******************************************************************************/
 package com.bladecoder.engine.anim;
 
-import com.badlogic.gdx.math.Interpolation;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.util.ActionCallbackSerialization;
-
-public class Tween implements Serializable {
-	public final static int NO_REPEAT = 0;
-	public final static int REPEAT = 1;
-	public final static int PINGPONG = 2;
-	public final static int REVERSE = 3;
-	public final static int REVERSE_REPEAT = 4;
-	public final static int FROM_FA = 5;
-
-	public final static int INFINITY = -1;
-
-	private float duration, time;
-	private Interpolation interpolation;
-	private boolean reverse, began, complete;
-	private int type;
-	private int count;
-
-	private ActionCallback cb;
-	private String cbSer = null;
-
-	public Tween() {
-	}
-
-	public void update(float delta) {
-		if (complete)
-			return;
-
-		if (!began) {
-			began = true;
-		}
-
-		time += delta;
-
-		if (time >= duration) {
-			if (type == NO_REPEAT || type == REVERSE || count == 1) {
-				complete = true;
-			} else if (count != 1) {
-				complete = false;
-				count--;
-				time = 0;
-
-				if (type == PINGPONG)
-					reverse = !reverse;
-			}
-		}
-
-		if (complete) {
-			callCb();
-		}
-	}
-	
-	private void callCb() {
-		if(cb != null || cbSer != null) {
-			if(cbSer != null) {
-				cb = ActionCallbackSerialization.find(cbSer);
-				cbSer = null;
-			}
-			
-			ActionCallbackQueue.add(cb);
-		}
-	}
-
-	public float getPercent() {
-		float percent;
-		if (complete) {
-			percent = 1;
-		} else {
-			percent = time / duration;
-			if (interpolation != null)
-				percent = interpolation.apply(percent);
-		}
-
-		return (reverse ? 1 - percent : percent);
-	}
-
-	/** Skips to the end of the transition. */
-	public void finish() {
-		time = duration;
-	}
-
-	public void restart() {
-		time = 0;
-		began = false;
-		complete = false;
-	}
-
-	public void reset() {
-		reverse = false;
-		interpolation = null;
-	}
-
-	/** Gets the transition time so far. */
-	public float getTime() {
-		return time;
-	}
-
-	/** Sets the transition time so far. */
-	public void setTime(float time) {
-		this.time = time;
-	}
-
-	public float getDuration() {
-		return duration;
-	}
-
-	/** Sets the length of the transition in seconds. */
-	public void setDuration(float duration) {
-		this.duration = duration;
-	}
-
-	public Interpolation getInterpolation() {
-		return interpolation;
-	}
-
-	public void setInterpolation(Interpolation interpolation) {
-		this.interpolation = interpolation;
-	}
-
-	public boolean isReverse() {
-		return reverse;
-	}
-
-	/** When true, the action's progress will go from 100% to 0%. */
-	public void setReverse(boolean reverse) {
-		this.reverse = reverse;
-	}
-
-	public void setCb(ActionCallback cb) {
-		this.cb = cb;
-	}
-
-	public boolean isComplete() {
-		return complete;
-	}
-
-	public int getType() {
-		return type;
-	}
-
-	public void setType(int type) {
-		this.type = type;
-
-		if (type == REVERSE || type == REVERSE_REPEAT)
-			reverse = true;
-	}
-
-	public int getCount() {
-		return count;
-	}
-
-	public void setCount(int count) {
-		this.count = count;
-	}
-
-	@Override
-	public void write(Json json) {
-		json.writeValue("duration", duration);
-		json.writeValue("time", time);
-		json.writeValue("interpolation", interpolation);
-		json.writeValue("reverse", reverse);
-		json.writeValue("began", began);
-		json.writeValue("complete", complete);
-		json.writeValue("type", type);
-		json.writeValue("count", count);
-		
-		if(cbSer != null)
-			json.writeValue("cb", cbSer);
-		else
-			json.writeValue("cb", ActionCallbackSerialization.find(cb),
-				cb == null ? null : String.class);
-	}
-
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		duration = json.readValue("duration", Float.class, jsonData);
-		time = json.readValue("time", Float.class, jsonData);
-		interpolation = json.readValue("interpolation", Interpolation.class,
-				jsonData);
-		reverse = json.readValue("reverse", Boolean.class, jsonData);
-		began = json.readValue("began", Boolean.class, jsonData);
-		complete = json.readValue("complete", Boolean.class, jsonData);
-		type = json.readValue("type", Integer.class, jsonData);
-		count = json.readValue("count", Integer.class, jsonData);
-
-		cbSer = json.readValue("cb", String.class, jsonData);
-	}
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.serialization.ActionCallbackSerializer;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.util.InterpolationMode;
+
+abstract public class Tween<T> implements Serializable {
+    public enum Type {
+        NO_REPEAT, REPEAT, YOYO, REVERSE, REVERSE_REPEAT, SPRITE_DEFINED;
+    }
+
+    public final static int INFINITY = -1;
+
+    private float duration, time;
+    private InterpolationMode interpolation;
+    private boolean reverse, began, complete;
+    private Type type;
+    private int count;
+
+    private ActionCallback cb;
+
+    protected T target;
+
+    public Tween() {
+    }
+
+    public void update(float delta) {
+        if (complete)
+            return;
+
+        if (!began) {
+            began = true;
+        }
+
+        time += delta;
+
+        if (time >= duration) {
+            if (type == Type.NO_REPEAT || type == Type.REVERSE || count == 1) {
+                complete = true;
+            } else {
+                count--;
+                time = 0.00001f;
+
+                if (type == Type.YOYO)
+                    reverse = !reverse;
+            }
+        }
+
+        updateTarget();
+
+        if (complete) {
+            callCb();
+        }
+    }
+
+    /**
+     * Called to update the target property.
+     */
+    abstract protected void updateTarget();
+
+    private void callCb() {
+        if (cb != null) {
+            ActionCallback tmpcb = cb;
+            cb = null;
+            tmpcb.resume();
+        }
+    }
+
+    public void setTarget(T t) {
+        target = t;
+    }
+
+    public T getTarget() {
+        return target;
+    }
+
+    public float getPercent() {
+        return getPercent(interpolation);
+    }
+
+    public float getPercent(InterpolationMode i) {
+        float percent;
+        if (complete) {
+            percent = 1;
+        } else {
+            percent = time / duration;
+            if (i != null)
+                percent = i.getInterpolation().apply(percent);
+        }
+
+        return (reverse ? 1 - percent : percent);
+    }
+
+    /**
+     * Skips to the end of the transition.
+     */
+    public void finish() {
+        time = duration;
+    }
+
+    public void restart() {
+        time = 0;
+        began = false;
+        complete = false;
+    }
+
+    public void reset() {
+        reverse = false;
+        interpolation = null;
+    }
+
+    /**
+     * Gets the transition time so far.
+     */
+    public float getTime() {
+        return time;
+    }
+
+    /**
+     * Sets the transition time so far.
+     */
+    public void setTime(float time) {
+        this.time = time;
+    }
+
+    public float getDuration() {
+        return duration;
+    }
+
+    /**
+     * Sets the length of the transition in seconds.
+     */
+    public void setDuration(float duration) {
+        this.duration = duration;
+    }
+
+    public void setInterpolation(InterpolationMode i) {
+        interpolation = i;
+    }
+
+    public boolean isReverse() {
+        return reverse;
+    }
+
+    /**
+     * When true, the action's progress will go from 100% to 0%.
+     */
+    public void setReverse(boolean reverse) {
+        this.reverse = reverse;
+    }
+
+    public void setCb(ActionCallback cb) {
+        this.cb = cb;
+    }
+
+    public boolean isComplete() {
+        return complete;
+    }
+
+    public Tween.Type getType() {
+        return type;
+    }
+
+    public void setType(Tween.Type type) {
+        this.type = type;
+
+        if (type == Tween.Type.REVERSE || type == Tween.Type.REVERSE_REPEAT)
+            reverse = true;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    @Override
+    public void write(Json json) {
+        json.writeValue("duration", duration);
+        json.writeValue("time", time);
+        json.writeValue("reverse", reverse);
+        json.writeValue("began", began);
+        json.writeValue("complete", complete);
+        json.writeValue("type", type);
+        json.writeValue("count", count);
+
+        json.writeValue("interpolation", interpolation);
+
+        if (cb != null) {
+            World w = ((BladeJson) json).getWorld();
+            Scene s = ((BladeJson) json).getScene();
+            json.writeValue("cb", ActionCallbackSerializer.serialize(w, s, cb));
+        }
+    }
+
+    @Override
+    public void read(Json json, JsonValue jsonData) {
+        duration = json.readValue("duration", Float.class, jsonData);
+        time = json.readValue("time", Float.class, jsonData);
+
+        reverse = json.readValue("reverse", Boolean.class, jsonData);
+        began = json.readValue("began", Boolean.class, jsonData);
+        complete = json.readValue("complete", Boolean.class, jsonData);
+        type = json.readValue("type", Type.class, jsonData);
+        count = json.readValue("count", Integer.class, jsonData);
+
+        interpolation = json.readValue("interpolation", InterpolationMode.class, jsonData);
+
+        BladeJson bjson = (BladeJson) json;
+        cb = ActionCallbackSerializer.find(bjson.getWorld(), bjson.getScene(),
+                json.readValue("cb", String.class, jsonData));
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/anim/WalkTween.java b/blade-engine/src/com/bladecoder/engine/anim/WalkTween.java
index f217db6e6..3d8865879 100644
--- a/blade-engine/src/com/bladecoder/engine/anim/WalkTween.java
+++ b/blade-engine/src/com/bladecoder/engine/anim/WalkTween.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,113 +15,160 @@
  ******************************************************************************/
 package com.bladecoder.engine.anim;
 
-import java.util.ArrayList;
-
-import com.bladecoder.engine.anim.SpritePosTween;
-
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
 import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.util.ActionCallbackSerialization;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.serialization.ActionCallbackSerializer;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engine.util.InterpolationMode;
+
+import java.util.ArrayList;
 
 /**
  * Tween for frame animation
  */
 public class WalkTween extends SpritePosTween implements Serializable {
 
-	private ArrayList<Vector2> walkingPath;
-	private int currentStep = 0;
-	private float speed = 0;
-	
-	private ActionCallback walkCb;
-	private String walkCbSer;
-
-	public WalkTween() {
-	}
-
-	public void start(SpriteActor target, ArrayList<Vector2> walkingPath,
-			float speed, ActionCallback cb) {
-		this.walkingPath = walkingPath;
-		this.speed = speed;
-		this.currentStep = 0;
-
-		if (cb != null) {
-			walkCb = cb;
-		}
-
-		restart();
-		walkToNextStep(target);
-	}
-	
-	private void walkToNextStep(SpriteActor target) {
-		Vector2 p0 = walkingPath.get(currentStep);
-		Vector2 pf = walkingPath.get(currentStep + 1);
-
-		target.startWalkFA(p0, pf);
-
-		float segmentDuration = p0.dst(pf)
-				/ (EngineAssetManager.getInstance().getScale() * speed);
-		
-		if(currentStep == walkingPath.size() - 2 && (walkCb != null || walkCbSer != null)) {
-			if(walkCbSer != null) {
-				walkCb = ActionCallbackSerialization.find(walkCbSer);
-				walkCbSer = null;
-			}
-			
-			start(target, NO_REPEAT, 1, pf.x, pf.y, segmentDuration, walkCb);
-		} else {
-			start(target, NO_REPEAT, 1, pf.x, pf.y, segmentDuration, null);
-		}
-	}
-
-	private void segmentEnded(SpriteActor target) {
-
-		currentStep++;
-
-		if (currentStep < walkingPath.size() - 1) {
-			walkToNextStep(target);
-		} else { // WALK ENDED
-			target.stand();
-		}
-	}
-
-	@Override
-	public void update(SpriteActor a, float delta) {
-		super.update(a, delta);
-		
-		if(isComplete())
-			segmentEnded(a);
-	}
-
-
-	@Override
-	public void write(Json json) {
-		super.write(json);
-
-		json.writeValue("path", walkingPath);
-		json.writeValue("currentStep", currentStep);
-		json.writeValue("speed", speed);
-		
-		if(walkCbSer != null)
-			json.writeValue("walkCb", walkCbSer);
-		else
-			json.writeValue("walkCb", ActionCallbackSerialization.find(walkCb),
-					walkCb == null ? null : String.class);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		super.read(json, jsonData);
-		
-		walkingPath = json.readValue("path", ArrayList.class, Vector2.class, jsonData);
-		currentStep = json.readValue("currentStep", Integer.class, jsonData);
-		speed = json.readValue("speed", Float.class, jsonData);
-		
-		walkCbSer = json.readValue("walkCb", String.class, jsonData);
-	}
+    private ArrayList<Vector2> walkingPath;
+    private int currentStep = 0;
+    private float speed = 0;
+
+    private ActionCallback walkCb;
+
+    public WalkTween() {
+    }
+
+    public void start(CharacterActor target, ArrayList<Vector2> walkingPath, float speed, ActionCallback cb) {
+        this.target = target;
+        this.walkingPath = walkingPath;
+        this.speed = speed;
+        this.currentStep = 0;
+
+        if (cb != null) {
+            walkCb = cb;
+        }
+
+        restart();
+        walkToNextStep(target);
+    }
+
+    private void walkToNextStep(CharacterActor target) {
+        Vector2 p0 = walkingPath.get(currentStep);
+        Vector2 pf = walkingPath.get(currentStep + 1);
+
+        float s0 = 1.0f;
+        float sf = 1.0f;
+
+        if (target.getFakeDepth()) {
+            s0 = target.getScene().getFakeDepthScale(p0.y);
+            sf = target.getScene().getFakeDepthScale(pf.y);
+        }
+
+        float sdiff = Math.abs(s0 - sf);
+        if (sdiff > .05f) {
+            // cut the path in two parts if the difference in scale is big
+            Vector2 pi = new Vector2((pf.x + p0.x) / 2, (pf.y + p0.y) / 2);
+
+            if (EngineLogger.debugMode()) {
+                String debugText = String.format(
+                        "WalkTween insert point: sdiff=%.2f, p0=(%.0f,%.0f), pf=(%.0f,%.0f), pi=(%.0f,%.0f)", sdiff,
+                        p0.x, p0.y, pf.x, pf.y, pi.x, pi.y);
+
+                EngineLogger.debug(debugText);
+            }
+
+            walkingPath.add(currentStep + 1, pi);
+
+            walkToNextStep(target);
+            return;
+        }
+
+        if (currentStep == 0 || ((AnimationRenderer) target.getRenderer()).changeDir(p0, pf)) {
+            target.startWalkAnim(p0, pf);
+        }
+
+        // t = dst/((vf+v0)/2)
+        float segmentDuration = p0.dst(pf) / (EngineAssetManager.getInstance().getScale() * speed * (s0 + sf) / 2);
+
+        start(target, Type.NO_REPEAT, 1, pf.x, pf.y, segmentDuration, InterpolationMode.LINEAR,
+                InterpolationMode.LINEAR, currentStep == walkingPath.size() - 2 ? walkCb : null);
+    }
+
+    private void segmentEnded(CharacterActor target) {
+
+        currentStep++;
+
+        if (currentStep < walkingPath.size() - 1) {
+            walkToNextStep(target);
+        } else { // WALK ENDED
+            target.stand();
+
+            // smooth animation to center camera when walking with UI/clicking (walkCb==null in that case)
+            if (walkCb == null && target == target.getScene().getCameraFollowActor()) {
+                target.getScene().getCamera()
+                        .startAnimation(target.getX(), target.getY(), target.getScene().getCamera().getZoom(), 1f,
+                                InterpolationMode.POW2OUT, null);
+            }
+        }
+    }
+
+    public void completeNow(CharacterActor target) {
+        currentStep = walkingPath.size();
+
+        Vector2 p = walkingPath.get(currentStep - 1);
+
+        target.setPosition(p.x, p.y);
+        target.stand();
+
+        if (walkCb != null) {
+            ActionCallback tmpcb = walkCb;
+            walkCb = null;
+            tmpcb.resume();
+        }
+    }
+
+    @Override
+    public void updateTarget() {
+        super.updateTarget();
+
+        if (isComplete())
+            segmentEnded((CharacterActor) target);
+    }
+
+    @Override
+    public void write(Json json) {
+        super.write(json);
+
+        json.writeValue("path", walkingPath);
+        json.writeValue("currentStep", currentStep);
+        json.writeValue("speed", speed);
+
+        if (walkCb != null) {
+            World w = ((BladeJson) json).getWorld();
+            Scene s = ((BladeJson) json).getScene();
+            json.writeValue("walkCb", ActionCallbackSerializer.serialize(w, s, walkCb));
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void read(Json json, JsonValue jsonData) {
+        super.read(json, jsonData);
+
+        walkingPath = json.readValue("path", ArrayList.class, Vector2.class, jsonData);
+        currentStep = json.readValue("currentStep", Integer.class, jsonData);
+        speed = json.readValue("speed", Float.class, jsonData);
+
+        World w = ((BladeJson) json).getWorld();
+        Scene s = ((BladeJson) json).getScene();
+        walkCb = ActionCallbackSerializer.find(w, s, json.readValue("walkCb", String.class, jsonData));
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/assets/BasePathResolver.java b/blade-engine/src/com/bladecoder/engine/assets/BasePathResolver.java
index 83b08e77e..835dd8a6f 100644
--- a/blade-engine/src/com/bladecoder/engine/assets/BasePathResolver.java
+++ b/blade-engine/src/com/bladecoder/engine/assets/BasePathResolver.java
@@ -15,6 +15,8 @@
  ******************************************************************************/
 package com.bladecoder.engine.assets;
 
+import java.io.File;
+
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.assets.loaders.FileHandleResolver;
 import com.badlogic.gdx.files.FileHandle;
@@ -27,7 +29,7 @@ public FileHandle resolve(String fileName) {
 		
 		String fullName;
 
-		if (fileName.startsWith("/")) {
+		if (new File(fileName).isAbsolute()) {
 			fullName = fileName;
 		} else {
 			StringBuilder sb = new StringBuilder();
diff --git a/blade-engine/src/com/bladecoder/engine/assets/EngineAssetManager.java b/blade-engine/src/com/bladecoder/engine/assets/EngineAssetManager.java
index 62aee3dee..d2cf76361 100644
--- a/blade-engine/src/com/bladecoder/engine/assets/EngineAssetManager.java
+++ b/blade-engine/src/com/bladecoder/engine/assets/EngineAssetManager.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,19 +15,6 @@
  ******************************************************************************/
 package com.bladecoder.engine.assets;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
 import com.badlogic.gdx.Application.ApplicationType;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.assets.AssetManager;
@@ -46,26 +33,45 @@
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGeneratorLoader;
 import com.badlogic.gdx.graphics.g2d.freetype.FreetypeFontLoader;
-import com.badlogic.gdx.graphics.g3d.Model;
 import com.badlogic.gdx.utils.Array;
 import com.bladecoder.engine.util.Config;
 import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engine.util.FileUtils;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.util.*;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
 
 public class EngineAssetManager extends AssetManager {
-	public static final String DESKTOP_PREFS_DIR = "BladeEngine";
-	public static final String NOT_DESKTOP_PREFS_DIR = "data/";
+
+	public static final String WORLD_FILENAME = "world";
+
+	public static final String DEFAULT_USER_FOLDER = "BladeEngine/";
 
 	public static final String ATLASES_DIR = "atlases/";
-	public static final String BACKGROUND_DIR = "backgrounds/";
 	public static final String MODEL_DIR = "model/";
 	public static final String MUSIC_DIR = "music/";
 	public static final String IMAGE_DIR = "images/";
 	public static final String SOUND_DIR = "sounds/";
-	private static final String MODEL3D_DIR = "3d/";
-	private static final String SPINE_DIR = "spine/";
+	public static final String SPINE_DIR = "spine/";
+	public static final String PARTICLE_DIR = "particles/";
+	public static final String FONT_DIR = "ui/fonts/";
+	public static final String VOICE_DIR = "voices/";
+
+	public static final String SPINE_EXT = ".skel";
+	public static final String ATLAS_EXT = ".atlas";
+	public static final String INK_EXT = ".ink.json";
+	public static final String FONT_EXT = ".ttf";
 
-	private static final String MODEL3D_EXT = ".g3db";
-	private static final String SPINE_EXT = ".skel";
+	public static final String CHAPTER_EXT = ".chapter.json";
+
+	private static final String OGG_EXT = ".ogg";
+	private static final String AAC_EXT = ".m4a";
 
 	private static EngineAssetManager instance = null;
 
@@ -73,9 +79,11 @@ public class EngineAssetManager extends AssetManager {
 
 	private EngineResolutionFileResolver resResolver;
 
+	private String userFolder = DEFAULT_USER_FOLDER;
+
 	protected EngineAssetManager() {
 		this(new InternalFileHandleResolver());
-//		getLogger().setLevel(Application.LOG_DEBUG);
+		// getLogger().setLevel(Application.LOG_DEBUG);
 	}
 
 	protected EngineAssetManager(FileHandleResolver resolver) {
@@ -117,22 +125,40 @@ public static EngineAssetManager getInstance() {
 		return instance;
 	}
 
+	public void setUserFolder(String f) {
+		userFolder = f;
+	}
+
 	/**
 	 * Creates a EngineAssetManager instance for edition. That is:
-	 * 
-	 * - Puts a PathResolver to locate the assets through an absolute path -
-	 * Puts assets scale to "1"
-	 * 
-	 * @param base
-	 * @param resWidth
+	 * <p>
+	 * - Puts a PathResolver to locate the assets through an absolute path - Puts
+	 * assets scale to "1"
+	 *
+	 * @param base is the project base folder
 	 */
-	public static void createEditInstance(String base, int worldWidth, int worldHeight) {
+	public static void createEditInstance(String base) {
 		if (instance != null)
 			instance.dispose();
 
 		instance = new EngineAssetManager(new BasePathResolver(base));
+
 		instance.forceResolution("1");
-		instance.setScale(worldWidth, worldHeight);
+	}
+
+	/**
+	 * All assets will be searched in the selected folder.
+	 *
+	 * @param base The asset base folder
+	 */
+	public static void setAssetFolder(String base) {
+		if (instance != null)
+			instance.dispose();
+
+		if (base != null)
+			instance = new EngineAssetManager(new InternalFolderResolver(base));
+		else
+			instance = new EngineAssetManager(new InternalFileHandleResolver());
 	}
 
 	public void forceResolution(String suffix) {
@@ -149,56 +175,17 @@ public boolean isLoading() {
 		return !update();
 	}
 
-	// public BitmapFont loadFont(String style) {
-	// String key =Config.getProperty(style, null);
-	//
-	// if(key == null) {
-	// EngineLogger.error("FONT STYLE NOT DEFINED IN PROJECT PROPERTIES: " +
-	// style);
-	//
-	// return new BitmapFont();
-	// }
-	//
-	// int size = Config.getProperty(style + "_SIZE", 14);
-	//
-	// return loadFont(key, size);
-	// }
-
-	// TODO: Add support for .fnt loading
-	// public BitmapFont loadFont(String filename, int size) {
-	// FreeTypeFontLoaderParameter param = new FreeTypeFontLoaderParameter();
-	// param.fontFileName = FONTS_DIR + filename;
-	// param.fontParameters.size = size;
-	// param.fontParameters.flip = false;
-	// param.fontParameters.genMipMaps = false;
-	//
-	// // For small screens we use small fonts to limit the space used for the
-	// // text in the screen
-	// if (Gdx.graphics.getWidth() < 800)
-	// param.fontParameters.size *= 0.7;
-	//
-	// String name = FONTS_DIR + filename + "_" + size + ".ttf";
-	// load(name, BitmapFont.class, param);
-	// finishLoading();
-	// return get(name, BitmapFont.class);
-	// }
-	//
-	// public void disposeFont(BitmapFont font) {
-	// if (isLoaded(getAssetFileName(font)))
-	// unload(getAssetFileName(font));
-	// }
-
 	public void loadAtlas(String name) {
-		load(ATLASES_DIR + name + ".atlas", TextureAtlas.class);
+		load(ATLASES_DIR + name + ATLAS_EXT, TextureAtlas.class);
 	}
 
 	public boolean isAtlasLoaded(String name) {
-		return isLoaded(ATLASES_DIR + name + ".atlas");
+		return isLoaded(ATLASES_DIR + name + ATLAS_EXT);
 	}
 
 	public void disposeAtlas(String name) {
 		if (isAtlasLoaded(name))
-			unload(ATLASES_DIR + name + ".atlas");
+			unload(ATLASES_DIR + name + ATLAS_EXT);
 	}
 
 	public FileHandle getModelFile(String filename) {
@@ -206,11 +193,7 @@ public FileHandle getModelFile(String filename) {
 	}
 
 	/**
-	 * Returns a file in the asset directory SEARCHING in the resolution
-	 * directories
-	 * 
-	 * @param filename
-	 * @return
+	 * Returns a file in the asset directory SEARCHING in the resolution directories
 	 */
 	public FileHandle getResAsset(String filename) {
 		return resResolver.resolve(filename);
@@ -219,34 +202,31 @@ public FileHandle getResAsset(String filename) {
 	/**
 	 * Returns a file in the asset directory without searching in the resolution
 	 * directories
-	 * 
-	 * @param filename
-	 * @return
 	 */
 	public FileHandle getAsset(String filename) {
 		return resResolver.baseResolve(filename);
 	}
 
 	public AtlasRegion getRegion(String atlas, String name) {
-		TextureAtlas a = get(ATLASES_DIR + atlas + ".atlas", TextureAtlas.class);
+		TextureAtlas a = get(ATLASES_DIR + atlas + ATLAS_EXT, TextureAtlas.class);
 
 		AtlasRegion region = a.findRegion(name);
 
 		if (region == null) {
-			EngineLogger.error("Region " + name + " not found in atlas " + atlas);
+			EngineLogger.debug("Region " + name + " not found in atlas " + atlas);
 		}
 
 		return region;
 	}
 
 	public TextureAtlas getTextureAtlas(String atlas) {
-		TextureAtlas a = get(ATLASES_DIR + atlas + ".atlas", TextureAtlas.class);
+		TextureAtlas a = get(ATLASES_DIR + atlas + ATLAS_EXT, TextureAtlas.class);
 
 		return a;
 	}
 
 	public Array<AtlasRegion> getRegions(String atlas, String name) {
-		TextureAtlas a = get(ATLASES_DIR + atlas + ".atlas", TextureAtlas.class);
+		TextureAtlas a = get(ATLASES_DIR + atlas + ATLAS_EXT, TextureAtlas.class);
 
 		Array<AtlasRegion> region = a.findRegions(name);
 
@@ -274,76 +254,132 @@ public Texture getTexture(String filename) {
 		return get(filename, Texture.class);
 	}
 
+	@Override
 	public void dispose() {
 		super.dispose();
 		instance = null;
 	}
 
-	public void loadMusic(String filename) {
-		load(MUSIC_DIR + filename, Music.class);
+	public String checkIOSSoundName(String filename) {
+
+		if (Gdx.app.getType() == ApplicationType.iOS && filename.toLowerCase().endsWith(OGG_EXT)) {
+			String aac = filename.substring(0, filename.length() - OGG_EXT.length()) + AAC_EXT;
+
+			if (FileUtils.exists(EngineAssetManager.getInstance().getAsset(aac)))
+				return aac;
+
+			EngineLogger.debug("OGG files not supported in IOS: " + filename);
+
+			return null;
+		}
+
+		return filename;
+	}
+
+	public void loadMusic(String filename) throws FileNotFoundException {
+
+		String n = checkIOSSoundName(MUSIC_DIR + filename);
+
+		if (n == null)
+			return;
+
+		if (!FileUtils.exists(EngineAssetManager.getInstance().getAsset(n))) {
+			throw new FileNotFoundException(n);
+		}
+
+		load(n, Music.class);
 	}
 
 	public void disposeMusic(String filename) {
-		if (isLoaded(MUSIC_DIR + filename))
-			unload(MUSIC_DIR + filename);
+		String n = checkIOSSoundName(MUSIC_DIR + filename);
+
+		if (n == null)
+			return;
+
+		if (isLoaded(n))
+			unload(n);
 	}
 
 	public Music getMusic(String filename) {
-		return get(MUSIC_DIR + filename, Music.class);
+		String n = checkIOSSoundName(MUSIC_DIR + filename);
+
+		if (n == null)
+			return null;
+
+		return get(n, Music.class);
 	}
 
-	public void loadSound(String filename) {
-		load(SOUND_DIR + filename, Sound.class);
+	public void loadSound(String filename) throws FileNotFoundException {
+		String n = checkIOSSoundName(SOUND_DIR + filename);
+
+		if (n == null)
+			return;
+
+		if (!FileUtils.exists(EngineAssetManager.getInstance().getAsset(n))) {
+			throw new FileNotFoundException(n);
+		}
+
+		load(n, Sound.class);
 	}
 
 	public Sound getSound(String filename) {
-		return get(SOUND_DIR + filename, Sound.class);
+		String n = checkIOSSoundName(SOUND_DIR + filename);
+
+		if (n == null)
+			return null;
+
+		return get(n, Sound.class);
 	}
 
 	public void disposeSound(String filename) {
-		if (isLoaded(SOUND_DIR + filename))
-			unload(SOUND_DIR + filename);
-	}
+		String n = checkIOSSoundName(SOUND_DIR + filename);
 
-	public FileHandle getSpine(String name) {
-		return resResolver.baseResolve(SPINE_DIR + name + SPINE_EXT);
-	}
+		if (n == null)
+			return;
 
-	public void loadModel3D(String name) {
-		load(MODEL3D_DIR + name + MODEL3D_EXT, Model.class);
+		if (isLoaded(n))
+			unload(n);
 	}
 
-	public Model getModel3D(String name) {
-		return get(MODEL3D_DIR + name + MODEL3D_EXT, Model.class);
+	public FileHandle getParticle(String name) {
+		return resResolver.baseResolve(PARTICLE_DIR + name);
 	}
 
-	public void disposeModel3D(String name) {
-		if (isLoaded(MODEL3D_DIR + name + MODEL3D_EXT))
-			unload(MODEL3D_DIR + name + MODEL3D_EXT);
-	}
 
 	public boolean assetExists(String filename) {
 		return resResolver.exists(filename);
 	}
 
 	private Resolution[] getResolutions(FileHandleResolver resolver, int worldWidth, int worldHeight) {
-		ArrayList<Resolution> rl = new ArrayList<Resolution>();
+		ArrayList<Resolution> rl = new ArrayList<>();
+
+		String list[] = null;
+
+		String configRes = Config.getInstance().getProperty(Config.RESOLUTIONS, null);
 
-		String list[] = listAssetFiles("/backgrounds");
+		if (configRes != null) {
+			list = configRes.split(",");
+		} else {
+			list = listAssetFiles("ui");
+		}
 
 		for (String name : list) {
+
 			try {
 				float scale = Float.parseFloat(name);
 
+				EngineLogger.debug("RES FOUND: " + scale);
+
 				Resolution r = new Resolution((int) (worldWidth * scale), (int) (worldHeight * scale), name);
 
 				rl.add(r);
-			} catch (Exception e) {
+			} catch (NumberFormatException e) {
 
 			}
 		}
 
 		Collections.sort(rl, new Comparator<Resolution>() {
+			@Override
 			public int compare(Resolution a, Resolution b) {
 				return a.portraitWidth - b.portraitWidth;
 			}
@@ -355,33 +391,43 @@ public int compare(Resolution a, Resolution b) {
 	public String[] listAssetFiles(String base) {
 		FileHandleResolver resolver = resResolver.getBaseResolver();
 
-		String list[];
+		String list[] = null;
 
-		URL u = EngineAssetManager.class.getResource(base);
+		if (Gdx.app.getType() != ApplicationType.Desktop) {
 
-		if (u != null && u.getProtocol().equals("jar")) {
-			list = getFilesFromJar(base);
+			FileHandle[] l = resolver.resolve(base).list();
+			list = new String[l.length];
+
+			for (int i = 0; i < l.length; i++)
+				list[i] = l[i].name();
 
 		} else {
-			String n = base.substring(1);
-			if (u != null)
-				n = u.getFile();
+			// FOR DESKTOP
+			URL u = EngineAssetManager.class.getResource("/" + resolver.resolve(base).path());
 
-			FileHandle f = null;
+			if (u != null && u.getProtocol().equals("jar")) {
+				list = getFilesFromJar("/" + base);
+			} else {
+				String n = resolver.resolve(base).path();
 
-			try {
-				f = resolver.resolve(URLDecoder.decode(n, "UTF-8"));
-			} catch (UnsupportedEncodingException e) {
-				EngineLogger.error("Error decoding URL", e);
-				return new String[0];
-			}
+				if (u != null)
+					n = u.getFile();
 
-			FileHandle[] l = f.list();
-			list = new String[l.length];
+				FileHandle f = null;
 
-			for (int i = 0; i < l.length; i++)
-				list[i] = l[i].name();
+				try {
+					f = Gdx.files.absolute(URLDecoder.decode(n, "UTF-8"));
+				} catch (UnsupportedEncodingException e) {
+					EngineLogger.error("Error decoding URL", e);
+					return new String[0];
+				}
+
+				FileHandle[] l = f.list();
+				list = new String[l.length];
 
+				for (int i = 0; i < l.length; i++)
+					list[i] = l[i].name();
+			}
 		}
 
 		return list;
@@ -393,12 +439,12 @@ public String[] listAssetFiles(String base) {
 	private String[] getFilesFromJar(String base) {
 		URL dirURL = EngineAssetManager.class.getResource(base);
 
-		Set<String> result = new HashSet<String>(); // avoid duplicates in case
-													// it is a subdirectory
+		Set<String> result = new HashSet<>(); // avoid duplicates in case
+		// it is a subdirectory
 
 		if (dirURL.getProtocol().equals("jar")) {
 			/* A JAR path */
-			String jarPath = dirURL.getPath().substring(5, dirURL.getPath().indexOf("!")); 
+			String jarPath = dirURL.getPath().substring(5, dirURL.getPath().indexOf("!"));
 			JarFile jar;
 
 			try {
@@ -409,7 +455,7 @@ private String[] getFilesFromJar(String base) {
 			}
 
 			Enumeration<JarEntry> entries = jar.entries(); // gives ALL entries
-															// in jar
+			// in jar
 
 			while (entries.hasMoreElements()) {
 				String name = entries.nextElement().getName();
@@ -438,17 +484,27 @@ private String[] getFilesFromJar(String base) {
 	}
 
 	public FileHandle getUserFile(String filename) {
+		return getUserFolder().child(filename);
+	}
+
+	public FileHandle getUserFolder() {
 		FileHandle file = null;
 
-		if (Gdx.app.getType() == ApplicationType.Desktop || Gdx.app.getType() == ApplicationType.Applet) {
-			String dir = Config.getProperty(Config.TITLE_PROP, DESKTOP_PREFS_DIR);
-			dir.replaceAll(" ", "");
+		if (Gdx.app.getType() == ApplicationType.Desktop) {
 
 			StringBuilder sb = new StringBuilder();
-			sb.append(".").append(dir).append("/").append(filename);
-			file = Gdx.files.external(sb.toString());
+
+			if (System.getProperty("os.name").toLowerCase().contains("mac")
+					&& System.getenv("HOME").contains("Containers")) {
+
+				file = Gdx.files.absolute(System.getenv("HOME") + "/" + sb.append(userFolder).toString());
+			} else {
+
+				file = Gdx.files.external(sb.append(userFolder).toString());
+			}
+
 		} else {
-			file = Gdx.files.local(NOT_DESKTOP_PREFS_DIR + filename);
+			file = Gdx.files.local(userFolder);
 		}
 
 		return file;
diff --git a/blade-engine/src/com/bladecoder/engine/assets/EngineResolutionFileResolver.java b/blade-engine/src/com/bladecoder/engine/assets/EngineResolutionFileResolver.java
index 88840df30..3e21013ee 100644
--- a/blade-engine/src/com/bladecoder/engine/assets/EngineResolutionFileResolver.java
+++ b/blade-engine/src/com/bladecoder/engine/assets/EngineResolutionFileResolver.java
@@ -19,6 +19,7 @@
 import com.badlogic.gdx.assets.loaders.FileHandleResolver;
 import com.badlogic.gdx.assets.loaders.resolvers.ResolutionFileResolver.Resolution;
 import com.badlogic.gdx.files.FileHandle;
+import com.bladecoder.engine.util.EngineLogger;
 import com.bladecoder.engine.util.FileUtils;
 
 public class EngineResolutionFileResolver implements FileHandleResolver {
@@ -79,9 +80,6 @@ public FileHandleResolver getBaseResolver() {
 	/**
 	 * Skip the resolution resolver. In Android the exists() method is expensive, so this
 	 * method save a exists call.
-	 * 
-	 * @param fileName
-	 * @return
 	 */
 	public FileHandle baseResolve(String fileName) {
 		return baseResolver.resolve(fileName);
@@ -104,11 +102,14 @@ public void selectResolution() {
 	
 	private void selectBestResolution() {
 		bestDesc = descriptors[0];
-		int bestDist = Math.abs(Gdx.graphics.getWidth() - bestDesc.portraitWidth);
+		
+		int width = Gdx.graphics.getWidth() > Gdx.graphics.getHeight() ?Gdx.graphics.getWidth():Gdx.graphics.getHeight();
+		
+		int bestDist = Math.abs(width - bestDesc.portraitWidth);
 
 		for (int i = 1; i < descriptors.length; i++) {
 			Resolution other = descriptors[i];
-			int dist =  Math.abs(Gdx.graphics.getWidth() - other.portraitWidth);
+			int dist =  Math.abs(width - other.portraitWidth);
 			
 			if (dist < bestDist) {
 				bestDesc = descriptors[i];
@@ -123,8 +124,6 @@ public void setResolutions(Resolution[] resolutions) {
 	
 	/**
 	 * Sets a fixed prefix, disabling choosing the best resolution.
-	 * 
-	 * @param scale The prefix of the assets
 	 */
 	private void selectFixedResolution() {
 		for (int i = 0; i < descriptors.length; i++) {
@@ -133,6 +132,11 @@ private void selectFixedResolution() {
 				return;
 			}
 		}
+		
+		if(bestDesc == null) {
+			EngineLogger.error("Requested resolution not found: " + fixResolution);
+			selectBestResolution();
+		}
 	}
 	
 	public void setFixedResolution(String suffix) {
diff --git a/blade-engine/src/com/bladecoder/engine/assets/InternalFolderResolver.java b/blade-engine/src/com/bladecoder/engine/assets/InternalFolderResolver.java
new file mode 100644
index 000000000..a3f217105
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/assets/InternalFolderResolver.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.assets;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.assets.loaders.FileHandleResolver;
+import com.badlogic.gdx.files.FileHandle;
+
+public class InternalFolderResolver implements FileHandleResolver {
+	String basePath;
+
+	@Override
+	public FileHandle resolve(String fileName) {
+		return Gdx.files.internal(basePath + fileName);
+	}
+
+	public InternalFolderResolver(String base) {
+		basePath = base;
+		
+		if(!basePath.endsWith("/")) {
+			basePath = base + "/";
+		}
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/expr/Benchmark.java b/blade-engine/src/com/bladecoder/engine/expr/Benchmark.java
deleted file mode 100644
index 8743d13e1..000000000
--- a/blade-engine/src/com/bladecoder/engine/expr/Benchmark.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-// Run benchmarks from the command line.
-
-package com.bladecoder.engine.expr;
-
-/**
- * Time evaluating many expressions over many values.
- */
-public class Benchmark {
-    public static void main(String[] args) {
-        double parse_product = 1.0;
-        double run_product = 1.0;
-        for (int i = 0; i < args.length; ++i) {
-            long parsetime = timeParse(args[i]);
-            long runtime = timeRun(args[i]);
-            System.out.println("" + msec(parsetime) + " ms(parse) "
-                               + msec(runtime) + " ms(run): "
-                               + args[i]);
-            parse_product *= parsetime;
-            run_product *= runtime;
-        }
-        if (0 < args.length) {
-            double run_geomean = Math.pow(run_product, 1.0 / args.length);
-            double parse_geomean = Math.pow(parse_product, 1.0 / args.length);
-            System.out.println("" + msec(parse_geomean) + " ms(parse) "
-                               + msec(run_geomean) + " ms(run): (geometric mean)");
-        }
-    }
-
-    static long msec(double nsec) {
-        return (long) Math.rint(nsec * 1e-6);
-    }
-
-    static final int nruns = 1000000;
-
-    static long timeRun(String expression) {
-	Variable x = Variable.make("x");
-        Expr expr = parse(expression);
-
-	double low  = 0.0;
-	double high = 4.0;
-	double step = (high - low) / nruns;
-
-        long start = System.nanoTime();
-	for (double xval = low; xval <= high; xval += step) {
-	    x.setValue(xval);
-	    expr.value();
-	}
-        return System.nanoTime() - start;
-    }
-
-    static final int nparses = 1000;
-
-    static long timeParse(String expression) {
-        long start = System.nanoTime();
-        for (int i = 0; i < nparses; ++i)
-            parse(expression); 
-        return System.nanoTime() - start;
-    }
-
-    static Expr parse(String expression) {
-        try {
-            return Parser.parse(expression); 
-        } catch (SyntaxException e) {
-            System.err.println(e.explain());
-            throw new Error(e);
-        }
-    }
-}
diff --git a/blade-engine/src/com/bladecoder/engine/expr/Example.java b/blade-engine/src/com/bladecoder/engine/expr/Example.java
deleted file mode 100644
index 42438e7a4..000000000
--- a/blade-engine/src/com/bladecoder/engine/expr/Example.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-// Put the expression evaluator through its paces.
-
-// Sample usage:
-
-// $ java expr.Example '3.14159 * x^2' 0 4 1
-// 0
-// 3.14159
-// 12.5664
-// 28.2743
-// 50.2654
-//
-// $ java expr.Example 'sin (pi/4 * x)' 0 4 1
-// 0
-// 0.707107
-// 1
-// 0.707107
-// 1.22461e-16
-//
-// $ java expr.Example 'sin (pi/4 x)' 0 4 1
-// I don't understand your formula "sin (pi/4 x)".
-// 
-// I got as far as "sin (pi/4" and then saw "x".
-// I expected ")" at that point, instead.
-// An example of a formula I can parse is "sin (pi/4 + x)".
-
-package com.bladecoder.engine.expr;
-
-/**
- * A simple example of parsing and evaluating an expression.
- */
-public class Example {
-    public static void main(String[] args) {
-
-	Expr expr;
-	try {
-	    expr = Parser.parse(args[0]); 
-	} catch (SyntaxException e) {
-	    System.err.println(e.explain());
-	    return;
-	}
-
-	double low  = Double.valueOf(args[1]).doubleValue();
-	double high = Double.valueOf(args[2]).doubleValue();
-	double step = Double.valueOf(args[3]).doubleValue();
-
-	Variable x = Variable.make("x");
-	for (double xval = low; xval <= high; xval += step) {
-	    x.setValue(xval);
-	    System.out.println(expr.value());
-	}
-    }
-}
diff --git a/blade-engine/src/com/bladecoder/engine/expr/Expr.java b/blade-engine/src/com/bladecoder/engine/expr/Expr.java
deleted file mode 100644
index b633ee056..000000000
--- a/blade-engine/src/com/bladecoder/engine/expr/Expr.java
+++ /dev/null
@@ -1,342 +0,0 @@
-// Mathematical expressions.
-// Copyright 1996 by Darius Bacon; see the file COPYING.
-
-package com.bladecoder.engine.expr;
-
-/**
- * A mathematical expression, built out of literal numbers, variables,
- * arithmetic and relational operators, and elementary functions. It can be
- * evaluated to get its value given its variables' current values. The operator
- * names are from java.lang.Math where possible.
- */
-public abstract class Expr {
-
-	/**
-	 * Calculate the expression's value.
-	 * 
-	 * @return the value given the current variable values
-	 */
-	public abstract double value();
-
-	/**
-	 * The expresion can store a String to allow String comparison
-	 * 
-	 * @return the value given the current variable values
-	 */
-	public abstract String getStringLiteral();
-
-	/** Binary operator: addition */
-	public static final int ADD = 0;
-	/** Binary operator: subtraction */
-	public static final int SUB = 1;
-	/** Binary operator: multiplication */
-	public static final int MUL = 2;
-	/** Binary operator: division */
-	public static final int DIV = 3;
-	/** Binary operator: exponentiation */
-	public static final int POW = 4;
-	/** Binary operator: arctangent */
-	public static final int ATAN2 = 5;
-	/** Binary operator: maximum */
-	public static final int MAX = 6;
-	/** Binary operator: minimum */
-	public static final int MIN = 7;
-	/** Binary operator: less than */
-	public static final int LT = 8;
-	/** Binary operator: less or equal */
-	public static final int LE = 9;
-	/** Binary operator: equality */
-	public static final int EQ = 10;
-	/** Binary operator: inequality */
-	public static final int NE = 11;
-	/** Binary operator: greater or equal */
-	public static final int GE = 12;
-	/** Binary operator: greater than */
-	public static final int GT = 13;
-	/** Binary operator: logical and */
-	public static final int AND = 14;
-	/** Binary operator: logical or */
-	public static final int OR = 15;
-
-	/** Unary operator: absolute value */
-	public static final int ABS = 100;
-	/** Unary operator: arccosine */
-	public static final int ACOS = 101;
-	/** Unary operator: arcsine */
-	public static final int ASIN = 102;
-	/** Unary operator: arctangent */
-	public static final int ATAN = 103;
-	/** Unary operator: ceiling */
-	public static final int CEIL = 104;
-	/** Unary operator: cosine */
-	public static final int COS = 105;
-	/** Unary operator: e to the x */
-	public static final int EXP = 106;
-	/** Unary operator: floor */
-	public static final int FLOOR = 107;
-	/** Unary operator: natural log */
-	public static final int LOG = 108;
-	/** Unary operator: negation */
-	public static final int NEG = 109;
-	/** Unary operator: rounding */
-	public static final int ROUND = 110;
-	/** Unary operator: sine */
-	public static final int SIN = 111;
-	/** Unary operator: square root */
-	public static final int SQRT = 112;
-	/** Unary operator: tangent */
-	public static final int TAN = 113;
-
-	/**
-	 * Make a literal expression.
-	 * 
-	 * @param v
-	 *            the constant value of the expression
-	 * @return an expression whose value is always v
-	 */
-	public static Expr makeLiteral(double v) {
-		return new LiteralExpr(v);
-	}
-
-	public static Expr makeStringLiteral(String s) {
-		return new StringLiteralExpr(s);
-	}
-
-	/**
-	 * Make an expression that applies a unary operator to an operand.
-	 * 
-	 * @param rator
-	 *            a code for a unary operator
-	 * @param rand
-	 *            operand
-	 * @return an expression meaning rator(rand)
-	 */
-	public static Expr makeApp1(int rator, Expr rand) {
-		Expr app = new UnaryExpr(rator, rand);
-		return rand instanceof LiteralExpr ? new LiteralExpr(app.value()) : app;
-	}
-
-	/**
-	 * Make an expression that applies a binary operator to two operands.
-	 * 
-	 * @param rator
-	 *            a code for a binary operator
-	 * @param rand0
-	 *            left operand
-	 * @param rand1
-	 *            right operand
-	 * @return an expression meaning rator(rand0, rand1)
-	 */
-	public static Expr makeApp2(int rator, Expr rand0, Expr rand1) {
-		Expr app = new BinaryExpr(rator, rand0, rand1);
-		return rand0 instanceof LiteralExpr && rand1 instanceof LiteralExpr ? new LiteralExpr(
-				app.value()) : app;
-	}
-
-	/**
-	 * Make a conditional expression.
-	 * 
-	 * @param test
-	 *            `if' part
-	 * @param consequent
-	 *            `then' part
-	 * @param alternative
-	 *            `else' part
-	 * @return an expression meaning `if test, then consequent, else
-	 *         alternative'
-	 */
-	public static Expr makeIfThenElse(Expr test, Expr consequent,
-			Expr alternative) {
-		Expr cond = new ConditionalExpr(test, consequent, alternative);
-		if (test instanceof LiteralExpr)
-			return test.value() != 0 ? consequent : alternative;
-		else
-			return cond;
-	}
-}
-
-// These classes are all private to this module because we could
-// plausibly want to do it in a completely different way, such as a
-// stack machine.
-
-class LiteralExpr extends Expr {
-	double v;
-
-	LiteralExpr(double v) {
-		this.v = v;
-	}
-
-	public double value() {
-		return v;
-	}
-
-	@Override
-	public String getStringLiteral() {
-		return null;
-	}
-}
-
-class StringLiteralExpr extends Expr {
-
-	String s;
-
-	StringLiteralExpr(String s) {
-		this.s = s;
-	}
-
-	@Override
-	public double value() {
-		double v;
-		try {
-			v = Double.parseDouble(s);
-		} catch (NumberFormatException e) {
-			v = 0;
-		}
-
-		return v;
-	}
-
-	@Override
-	public String getStringLiteral() {
-		return s;
-	}
-
-}
-
-class UnaryExpr extends Expr {
-	int rator;
-	Expr rand;
-
-	UnaryExpr(int rator, Expr rand) {
-		this.rator = rator;
-		this.rand = rand;
-	}
-
-	public double value() {
-		double arg = rand.value();
-		switch (rator) {
-		case ABS:
-			return Math.abs(arg);
-		case ACOS:
-			return Math.acos(arg);
-		case ASIN:
-			return Math.asin(arg);
-		case ATAN:
-			return Math.atan(arg);
-		case CEIL:
-			return Math.ceil(arg);
-		case COS:
-			return Math.cos(arg);
-		case EXP:
-			return Math.exp(arg);
-		case FLOOR:
-			return Math.floor(arg);
-		case LOG:
-			return Math.log(arg);
-		case NEG:
-			return -arg;
-		case ROUND:
-			return Math.rint(arg);
-		case SIN:
-			return Math.sin(arg);
-		case SQRT:
-			return Math.sqrt(arg);
-		case TAN:
-			return Math.tan(arg);
-		default:
-			throw new RuntimeException("BUG: bad rator");
-		}
-	}
-
-	@Override
-	public String getStringLiteral() {
-		return null;
-	}
-}
-
-class BinaryExpr extends Expr {
-	int rator;
-	Expr rand0, rand1;
-
-	BinaryExpr(int rator, Expr rand0, Expr rand1) {
-		this.rator = rator;
-		this.rand0 = rand0;
-		this.rand1 = rand1;
-	}
-
-	public double value() {
-		String s0 = rand0.getStringLiteral();
-		String s1 = rand1.getStringLiteral();
-		double arg0 = rand0.value();
-		double arg1 = rand1.value();
-		
-		boolean stringOp = (s0 != null && s1 != null);
-		
-		switch (rator) {
-		case ADD:
-			return arg0 + arg1;
-		case SUB:
-			return arg0 - arg1;
-		case MUL:
-			return arg0 * arg1;
-		case DIV:
-			return arg0 / arg1; // division by 0 has IEEE 754 behavior
-		case POW:
-			return Math.pow(arg0, arg1);
-		case ATAN2:
-			return Math.atan2(arg0, arg1);
-		case MAX:
-			return arg0 < arg1 ? arg1 : arg0;
-		case MIN:
-			return arg0 < arg1 ? arg0 : arg1;
-		case LT:
-			return arg0 < arg1 ? 1.0 : 0.0;
-		case LE:
-			return arg0 <= arg1 ? 1.0 : 0.0;
-		case EQ:
-			if(stringOp)
-				return s0.equals(s1) ? 1.0 : 0.0;
-			else
-				return arg0 == arg1 ? 1.0 : 0.0;
-		case NE:
-			if(stringOp)
-				return !s0.equals(s1) ? 1.0 : 0.0;
-			else
-				return arg0 != arg1 ? 1.0 : 0.0;
-		case GE:
-			return arg0 >= arg1 ? 1.0 : 0.0;
-		case GT:
-			return arg0 > arg1 ? 1.0 : 0.0;
-		case AND:
-			return arg0 != 0 && arg1 != 0 ? 1.0 : 0.0;
-		case OR:
-			return arg0 != 0 || arg1 != 0 ? 1.0 : 0.0;
-		default:
-			throw new RuntimeException("BUG: bad rator");
-		}
-	}
-
-	@Override
-	public String getStringLiteral() {
-		return null;
-	}
-}
-
-class ConditionalExpr extends Expr {
-	Expr test, consequent, alternative;
-
-	ConditionalExpr(Expr test, Expr consequent, Expr alternative) {
-		this.test = test;
-		this.consequent = consequent;
-		this.alternative = alternative;
-	}
-
-	public double value() {
-		return test.value() != 0 ? consequent.value() : alternative.value();
-	}
-
-	@Override
-	public String getStringLiteral() {
-		return null;
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/expr/Parser.java b/blade-engine/src/com/bladecoder/engine/expr/Parser.java
deleted file mode 100644
index e88362860..000000000
--- a/blade-engine/src/com/bladecoder/engine/expr/Parser.java
+++ /dev/null
@@ -1,406 +0,0 @@
-// Operator-precedence parser.
-// Copyright 1996 by Darius Bacon; see the file COPYING.
-
-package com.bladecoder.engine.expr;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-/**
- * Parses strings representing mathematical formulas with variables. The
- * following operators, in descending order of precedence, are defined:
- * 
- * <UL>
- * <LI>^ (raise to a power)
- * <LI>/
- * <LI>Unary minus (-x)
- * <LI>+ -
- * <LI>&lt; &lt;= = &lt;&gt; &gt;= &gt;
- * <LI>and
- * <LI>or
- * </UL>
- * 
- * ^ associates right-to-left; other operators associate left-to-right.
- * 
- * <P>
- * These unary functions are defined: abs, acos, asin, atan, ceil, cos, exp,
- * floor, log, round, sin, sqrt, tan. Each requires one argument enclosed in
- * parentheses.
- * 
- * <P>
- * There are also binary functions: atan2, min, max; and a ternary conditional
- * function: if(test, then, else).
- * 
- * <P>
- * Whitespace outside identifiers is ignored.
- * 
- * <P>
- * Examples:
- * <UL>
- * <LI>42
- * <LI>2-3
- * <LI>cos(x^2) + sin(x^2)
- * <UL>
- */
-public class Parser {
-
-	// Built-in constants
-	static private final Variable pi = Variable.make("pi");
-	static {
-		pi.setValue(Math.PI);
-	}
-
-	/**
-	 * Return the expression denoted by the input string.
-	 * 
-	 * @param input
-	 *            the unparsed expression
-	 * @exception SyntaxException
-	 *                if the input is unparsable
-	 */
-	static public Expr parse(String input) throws SyntaxException {
-		return new Parser().parseString(input);
-	}
-
-	/**
-	 * Set of Variable's that are allowed to appear in input expressions. If
-	 * null, any variable is allowed.
-	 */
-	private Hashtable allowedVariables = null;
-
-	/**
-	 * Adjust the set of allowed variables: create it (if not yet existent) and
-	 * add optVariable (if it's nonnull). If the allowed-variable set exists,
-	 * the parser will reject input strings that use any other variables.
-	 * 
-	 * @param optVariable
-	 *            the variable to be allowed, or null
-	 */
-	public void allow(Variable optVariable) {
-		if (null == allowedVariables) {
-			allowedVariables = new Hashtable();
-			allowedVariables.put(pi, pi);
-		}
-		if (null != optVariable)
-			allowedVariables.put(optVariable, optVariable);
-	}
-
-	Scanner tokens = null;
-	private Token token = null;
-
-	/**
-	 * Return the expression denoted by the input string.
-	 * 
-	 * @param input
-	 *            the unparsed expression
-	 * @exception SyntaxException
-	 *                if the input is unparsable
-	 */
-	public Expr parseString(String input) throws SyntaxException {
-		tokens = new Scanner(input, operatorChars);
-		return reparse();
-	}
-
-	static private final String operatorChars = "*/+-^<>=,()";
-
-	private Expr reparse() throws SyntaxException {
-		tokens.index = -1;
-		nextToken();
-		Expr expr = parseExpr(0);
-		if (token.ttype != Token.TT_EOF)
-			throw error("Incomplete expression", SyntaxException.INCOMPLETE,
-					null);
-		return expr;
-	}
-
-	private void nextToken() {
-		token = tokens.nextToken();
-	}
-
-	private Expr parseExpr(int precedence) throws SyntaxException {
-		Expr expr = parseFactor();
-		loop: for (;;) {
-			int l, r, rator;
-
-			// The operator precedence table.
-			// l = left precedence, r = right precedence, rator = operator.
-			// Higher precedence values mean tighter binding of arguments.
-			// To associate left-to-right, let r = l+1;
-			// to associate right-to-left, let r = l.
-
-			switch (token.ttype) {
-
-			case '<':
-				l = 20;
-				r = 21;
-				rator = Expr.LT;
-				break;
-			case Token.TT_LE:
-				l = 20;
-				r = 21;
-				rator = Expr.LE;
-				break;
-			case '=':
-				l = 20;
-				r = 21;
-				rator = Expr.EQ;
-				break;
-			case Token.TT_NE:
-				l = 20;
-				r = 21;
-				rator = Expr.NE;
-				break;
-			case Token.TT_GE:
-				l = 20;
-				r = 21;
-				rator = Expr.GE;
-				break;
-			case '>':
-				l = 20;
-				r = 21;
-				rator = Expr.GT;
-				break;
-
-			case '+':
-				l = 30;
-				r = 31;
-				rator = Expr.ADD;
-				break;
-			case '-':
-				l = 30;
-				r = 31;
-				rator = Expr.SUB;
-				break;
-
-			case '/':
-				l = 40;
-				r = 41;
-				rator = Expr.DIV;
-				break;
-			case '*':
-				l = 40;
-				r = 41;
-				rator = Expr.MUL;
-				break;
-
-			case '^':
-				l = 50;
-				r = 50;
-				rator = Expr.POW;
-				break;
-
-			default:
-				if (token.ttype == Token.TT_WORD && token.sval.equals("and")) {
-					l = 5;
-					r = 6;
-					rator = Expr.AND;
-					break;
-				}
-				if (token.ttype == Token.TT_WORD && token.sval.equals("or")) {
-					l = 10;
-					r = 11;
-					rator = Expr.OR;
-					break;
-				}
-				break loop;
-			}
-
-			if (l < precedence)
-				break loop;
-
-			nextToken();
-			expr = Expr.makeApp2(rator, expr, parseExpr(r));
-		}
-		return expr;
-	}
-
-	static private final String[] procs1 = { "abs", "acos", "asin", "atan",
-			"ceil", "cos", "exp", "floor", "log", "round", "sin", "sqrt", "tan" };
-	static private final int[] rators1 = { Expr.ABS, Expr.ACOS, Expr.ASIN,
-			Expr.ATAN, Expr.CEIL, Expr.COS, Expr.EXP, Expr.FLOOR, Expr.LOG,
-			Expr.ROUND, Expr.SIN, Expr.SQRT, Expr.TAN };
-
-	static private final String[] procs2 = { "atan2", "max", "min" };
-	static private final int[] rators2 = { Expr.ATAN2, Expr.MAX, Expr.MIN };
-
-	private Expr parseFactor() throws SyntaxException {
-		switch (token.ttype) {
-		case Token.TT_NUMBER: {
-			Expr lit = Expr.makeLiteral(token.nval);
-			nextToken();
-			return lit;
-		}
-		
-		case Token.TT_STRING: {
-			Expr lit = Expr.makeStringLiteral(token.sval);
-			nextToken();
-			return lit;
-		}		
-		case Token.TT_WORD: {
-			for (int i = 0; i < procs1.length; ++i)
-				if (procs1[i].equals(token.sval)) {
-					nextToken();
-					expect('(');
-					Expr rand = parseExpr(0);
-					expect(')');
-					return Expr.makeApp1(rators1[i], rand);
-				}
-
-			for (int i = 0; i < procs2.length; ++i)
-				if (procs2[i].equals(token.sval)) {
-					nextToken();
-					expect('(');
-					Expr rand1 = parseExpr(0);
-					expect(',');
-					Expr rand2 = parseExpr(0);
-					expect(')');
-					return Expr.makeApp2(rators2[i], rand1, rand2);
-				}
-
-			if (token.sval.equals("if")) {
-				nextToken();
-				expect('(');
-				Expr test = parseExpr(0);
-				expect(',');
-				Expr consequent = parseExpr(0);
-				expect(',');
-				Expr alternative = parseExpr(0);
-				expect(')');
-				return Expr.makeIfThenElse(test, consequent, alternative);
-			}
-
-			Expr var = Variable.make(token.sval);
-			if (null != allowedVariables && null == allowedVariables.get(var))
-				throw error("Unknown variable",
-						SyntaxException.UNKNOWN_VARIABLE, null);
-			nextToken();
-			return var;
-		}
-		case '(': {
-			nextToken();
-			Expr enclosed = parseExpr(0);
-			expect(')');
-			return enclosed;
-		}
-		case '-':
-			nextToken();
-			return Expr.makeApp1(Expr.NEG, parseExpr(35));
-		case Token.TT_EOF:
-			throw error("Expected a factor", SyntaxException.PREMATURE_EOF,
-					null);
-		default:
-			throw error("Expected a factor", SyntaxException.BAD_FACTOR, null);
-		}
-	}
-
-	private SyntaxException error(String complaint, int reason, String expected) {
-		return new SyntaxException(complaint, this, reason, expected);
-	}
-
-	private void expect(int ttype) throws SyntaxException {
-		if (token.ttype != ttype)
-			throw error("'" + (char) ttype + "' expected",
-					SyntaxException.EXPECTED, "" + (char) ttype);
-		nextToken();
-	}
-
-	// Error correction
-
-	boolean tryCorrections() {
-		return tryInsertions() || tryDeletions() || trySubstitutions();
-	}
-
-	private boolean tryInsertions() {
-		ArrayList<Token> v = tokens.tokens;
-		for (int i = tokens.index; 0 <= i; --i) {
-			Token t;
-			if (i < v.size()) {
-				t = (Token) v.get(i);
-			} else {
-				String s = tokens.getInput();
-				t = new Token(Token.TT_EOF, 0, s, s.length(), s.length());
-			}
-			Token[] candidates = possibleInsertions(t);
-			for (int j = 0; j < candidates.length; ++j) {
-				v.add(i, candidates[j]);
-				try {
-					reparse();
-					return true;
-				} catch (SyntaxException se) {
-					v.remove(i);
-				}
-			}
-		}
-		return false;
-	}
-
-	private boolean tryDeletions() {
-		ArrayList<Token> v = tokens.tokens;
-		for (int i = tokens.index; 0 <= i; --i) {
-			if (v.size() <= i)
-				continue;
-			Token t = v.get(i);
-			v.remove(i);
-			try {
-				reparse();
-				return true;
-			} catch (SyntaxException se) {
-				v.add(i, t);
-			}
-		}
-		return false;
-	}
-
-	private boolean trySubstitutions() {
-		ArrayList<Token> v = tokens.tokens;
-		for (int i = tokens.index; 0 <= i; --i) {
-			if (v.size() <= i)
-				continue;
-			Token t = (Token) v.get(i);
-			Token[] candidates = possibleSubstitutions(t);
-			for (int j = 0; j < candidates.length; ++j) {
-				v.set(i, candidates[j]);
-				try {
-					reparse();
-					return true;
-				} catch (SyntaxException se) {
-				}
-			}
-			v.set(i, t);
-		}
-		return false;
-	}
-
-	private Token[] possibleInsertions(Token t) {
-		Token[] ts = new Token[operatorChars.length() + 6 + procs1.length
-				+ procs2.length];
-		int i = 0;
-
-		Token one = new Token(Token.TT_NUMBER, 1, "1", t);
-		ts[i++] = one;
-
-		for (int j = 0; j < operatorChars.length(); ++j) {
-			char c = operatorChars.charAt(j);
-			ts[i++] = new Token(c, 0, Character.toString(c), t);
-		}
-
-		ts[i++] = new Token(Token.TT_WORD, 0, "x", t);
-
-		for (int k = 0; k < procs1.length; ++k)
-			ts[i++] = new Token(Token.TT_WORD, 0, procs1[k], t);
-
-		for (int m = 0; m < procs2.length; ++m)
-			ts[i++] = new Token(Token.TT_WORD, 0, procs2[m], t);
-
-		ts[i++] = new Token(Token.TT_LE, 0, "<=", t);
-		ts[i++] = new Token(Token.TT_NE, 0, "<>", t);
-		ts[i++] = new Token(Token.TT_GE, 0, ">=", t);
-		ts[i++] = new Token(Token.TT_WORD, 0, "if", t);
-
-		return ts;
-	}
-
-	private Token[] possibleSubstitutions(Token t) {
-		return possibleInsertions(t);
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/expr/RegressionTest.java b/blade-engine/src/com/bladecoder/engine/expr/RegressionTest.java
deleted file mode 100644
index 025bdb3b5..000000000
--- a/blade-engine/src/com/bladecoder/engine/expr/RegressionTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.expr;
-
-/**
- * Test for bugs in the whole package.
- */
-public class RegressionTest {
-
-	public static void main(String[] args) {
-		Variable.make("pi").setValue(Math.PI);
-
-		expect(9, "3^2");
-		expect(256, "2^2^3");
-		expect(6, "3*2");
-		expect(1.5, "3/2");
-		expect(5, "3+2");
-		expect(1, "3-2");
-		expect(-3, "-3");
-		expect(1, "2<3");
-		expect(0, "2<2");
-		expect(0, "3<2");
-		expect(1, "2<=3");
-		expect(1, "2<=2");
-		expect(0, "3<=2");
-		expect(0, "2=3");
-		expect(1, "2=2");
-		expect(1, "2<>3");
-		expect(0, "2<>2");
-		expect(0, "2>=3");
-		expect(1, "2>=2");
-		expect(1, "3>=2");
-		expect(0, "2>3");
-		expect(0, "2>2");
-		expect(1, "3>2");
-		expect(1, "(1 and 1)");
-		expect(0, "(1 and 0)");
-		expect(0, "(0 and 1)");
-		expect(0, "(0 and 0)");
-		expect(1, "(1 or 1)");
-		expect(1, "(1 or 0)");
-		expect(1, "(0 or 1)");
-		expect(0, "(0 or 0)");
-		expect(2, "abs(-2)");
-		expect(2, "abs(2)");
-		expect(0, "acos(1)");
-		expect(Math.PI / 2, "asin(1)");
-		expect(Math.PI / 4, "atan(1)");
-		expect(-3 * Math.PI / 4, "atan2(-1, -1)");
-		expect(4, "ceil(3.5)");
-		expect(-3, "ceil(-3.5)");
-		expect(1, "cos(0)");
-		expect(Math.exp(1), "exp(1)");
-		expect(3, "floor(3.5)");
-		expect(-4, "floor(-3.5)");
-		expect(1, "log(2.7182818284590451)");
-		expect(4, "round(3.5)");
-		expect(-4, "round(-3.5)");
-		expect(1, "sin(pi/2)");
-		expect(3, "sqrt(9)");
-		expect(0.99999999999999989, "tan(pi/4)");
-		expect(3, "max(2, 3)");
-		expect(2, "min(2, 3)");
-		expect(137, "if(0, 42, 137)");
-		expect(42, "if(1, 42, 137)");
-		expect(1, "'abc' = 'abc'");
-		expect(0, "'ac' = 'abc'");
-		expect(20, "if('a1134c' = 'abc',10,20)");
-
-		expect(-3.0 * Math.pow(1.01, 100.1), "  -3 * 1.01^100.1  ");
-
-		Variable x = Variable.make("x");
-		x.setValue(-40.0);
-		expect(-171.375208, "-0.00504238 * x^2 + 2.34528 * x - 69.4962");
-
-		{
-			boolean caught = false;
-			Parser p = new Parser();
-			p.allow(x); // or p.allow(null);
-			try {
-				p.parseString("whoo");
-			} catch (SyntaxException se) {
-				caught = true;
-			}
-			if (!caught)
-				throw new Error("Test failed: unknown variable allowed");
-		}
-
-		x.setValue(1.1);
-
-		expect(137, "137");
-		expect(Math.PI, "pi");
-		expect(1.1, "x");
-		expect(3.8013239000000003, "3.14159 * x^2");
-		expect(-1.457526100326025, "sin(10*x) + sin(9*x)");
-		expect(0.8907649332805846, "sin(x) + sin(100*x)/100");
-		expect(-0.16000473871962462, "sin(0.1*x) * (sin(9*x) + sin(10*x))");
-		expect(0.29819727942988733, "exp(-x^2)");
-		expect(0.43226861565393254, "2^(-x^2)");
-		expect(0.7075295010833899, "(x^3)^(-x^2)");
-		expect(0.8678400091286832, "x*sin(1/x)");
-		expect(-5.89, "x^2-x-6");
-		expect(3.1953090617340916, "sqrt(3^2 + x^2)");
-		expect(1.3542460218188073, "atan(5/x)");
-		expect(1.5761904761904764, "(x^2 + x + 1)/(x + 1)");
-		expect(2.6451713395638627, "(x^3 - (4*x^2) + 12)/(x^2 + 2)");
-		expect(-2.2199999999999998, "-2*(x-3)^2+5");
-		expect(1.2000000000000002, "2*abs(x+1)-3");
-		expect(2.7910571473905725, "sqrt(9-x^2)");
-
-		System.out.println("All tests passed.");
-	}
-
-	private static void expect(double expected, String input) {
-		Expr expr;
-		try {
-			expr = Parser.parse(input);
-		} catch (SyntaxException e) {
-			throw new Error(e.explain());
-		}
-
-		double result = expr.value();
-		if (result != expected) {
-			throw new Error("Bad result: " + result
-					+ " instead of the expected " + expected + " in \"" + input
-					+ "\"");
-		}
-	}
-
-}
diff --git a/blade-engine/src/com/bladecoder/engine/expr/Scanner.java b/blade-engine/src/com/bladecoder/engine/expr/Scanner.java
deleted file mode 100644
index 7e62d4d93..000000000
--- a/blade-engine/src/com/bladecoder/engine/expr/Scanner.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-// Scan lexical tokens in input strings.
-
-package com.bladecoder.engine.expr;
-
-import java.util.ArrayList;
-
-class Scanner {
-
-	private String s;
-	private String operatorChars;
-
-	ArrayList<Token> tokens = new ArrayList<Token>();
-	int index = -1;
-
-	public Scanner(String string, String operatorChars) {
-		this.s = string;
-		this.operatorChars = operatorChars;
-
-		int i = 0;
-		do {
-			i = scanToken(i);
-		} while (i < s.length());
-	}
-
-	public String getInput() {
-		return s;
-	}
-
-	// The tokens may have been diddled, so this can be different from
-	// getInput().
-	public String toString() {
-		StringBuffer sb = new StringBuffer();
-		int whitespace = 0;
-		for (int i = 0; i < tokens.size(); ++i) {
-			Token t = tokens.get(i);
-
-			int spaces = (whitespace != 0 ? whitespace : t.leadingWhitespace);
-			if (i == 0)
-				spaces = 0;
-			else if (spaces == 0
-					&& !joinable(tokens.get(i - 1), t))
-				spaces = 1;
-			for (int j = spaces; 0 < j; --j)
-				sb.append(" ");
-
-			sb.append(t.sval);
-			whitespace = t.trailingWhitespace;
-		}
-		return sb.toString();
-	}
-
-	private boolean joinable(Token s, Token t) {
-		return !(isAlphanumeric(s) && isAlphanumeric(t));
-	}
-
-	private boolean isAlphanumeric(Token t) {
-		return t.ttype == Token.TT_WORD || t.ttype == Token.TT_NUMBER;
-	}
-
-	public boolean isEmpty() {
-		return tokens.size() == 0;
-	}
-
-	public boolean atStart() {
-		return index <= 0;
-	}
-
-	public boolean atEnd() {
-		return tokens.size() <= index;
-	}
-
-	public Token nextToken() {
-		++index;
-		return getCurrentToken();
-	}
-
-	public Token getCurrentToken() {
-		if (atEnd())
-			return new Token(Token.TT_EOF, 0, s, s.length(), s.length());
-		return  tokens.get(index);
-	}
-
-	private int scanToken(int i) {
-		while (i < s.length() && Character.isWhitespace(s.charAt(i)))
-			++i;
-
-		if (i == s.length()) {
-			return i;
-		} else if (0 <= operatorChars.indexOf(s.charAt(i))) {
-			if (i + 1 < s.length()) {
-				String pair = s.substring(i, i + 2);
-				int ttype = 0;
-				if (pair.equals("<="))
-					ttype = Token.TT_LE;
-				else if (pair.equals(">="))
-					ttype = Token.TT_GE;
-				else if (pair.equals("<>"))
-					ttype = Token.TT_NE;
-				if (0 != ttype) {
-					tokens.add(new Token(ttype, 0, s, i, i + 2));
-					return i + 2;
-				}
-			}
-			tokens.add(new Token(s.charAt(i), 0, s, i, i + 1));
-			return i + 1;
-		} else if (Character.isLetter(s.charAt(i))) {
-			return scanSymbol(i);
-		} else if (s.charAt(i) == '\'') {
-			return scanString(i);			
-		} else if (Character.isDigit(s.charAt(i)) || '.' == s.charAt(i)) {
-			return scanNumber(i);
-		} else {
-			tokens.add(makeErrorToken(i, i + 1));
-			return i + 1;
-		}
-	}
-
-	private int scanSymbol(int i) {
-		int from = i;
-		while (i < s.length()
-				&& (Character.isLetter(s.charAt(i)) || Character.isDigit(s
-						.charAt(i))))
-			++i;
-		tokens.add(new Token(Token.TT_WORD, 0, s, from, i));
-		return i;
-	}
-
-	private int scanString(int i) {
-		int from = i;
-		
-		i++;
-		
-		while (i < s.length() && (s.charAt(i) != '\''))
-			++i;
-		
-		if(i==s.length()) {
-			tokens.add(makeErrorToken(from, i));
-			return i;
-		}
-		
-		
-		tokens.add(new Token(Token.TT_STRING, 0, s, from + 1, i));
-		
-		return i + 1;
-	}
-
-	private int scanNumber(int i) {
-		int from = i;
-
-		// We include letters in our purview because otherwise we'd
-		// accept a word following with no intervening space.
-		for (; i < s.length(); ++i)
-			if ('.' != s.charAt(i) && !Character.isDigit(s.charAt(i))
-					&& !Character.isLetter(s.charAt(i)))
-				break;
-
-		String text = s.substring(from, i);
-		double nval;
-		try {
-			nval = Double.valueOf(text).doubleValue();
-		} catch (NumberFormatException nfe) {
-			tokens.add(makeErrorToken(from, i));
-			return i;
-		}
-
-		tokens.add(new Token(Token.TT_NUMBER, nval, s, from, i));
-		return i;
-	}
-
-	private Token makeErrorToken(int from, int i) {
-		return new Token(Token.TT_ERROR, 0, s, from, i);
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/expr/SyntaxException.java b/blade-engine/src/com/bladecoder/engine/expr/SyntaxException.java
deleted file mode 100644
index a04a6779f..000000000
--- a/blade-engine/src/com/bladecoder/engine/expr/SyntaxException.java
+++ /dev/null
@@ -1,164 +0,0 @@
-// Syntax-error exception.
-// Copyright 1996 by Darius Bacon; see the file COPYING.
-
-package com.bladecoder.engine.expr;
-
-/**
- * An exception indicating a problem in parsing an expression.  It can
- * produce a short, cryptic error message (with getMessage()) or a
- * long, hopefully helpful one (with explain()).
- */
-public class SyntaxException extends Exception {
-
-    /** An error code meaning the input string couldn't reach the end
-        of the input; the beginning constituted a legal expression,
-        but there was unparsable stuff left over. */
-    public static final int INCOMPLETE = 0;
-
-    /** An error code meaning the parser ran into a non-value token
-      (like "/") at a point it was expecting a value (like "42" or
-      "x^2"). */
-    public static final int BAD_FACTOR = 1;
-
-    /** An error code meaning the parser hit the end of its input
-        before it had parsed a full expression. */
-    public static final int PREMATURE_EOF = 2;
-
-    /** An error code meaning the parser hit an unexpected token at a
-        point where it expected to see some particular other token. */
-    public static final int EXPECTED = 3;
-
-    /** An error code meaning the expression includes a variable not
-        on the `allowed' list. */
-    public static final int UNKNOWN_VARIABLE = 4;
-
-    /** Make a new instance.
-     * @param complaint short error message
-     * @param parser the parser that hit this snag
-     * @param reason one of the error codes defined in this class
-     * @param expected if nonnull, the token the parser expected to
-     *        see (in place of the erroneous token it did see)
-     */
-    public SyntaxException(String complaint, 
-			   Parser parser,
-			   int reason, 
-			   String expected) {
-	super(complaint); 
-	this.reason = reason;
-	this.parser = parser;
-	this.scanner = parser.tokens;
-	this.expected = expected;
-    }
-
-    /** Give a long, hopefully helpful error message.
-     * @return the message */
-    public String explain() {
-	StringBuffer sb = new StringBuffer();
-
-	sb.append("I don't understand your formula ");
-	quotify(sb, scanner.getInput());
-	sb.append(".\n\n");
-
-	explainWhere(sb);
-	explainWhy(sb);
-	explainWhat(sb);
-
-	return sb.toString();
-    }
-
-    private Parser parser;
-    private Scanner scanner;
-
-    private int reason;
-    private String expected;
-
-    private String fixedInput = "";
-
-    private void explainWhere(StringBuffer sb) {
-	if (scanner.isEmpty()) {
-	    sb.append("It's empty!\n");
-	} else if (scanner.atStart()) {
-	    sb.append("It starts with ");
-	    quotify(sb, theToken());
-	    if (isLegalToken()) 
-		sb.append(", which can never be the start of a formula.\n");
-	    else
-		sb.append(", which is a meaningless symbol to me.\n");
-	} else {
-	    sb.append("I got as far as ");
-	    quotify(sb, asFarAs());
-	    sb.append(" and then ");
-	    if (scanner.atEnd()) {
-		sb.append("reached the end unexpectedly.\n");
-	    } else {
-		sb.append("saw ");
-		quotify(sb, theToken());
-		if (isLegalToken()) 
-		    sb.append(".\n");
-		else
-		    sb.append(", which is a meaningless symbol to me.\n");
-	    }
-	}
-    }
-
-    private void explainWhy(StringBuffer sb) {
-	switch (reason) {
-	case INCOMPLETE: 
-	    if (isLegalToken())
-		sb.append("The first part makes sense, but I don't see " +
-			  "how the rest connects to it.\n");
-	    break;
-	case BAD_FACTOR:
-	case PREMATURE_EOF:
-	    sb.append("I expected a value");
-	    if (!scanner.atStart()) sb.append(" to follow");
-	    sb.append(", instead.\n");
-	    break;
-	case EXPECTED:
-	    sb.append("I expected ");
-	    quotify(sb, expected);
-	    sb.append(" at that point, instead.\n");
-	    break;
-	case UNKNOWN_VARIABLE:
-	    sb.append("That variable has no value.\n");
-	    break;
-	default:
-	    throw new Error("Can't happen");
-	}
-    }
-
-    private void explainWhat(StringBuffer sb) {
-	fixedInput = tryToFix();
-	if (null != fixedInput) {
-	    sb.append("An example of a formula I can parse is ");
-	    quotify(sb, fixedInput);
-	    sb.append(".\n");
-	}
-    }
-
-    private String tryToFix() {
-	return (parser.tryCorrections() ? scanner.toString() : null);
-    }
-
-    private void quotify(StringBuffer sb, String s) {
-	sb.append('"');
-	sb.append(s);
-	sb.append('"');
-    }
-
-    private String asFarAs() {
-	Token t = scanner.getCurrentToken();
-	int point = t.location - t.leadingWhitespace;
-	return scanner.getInput().substring(0, point);
-    }
-
-    private String theToken() {
-	return scanner.getCurrentToken().sval;
-    }
-
-    private boolean isLegalToken() {
-	Token t = scanner.getCurrentToken();
-	return t.ttype != Token.TT_EOF
-	    && t.ttype != Token.TT_ERROR;
-    }
-}
diff --git a/blade-engine/src/com/bladecoder/engine/expr/Token.java b/blade-engine/src/com/bladecoder/engine/expr/Token.java
deleted file mode 100644
index a10e4873c..000000000
--- a/blade-engine/src/com/bladecoder/engine/expr/Token.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-// A lexical token from an input string.
-
-package com.bladecoder.engine.expr;
-
-class Token {
-    public static final int TT_ERROR  = -1;
-    public static final int TT_EOF    = -2;
-    public static final int TT_NUMBER = -3;
-    public static final int TT_WORD   = -4;
-    public static final int TT_LE     = -5;
-    public static final int TT_NE     = -6;
-    public static final int TT_GE     = -7;
-    public static final int TT_STRING = -8;
-
-    public Token(int ttype, double nval, String input, int start, int end) {
-        this.ttype = ttype;
-        this.sval = input.substring(start, end);
-	this.nval = nval;
-	this.location = start;
-	
-	int count = 0;
-	for (int i = start-1; 0 <= i; --i) {
-	    if (!Character.isWhitespace(input.charAt(i)))
-		break;
-	    ++count;
-	}
-	this.leadingWhitespace = count;
-
-	count = 0;
-	for (int i = end; i < input.length(); ++i) {
-	    if (!Character.isWhitespace(input.charAt(i)))
-		break;
-	    ++count;
-	}
-	this.trailingWhitespace = count;
-    }
-
-    Token(int ttype, double nval, String sval, Token token) {
-	this.ttype = ttype;
-	this.sval = sval;
-	this.nval = nval;
-	this.location = token.location;
-	this.leadingWhitespace = token.leadingWhitespace;
-	this.trailingWhitespace = token.trailingWhitespace;
-    }
-
-    public final int ttype;
-    public final String sval;
-    public final double nval;
-
-    public final int location;
-
-    public final int leadingWhitespace, trailingWhitespace;
-}
diff --git a/blade-engine/src/com/bladecoder/engine/expr/Variable.java b/blade-engine/src/com/bladecoder/engine/expr/Variable.java
deleted file mode 100644
index 8525ea081..000000000
--- a/blade-engine/src/com/bladecoder/engine/expr/Variable.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Variables associate values with names.
-// Copyright 1996 by Darius Bacon; see the file COPYING.
-
-package com.bladecoder.engine.expr;
-
-import java.util.HashMap;
-
-/**
- * A variable is a simple expression with a name (like "x") and a
- * settable value.
- */
-public class Variable extends Expr {
-    private static HashMap<String,Variable> variables = new HashMap<String,Variable>();
-    
-    /**
-     * Return a unique variable named `name'.  There can be only one
-     * variable with the same name returned by this method; that is,
-     * make(s1) == make(s2) if and only if s1.equals(s2).
-     * @param name the variable's name
-     * @return the variable; create it initialized to 0 if it doesn't
-     *         yet exist */
-    static public synchronized Variable make(String name) {
-	Variable result =  variables.get(name);
-	if (result == null)
-	    variables.put(name, result = new Variable(name));
-	return result;
-    }
-
-    private String name;
-    private double val;
-
-    /**
-     * Create a new variable, with initial value 0.
-     * @param name the variable's name
-     */
-    public Variable(String name) { 
-	this.name = name; val = 0; 
-    }
-
-    /** Return the name. */
-    public String toString() { return name; }
-
-    /** Get the value.
-     * @return the current value */
-    public double value() { 
-	return val; 
-    }
-    /** Set the value.
-     * @param value the new value */
-    public void setValue(double value) { 
-	val = value; 
-    }
-
-	@Override
-	public String getStringLiteral() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/i18n/I18N.java b/blade-engine/src/com/bladecoder/engine/i18n/I18N.java
index 9ace08436..b7757facf 100644
--- a/blade-engine/src/com/bladecoder/engine/i18n/I18N.java
+++ b/blade-engine/src/com/bladecoder/engine/i18n/I18N.java
@@ -19,35 +19,66 @@
 import java.util.ResourceBundle;
 
 import com.bladecoder.engine.util.EngineLogger;
-import com.bladecoder.engine.util.I18NControl;
 
 public class I18N {
-	private static ResourceBundle i18nWorld;
-	private static ResourceBundle i18nChapter;
-	
-	public static void loadChapter(String i18nChapterFilename) {
-		Locale locale = Locale.getDefault();
+	public static final char PREFIX = '@';
+	public static final String ENCODING = "UTF-8";
+	// public static final String ENCODING = "ISO-8859-1";
 
+	private ResourceBundle i18nWorld;
+	private ResourceBundle i18nChapter;
+	private Locale locale = Locale.getDefault();
+
+	private String i18nChapterFilename = null;
+	private String i18nWorldFilename = null;
+
+	public void loadChapter(String i18nChapterFilename) {
+		try {
+			i18nChapter = getBundle(i18nChapterFilename, false);
+			this.i18nChapterFilename = i18nChapterFilename;
+		} catch (Exception e) {
+			EngineLogger.error("ERROR LOADING BUNDLE: " + i18nChapterFilename);
+		}
+	}
+
+	public void loadWorld(String i18nWorldFilename) {
 		try {
-			i18nChapter = ResourceBundle.getBundle(i18nChapterFilename, locale,
-					new I18NControl("ISO-8859-1"));
+			i18nWorld = getBundle(i18nWorldFilename, true);
+			this.i18nWorldFilename = i18nWorldFilename;
 		} catch (Exception e) {
-			EngineLogger.error("ERROR LOADING BUNDLE: " + i18nChapter);
+			EngineLogger.error("ERROR LOADING BUNDLE: " + i18nWorldFilename);
 		}
 	}
-	
-	public static void loadWorld(String i18nWorldFilename) {
-		Locale locale = Locale.getDefault();
-		
+
+	public ResourceBundle getBundle(String filename, boolean clearCache) {
+		ResourceBundle rb = null;
+
 		try {
-			i18nWorld = ResourceBundle.getBundle(i18nWorldFilename, locale,
-					new I18NControl("ISO-8859-1"));
+			if (clearCache)
+				ResourceBundle.clearCache();
+
+			rb = ResourceBundle.getBundle(filename, locale, new I18NControl(ENCODING));
 		} catch (Exception e) {
-			EngineLogger.error("ERROR LOADING BUNDLE: " + i18nWorld);
+			EngineLogger.error("ERROR LOADING BUNDLE: " + filename);
+		}
+
+		return rb;
+	}
+
+	public void setLocale(Locale l) {
+		locale = l;
+
+		// RELOAD TRANSLATIONS
+		if (i18nWorld != null) {
+			loadWorld(i18nWorldFilename);
+		}
+
+		if (i18nChapter != null) {
+			loadChapter(i18nChapterFilename);
 		}
 	}
-	
-	public static String getString(String key) {
+
+	public String getString(String key) {
 		try {
 			return i18nChapter.getString(key);
 		} catch (Exception e) {
@@ -59,4 +90,8 @@ public static String getString(String key) {
 			}
 		}
 	}
+
+	public Locale getCurrentLocale() {
+		return locale;
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ink/ExternalFunctions.java b/blade-engine/src/com/bladecoder/engine/ink/ExternalFunctions.java
new file mode 100644
index 000000000..c923f949e
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ink/ExternalFunctions.java
@@ -0,0 +1,148 @@
+package com.bladecoder.engine.ink;
+
+import com.bladecoder.engine.actions.SceneActorRef;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Inventory;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.ink.runtime.Story;
+import com.bladecoder.ink.runtime.Story.ExternalFunction0;
+import com.bladecoder.ink.runtime.Story.ExternalFunction1;
+import com.bladecoder.ink.runtime.Story.ExternalFunction2;
+
+public class ExternalFunctions {
+
+	public static void bindExternalFunctions(final World w, Story story) throws Exception {
+
+		story.bindExternalFunction("inInventory", new ExternalFunction1<String, Boolean>() {
+
+			@Override
+			public Boolean call(String actor) throws Exception {
+				if (actor.charAt(0) == '>')
+					actor = actor.substring(1);
+
+				return w.getInventory().get(actor) != null;
+			}
+		});
+
+		story.bindExternalFunction("getActorState", new ExternalFunction1<String, String>() {
+
+			@Override
+			public String call(String act) throws Exception {
+				if (act.charAt(0) == '>')
+					act = act.substring(1);
+
+				SceneActorRef actor = new SceneActorRef(act);
+				final Scene s = actor.getScene(w);
+
+				String actorId = actor.getActorId();
+
+				InteractiveActor a = (InteractiveActor) s.getActor(actorId, true);
+
+				if (a == null) {
+					EngineLogger.error("getActorState - Actor not found: " + actorId);
+					return "";
+				}
+
+				return a.getState() == null ? "" : a.getState();
+			}
+		});
+
+		story.bindExternalFunction("getSceneState", new ExternalFunction1<String, String>() {
+
+			@Override
+			public String call(String scene) throws Exception {
+				if (scene.charAt(0) == '>')
+					scene = scene.substring(1);
+
+				final Scene s = w.getScene(scene);
+
+				if (s == null) {
+					EngineLogger.error("getSceneState - Scene not found: " + scene);
+					return "";
+				}
+
+				return s.getState() == null ? "" : s.getState();
+			}
+		});
+
+		story.bindExternalFunction("getPlayer", new ExternalFunction0<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return w.getCurrentScene().getPlayer().getId();
+			}
+		});
+
+		story.bindExternalFunction("inInventory2", new ExternalFunction2<String, String, Boolean>() {
+
+			@Override
+			public Boolean call(String actor, String inventory) throws Exception {
+				if (actor.charAt(0) == '>')
+					actor = actor.substring(1);
+
+				Inventory inv = w.getInventories().get(inventory);
+
+				if (inv == null) {
+					EngineLogger.debug("InkExternalFunction::inInventory2: Inventory not found: " + inventory);
+
+					return false;
+				}
+
+				return inv.get(actor) != null;
+			}
+		});
+
+		story.bindExternalFunction("getCurrentScene", new ExternalFunction0<String>() {
+
+			@Override
+			public String call() throws Exception {
+				return w.getCurrentScene().getId();
+			}
+		});
+
+		story.bindExternalFunction("isDebug", new ExternalFunction0<Boolean>() {
+
+			@Override
+			public Boolean call() throws Exception {
+				return EngineLogger.debugMode();
+			}
+		});
+
+		story.bindExternalFunction("getProperty", new ExternalFunction1<String, String>() {
+
+			@Override
+			public String call(String p) throws Exception {
+				if (p.charAt(0) == '>')
+					p = p.substring(1);
+
+				String v = w.getCustomProperty(p);
+				return v == null ? "" : v;
+			}
+		});
+
+		story.bindExternalFunction("isVisible", new ExternalFunction1<String, Boolean>() {
+
+			@Override
+			public Boolean call(String act) throws Exception {
+				if (act.charAt(0) == '>')
+					act = act.substring(1);
+
+				SceneActorRef actor = new SceneActorRef(act);
+				final Scene s = actor.getScene(w);
+
+				String actorId = actor.getActorId();
+
+				InteractiveActor a = (InteractiveActor) s.getActor(actorId, true);
+
+				if (a == null) {
+					EngineLogger.error("getActorState - Actor not found: " + actorId);
+					return false;
+				}
+
+				return a.isVisible();
+			}
+		});
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ink/InkManager.java b/blade-engine/src/com/bladecoder/engine/ink/InkManager.java
new file mode 100644
index 000000000..5f67194f8
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ink/InkManager.java
@@ -0,0 +1,632 @@
+package com.bladecoder.engine.ink;
+
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.reflect.ReflectionException;
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.actions.ActionFactory;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.Text.Type;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.ink.runtime.Choice;
+import com.bladecoder.ink.runtime.InkList;
+import com.bladecoder.ink.runtime.ListDefinition;
+import com.bladecoder.ink.runtime.Story;
+import com.bladecoder.ink.runtime.StoryState;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ResourceBundle;
+
+public class InkManager implements Serializable {
+    public final static int KEY_SIZE = 10;
+    public final static char NAME_VALUE_TAG_SEPARATOR = ':';
+    public final static char NAME_VALUE_PARAM_SEPARATOR = '=';
+    private final static String PARAM_SEPARATOR = ",";
+    public final static char COMMAND_MARK = '>';
+
+    public final static char CHAR_SEPARATOR_MARK = ':';
+
+    private ResourceBundle i18n;
+
+    private Story story = null;
+
+    private boolean wasInCutmode;
+
+    private String storyName;
+
+    private final World w;
+
+    private Thread loaderThread;
+
+    private final HashMap<String, InkVerbRunner> verbRunners = new HashMap<>();
+
+    public InkManager(World w) {
+        this.w = w;
+    }
+
+    /**
+     * This method is called when changing scene. All flows, except default, are
+     * removed.
+     */
+    public void init() {
+        wasInCutmode = false;
+        for (String flow : verbRunners.keySet()) {
+            try {
+                if (flow.equals(StoryState.kDefaultFlowName))
+                    continue;
+
+                story.removeFlow(flow);
+            } catch (Exception e) {
+                EngineLogger.error("InkManager - Cannot remove flow: " + flow);
+            }
+        }
+
+        verbRunners.clear();
+    }
+
+    public void newStory(final String name) throws Exception {
+        loadThreaded(name, null);
+    }
+
+    private void loadStory(String name) {
+        try {
+            FileHandle asset = EngineAssetManager.getInstance()
+                    .getAsset(EngineAssetManager.MODEL_DIR + name + EngineAssetManager.INK_EXT);
+
+            long initTime = System.currentTimeMillis();
+
+            String json = getJsonString(asset.read());
+            story = new Story(json);
+
+            ExternalFunctions.bindExternalFunctions(w, story);
+
+            storyName = name;
+
+            loadI18NBundle();
+
+            EngineLogger.debug("INK STORY LOADING TIME (ms): " + (System.currentTimeMillis() - initTime));
+
+        } catch (Exception e) {
+            EngineLogger.error("Cannot load Ink Story: " + name + " " + e.getMessage());
+            story = null;
+            storyName = null;
+        }
+    }
+
+    private void loadStoryState(String stateString) {
+        try {
+            long initTime = System.currentTimeMillis();
+            story.getState().loadJson(stateString);
+            EngineLogger.debug("INK *SAVED STATE* LOADING TIME (ms): " + (System.currentTimeMillis() - initTime));
+        } catch (Exception e) {
+            EngineLogger.error("Cannot load Ink Story State for: " + storyName + " " + e.getMessage());
+        }
+    }
+
+    public void loadI18NBundle() {
+        if (getStoryName() != null
+                && EngineAssetManager.getInstance().getModelFile(storyName + "-ink.properties").exists())
+            i18n = w.getI18N().getBundle(EngineAssetManager.MODEL_DIR + storyName + "-ink", true);
+    }
+
+    public String translateLine(String line) {
+        if (line.charAt(0) == I18N.PREFIX) {
+            String key = line.substring(1);
+
+            // In ink, several keys can be included in the same line.
+            String[] keys = key.split("@");
+
+            String translated = "";
+
+            for (String k : keys) {
+                try {
+                    // some untranslated words may follow the key
+                    String k2 = k.substring(0, KEY_SIZE);
+                    translated += i18n.getString(k2);
+                    if (k.length() > KEY_SIZE) {
+                        String trailing = k.substring(KEY_SIZE);
+                        translated += trailing;
+                    }
+                } catch (Exception e) {
+                    EngineLogger.error("MISSING TRANSLATION KEY: " + key);
+                    return key;
+                }
+            }
+
+            // In translated lines, spaces can be escaped with '_'.
+            translated = translated.replace('_', ' ');
+
+            return translated;
+        }
+
+        return line;
+    }
+
+    public String getVariable(String name) {
+        return story.getVariablesState().get(name).toString();
+    }
+
+    public boolean compareVariable(String name, String value) {
+        waitIfNotLoaded();
+
+        if (story.getVariablesState().get(name) instanceof InkList) {
+            return ((InkList) story.getVariablesState().get(name)).containsItemNamed(value);
+        } else {
+            return story.getVariablesState().get(name).toString().equals(value == null ? "" : value);
+        }
+    }
+
+    public void setVariable(String name, String value) throws Exception {
+        waitIfNotLoaded();
+
+        if (story.getVariablesState().get(name) instanceof InkList) {
+
+            InkList oldList = (InkList) story.getVariablesState().get(name);
+
+            InkList rawList = new InkList(oldList);
+
+            if (rawList.getOrigins() == null) {
+                List<String> names = rawList.getOriginNames();
+                if (names != null) {
+                    ArrayList<ListDefinition> origins = new ArrayList<>();
+                    for (String n : names) {
+                        ListDefinition def = story.getListDefinitions().getListDefinition(n);
+                        if (!origins.contains(def))
+                            origins.add(def);
+                    }
+                    rawList.setOrigins(origins);
+                }
+            }
+
+            rawList.addItem(value);
+            story.getVariablesState().set(name, rawList);
+        } else {
+            story.getVariablesState().set(name, value);
+        }
+    }
+
+    public void continueMaximally(InkVerbRunner inkVerbRunner) {
+        waitIfNotLoaded();
+
+        String line = null;
+
+        HashMap<String, String> currentLineParams = new HashMap<>();
+
+        if (story.canContinue()) {
+            try {
+                do {
+                    line = story.Continue();
+
+                    // Remove trailing '\n'
+                    if (!line.isEmpty())
+                        line = line.substring(0, line.length() - 1);
+
+                    if (line.isEmpty()) {
+                        EngineLogger.debug("INK EMPTY LINE!");
+                    }
+                } while (line.isEmpty() && story.canContinue());
+
+                if (!line.isEmpty()) {
+                    if (EngineLogger.debugMode())
+                        EngineLogger.debug("INK LINE: " + translateLine(line));
+
+                    processParams(story.getCurrentTags(), currentLineParams);
+
+                    // PROCESS COMMANDS
+                    if (line.charAt(0) == COMMAND_MARK) {
+                        processCommand(inkVerbRunner, currentLineParams, line);
+                    } else {
+                        processTextLine(inkVerbRunner, currentLineParams, line);
+                    }
+                }
+            } catch (Exception e) {
+                EngineLogger.error(e.getMessage(), e);
+            }
+        }
+
+        if (!inkVerbRunner.isFinish()) {
+            inkVerbRunner.runCurrentAction();
+        } else {
+
+            if (hasChoices()) {
+                wasInCutmode = w.inCutMode();
+                w.setCutMode(false);
+                w.getListener().dialogOptions();
+            } else {
+                inkVerbRunner.callCb();
+            }
+        }
+    }
+
+    private void processParams(List<String> input, HashMap<String, String> output) {
+
+        for (String t : input) {
+            String key;
+            String value;
+
+            int i = t.indexOf(NAME_VALUE_TAG_SEPARATOR);
+
+            // support ':' and '=' as param separator
+            if (i == -1)
+                i = t.indexOf(NAME_VALUE_PARAM_SEPARATOR);
+
+            if (i != -1) {
+                key = t.substring(0, i).trim();
+                value = t.substring(i + 1, t.length()).trim();
+            } else {
+                key = t.trim();
+                value = null;
+            }
+
+            EngineLogger.debug("PARAM: " + key + " value: " + value);
+
+            output.put(key, value);
+        }
+    }
+
+    private void processCommand(InkVerbRunner inkVerbRunner, HashMap<String, String> params, String line) {
+        String commandName;
+        String[] commandParams;
+
+        int i = line.indexOf(NAME_VALUE_TAG_SEPARATOR);
+
+        if (i == -1) {
+            commandName = line.substring(1).trim();
+        } else {
+            commandName = line.substring(1, i).trim();
+            commandParams = line.substring(i + 1).split(PARAM_SEPARATOR);
+
+            processParams(Arrays.asList(commandParams), params);
+        }
+
+        if ("LeaveNow".equals(commandName)) {
+            boolean init = true;
+            String initVerb = null;
+
+            if (params.get("init") != null)
+                init = Boolean.parseBoolean(params.get("init"));
+
+            if (params.get("initVerb") != null)
+                initVerb = params.get("initVerb");
+
+            w.setCurrentScene(params.get("scene"), init, initVerb);
+        } else {
+            // Some preliminar validation to see if it's an action
+            if (commandName.length() > 0) {
+                // Try to create action by default
+                Action action;
+
+                try {
+
+                    Class<?> c = ActionFactory.getClassTags().get(commandName);
+
+                    if (c == null && commandName.indexOf('.') == -1) {
+                        commandName = "com.bladecoder.engine.actions." + commandName + "Action";
+                    }
+
+                    action = ActionFactory.create(commandName, params);
+                    action.init(w);
+                    inkVerbRunner.getActions().add(action);
+                } catch (ClassNotFoundException | ReflectionException e) {
+                    EngineLogger.error(e.getMessage(), e);
+                }
+
+            } else {
+                EngineLogger.error("Ink command not found: " + commandName);
+            }
+        }
+    }
+
+    private void processTextLine(InkVerbRunner inkVerbRunner, HashMap<String, String> params, String line) {
+
+        // Get actor name from Line. Actor is separated by '>' or ':'.
+        // ej. "Johnny: Hello punks!"
+        if (!params.containsKey("actor")) {
+            int idx = line.indexOf(COMMAND_MARK);
+
+            if (idx == -1) {
+                idx = line.indexOf(CHAR_SEPARATOR_MARK);
+            }
+
+            if (idx != -1) {
+                params.put("actor", line.substring(0, idx).trim());
+                line = line.substring(idx + 1).trim();
+            }
+        }
+
+        if (!params.containsKey("actor") && w.getCurrentScene().getPlayer() != null) {
+            if (!params.containsKey("type")) {
+                params.put("type", Type.SUBTITLE.toString());
+            }
+        } else if (params.containsKey("actor") && !params.containsKey("type")) {
+            params.put("type", Type.TALK.toString());
+        } else if (!params.containsKey("type")) {
+            params.put("type", Type.SUBTITLE.toString());
+        }
+
+        params.put("text", translateLine(line));
+
+        try {
+            Action action = null;
+
+            if (!params.containsKey("actor")) {
+                action = ActionFactory.create("Text", params);
+            } else {
+                action = ActionFactory.create("Say", params);
+            }
+
+            action.init(w);
+            inkVerbRunner.getActions().add(action);
+        } catch (ClassNotFoundException | ReflectionException e) {
+            EngineLogger.error(e.getMessage(), e);
+        }
+    }
+
+    public Story getStory() {
+        waitIfNotLoaded();
+
+        return story;
+    }
+
+    public void runPath(String path, Object[] params, String flow, ActionCallback cb) throws Exception {
+        waitIfNotLoaded();
+
+        if (story == null) {
+            EngineLogger.error("Ink Story not loaded!");
+            return;
+        }
+
+        if (flow == null) {
+            story.switchToDefaultFlow();
+        } else {
+            story.switchFlow(flow);
+        }
+
+        story.choosePathString(path, true, params);
+        InkVerbRunner verbRunner = createVerbRunner(cb);
+        continueMaximally(verbRunner);
+    }
+
+    private InkVerbRunner createVerbRunner(ActionCallback cb) {
+
+        String f = story.getCurrentFlowName();
+
+        InkVerbRunner prev = verbRunners.put(story.getCurrentFlowName(), new InkVerbRunner(w, this, f, cb, null));
+
+        if (prev != null) {
+            // we cancel it in case there is some action executing
+            prev.cancel();
+        }
+
+        return verbRunners.get(f);
+    }
+
+    public boolean hasChoices() {
+        waitIfNotLoaded();
+
+        if (story == null) {
+            return false;
+        }
+
+        try {
+            story.switchToDefaultFlow();
+        } catch (Exception e) {
+            EngineLogger.error("InkManager: " + e.getMessage());
+            return false;
+        }
+
+        return ((!verbRunners.containsKey(StoryState.kDefaultFlowName)
+                || verbRunners.get(StoryState.kDefaultFlowName).isFinish()) && story.getCurrentChoices().size() > 0);
+    }
+
+    public List<String> getChoices() {
+
+        List<Choice> options = story.getCurrentChoices();
+        List<String> choices = new ArrayList<>(options.size());
+
+        for (Choice o : options) {
+            String line = o.getText();
+
+            // the line maybe empty in default choices.
+            if (line.isEmpty())
+                continue;
+
+            int idx = line.indexOf(COMMAND_MARK);
+
+            if (idx == -1) {
+                idx = line.indexOf(CHAR_SEPARATOR_MARK);
+            }
+
+            if (idx != -1) {
+                line = line.substring(idx + 1).trim();
+            }
+
+            choices.add(translateLine(line));
+        }
+
+        return choices;
+    }
+
+    private String getJsonString(InputStream is) throws IOException {
+
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) {
+            StringBuilder sb = new StringBuilder();
+            String line = br.readLine();
+
+            // Replace the BOM mark
+            if (line != null)
+                line = line.replace('\uFEFF', ' ');
+
+            while (line != null) {
+                sb.append(line);
+                sb.append("\n");
+                line = br.readLine();
+            }
+            return sb.toString();
+        }
+    }
+
+    public void selectChoice(int i) {
+        w.setCutMode(wasInCutmode);
+
+        try {
+            story.switchToDefaultFlow();
+            story.chooseChoiceIndex(i);
+            continueMaximally(verbRunners.get(StoryState.kDefaultFlowName));
+        } catch (Exception e) {
+            EngineLogger.error(e.getMessage(), e);
+        }
+    }
+
+    public String getStoryName() {
+        return storyName;
+    }
+
+    public void setStoryName(String storyName) {
+        this.storyName = storyName;
+    }
+
+    private void waitIfNotLoaded() {
+        if (loaderThread != null && loaderThread.isAlive()) {
+            EngineLogger.debug(">>> Loader thread not finished. Waiting for it!!!");
+            try {
+                loaderThread.join();
+            } catch (InterruptedException e) {
+            }
+        }
+    }
+
+    private void loadThreaded(final String name, final String state) {
+        EngineLogger.debug("LOADING INK STORY: " + name + (state == null ? "" : " WITH SAVED STATE."));
+        loaderThread = new Thread() {
+            @Override
+            public void run() {
+                if (name != null)
+                    loadStory(name);
+
+                if (state != null)
+                    loadStoryState(state);
+            }
+        };
+
+        loaderThread.start();
+    }
+
+    public HashMap<String, InkVerbRunner> getVerbRunners() {
+        return verbRunners;
+    }
+
+    public InkVerbRunner getDefaultVerbRunner() {
+        return verbRunners.get(StoryState.kDefaultFlowName);
+    }
+
+    @Override
+    public void write(Json json) {
+        BladeJson bjson = (BladeJson) json;
+
+        json.writeValue("storyName", storyName);
+
+        if (bjson.getMode() == Mode.STATE) {
+            json.writeValue("wasInCutmode", wasInCutmode);
+
+            // SAVE STORY
+            if (story != null) {
+                try {
+                    json.writeValue("story", story.getState().toJson());
+                } catch (Exception e) {
+                    EngineLogger.error("Error saving Ink state", e);
+                }
+
+                json.writeValue("verbRunners", verbRunners, verbRunners.getClass(), InkVerbRunner.class);
+            }
+        }
+    }
+
+    @Override
+    public void read(Json json, JsonValue jsonData) {
+        BladeJson bjson = (BladeJson) json;
+        World w = bjson.getWorld();
+
+        final String name = json.readValue("storyName", String.class, jsonData);
+
+        if (bjson.getMode() == Mode.MODEL) {
+            story = null;
+            storyName = name;
+
+            // Only load in new game.
+            // If the SAVED_GAME_VERSION property exists we are loading a saved
+            // game and we will load the story in the STATE mode.
+            if (bjson.getInit()) {
+                loadThreaded(name, null);
+            }
+        } else {
+            wasInCutmode = json.readValue("wasInCutmode", Boolean.class, jsonData);
+
+            // READ STORY
+            final String storyString = json.readValue("story", String.class, jsonData);
+            if (storyString != null) {
+                loadThreaded(name, storyString);
+            }
+
+            // FOR BACKWARD COMPATIBILITY
+            if (jsonData.has("actions")) {
+
+                String sCb = json.readValue("cb", String.class, jsonData);
+
+                // READ ACTIONS
+                JsonValue actionsValue = jsonData.get("actions");
+
+                InkVerbRunner inkVerbRunner = new InkVerbRunner(w, this, StoryState.kDefaultFlowName, null, sCb);
+                verbRunners.put(StoryState.kDefaultFlowName, inkVerbRunner);
+
+                for (int i = 0; i < actionsValue.size; i++) {
+                    JsonValue aValue = actionsValue.get(i);
+
+                    Action a = ActionUtils.readJson(w, json, aValue);
+                    inkVerbRunner.getActions().add(a);
+                }
+
+                inkVerbRunner.setIP(json.readValue("ip", Integer.class, jsonData));
+
+                actionsValue = jsonData.get("actionsSer");
+
+                int i = 0;
+
+                for (Action a : inkVerbRunner.getActions()) {
+                    if (a instanceof Serializable && i < actionsValue.size) {
+                        if (actionsValue.get(i) == null)
+                            break;
+
+                        ((Serializable) a).read(json, actionsValue.get(i));
+                        i++;
+                    }
+                }
+            } else {
+                for (int i = 0; i < jsonData.get("verbRunners").size; i++) {
+                    JsonValue jRunner = jsonData.get("verbRunners").get(i);
+
+                    InkVerbRunner inkVerbRunner = new InkVerbRunner(w, this, jRunner.name, null, null);
+                    verbRunners.put(jRunner.name, inkVerbRunner);
+
+                    inkVerbRunner.read(json, jRunner);
+                }
+            }
+        }
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ink/InkVerbRunner.java b/blade-engine/src/com/bladecoder/engine/ink/InkVerbRunner.java
new file mode 100644
index 000000000..33e26cbdb
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ink/InkVerbRunner.java
@@ -0,0 +1,232 @@
+package com.bladecoder.engine.ink;
+
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.model.VerbRunner;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.serialization.ActionCallbackSerializer;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engine.util.EngineLogger;
+
+import java.util.ArrayList;
+
+/**
+ * This VerbRunner instead of increment the IP, it executes the current action
+ * and deletes it from the action list.
+ * <p>
+ * It only maintains the executed action in the action list if it is of
+ * ActionCallback type because ActionCallback actions can be called back and
+ * could be lost after save/load.
+ * <p>
+ * Backward compatibility note: This class can load and execute old savegames
+ * where not multiflow was implemented.
+ *
+ * @author rgarcia
+ */
+public class InkVerbRunner implements VerbRunner, Serializable {
+    private final ArrayList<Action> actions = new ArrayList<>(1);
+    private int ip = 0;
+    private boolean cancelled = false;
+    private final String flow;
+    private ActionCallback cb;
+
+    // Depending on the reading order of Inventory, InkManager and Actor verbs,
+    // the verbCallbacks may not exist. So, we search the Cb lazily when needed.
+    private String sCb;
+
+    private final InkManager inkManager;
+    private final World w;
+
+    public InkVerbRunner(World w, InkManager inkManager, String flow, ActionCallback cb, String sCb) {
+        this.flow = flow;
+        this.cb = cb;
+        this.sCb = sCb;
+        this.inkManager = inkManager;
+        this.w = w;
+    }
+
+    public String getFlow() {
+        return flow;
+    }
+
+    public boolean isFinish() {
+        return actions.isEmpty() || ip >= actions.size() || cancelled;
+    }
+
+    @Override
+    public void resume() {
+        if (cancelled)
+            return;
+
+        // We store in the array only the ActionCallback actions
+        // any other can be discarded after execution
+        if (actions.get(ip) instanceof ActionCallback) {
+            ip++;
+        } else {
+            actions.remove(ip);
+        }
+
+        nextStep();
+    }
+
+    @Override
+    public ArrayList<Action> getActions() {
+        return actions;
+    }
+
+    @Override
+    public void run(String currentTarget, ActionCallback cb) {
+        ip = 0;
+        nextStep();
+    }
+
+    public void runCurrentAction() {
+        nextStep();
+    }
+
+    @Override
+    public int getIP() {
+        return ip;
+    }
+
+    @Override
+    public void setIP(int ip) {
+        this.ip = ip;
+    }
+
+    @Override
+    public void cancel() {
+        cancelled = true;
+        ip = actions.size();
+        cb = null;
+        sCb = null;
+    }
+
+    @Override
+    public String getCurrentTarget() {
+        return null;
+    }
+
+    public void callCb() {
+        if (cb != null || sCb != null) {
+            if (cb == null) {
+                cb = ActionCallbackSerializer.find(w, w.getCurrentScene(), sCb);
+            }
+
+            ActionCallback tmpcb = cb;
+            cb = null;
+            sCb = null;
+            tmpcb.resume();
+        }
+    }
+
+    private void nextStep() {
+        if (cancelled)
+            return;
+
+        try {
+            inkManager.getStory().switchFlow(flow);
+        } catch (Exception e1) {
+            EngineLogger.error("InkManager: " + e1.getMessage());
+            return;
+        }
+
+        boolean stop = false;
+
+        while (ip < actions.size() && !stop && !cancelled) {
+            Action a = actions.get(ip);
+
+            try {
+                if (a.run(this))
+                    stop = true;
+                else {
+                    // We store in the array only the ActionCallback actions
+                    // any other can be discarded after execution
+                    if (a instanceof ActionCallback) {
+                        ip++;
+                    } else {
+                        actions.remove(ip);
+                    }
+                }
+            } catch (Exception e) {
+                EngineLogger.error("EXCEPTION EXECUTING ACTION: InkManager - " + ip + " - "
+                        + a.getClass().getSimpleName() + " - " + e.getMessage(), e);
+                ip++;
+            }
+        }
+
+        if (ip >= actions.size() && !stop)
+            inkManager.continueMaximally(this);
+
+    }
+
+    @Override
+    public void write(Json json) {
+        BladeJson bjson = (BladeJson) json;
+        World w = bjson.getWorld();
+
+        if (cb == null && sCb != null)
+            cb = ActionCallbackSerializer.find(w, w.getCurrentScene(), sCb);
+
+        if (cb != null)
+            json.writeValue("cb", ActionCallbackSerializer.serialize(w, w.getCurrentScene(), cb));
+
+        // SAVE ACTIONS
+        json.writeArrayStart("actions");
+        for (Action a : getActions()) {
+            ActionUtils.writeJson(a, json);
+        }
+        json.writeArrayEnd();
+
+        json.writeValue("ip", getIP());
+
+        json.writeArrayStart("actionsSer");
+        for (Action a : getActions()) {
+            if (a instanceof Serializable) {
+                json.writeObjectStart();
+                ((Serializable) a).write(json);
+                json.writeObjectEnd();
+            }
+        }
+        json.writeArrayEnd();
+    }
+
+    @Override
+    public void read(Json json, JsonValue jsonData) {
+        BladeJson bjson = (BladeJson) json;
+        World w = bjson.getWorld();
+
+        sCb = json.readValue("cb", String.class, jsonData);
+
+        // READ ACTIONS
+        JsonValue actionsValue = jsonData.get("actions");
+
+        for (int i = 0; i < actionsValue.size; i++) {
+            JsonValue aValue = actionsValue.get(i);
+
+            Action a = ActionUtils.readJson(w, json, aValue);
+            getActions().add(a);
+        }
+
+        setIP(json.readValue("ip", Integer.class, jsonData));
+
+        actionsValue = jsonData.get("actionsSer");
+
+        int i = 0;
+
+        for (Action a : getActions()) {
+            if (a instanceof Serializable && i < actionsValue.size) {
+                if (actionsValue.get(i) == null)
+                    break;
+
+                ((Serializable) a).read(json, actionsValue.get(i));
+                i++;
+            }
+        }
+
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/loader/ChapterXMLLoader.java b/blade-engine/src/com/bladecoder/engine/loader/ChapterXMLLoader.java
deleted file mode 100644
index 4d22550b5..000000000
--- a/blade-engine/src/com/bladecoder/engine/loader/ChapterXMLLoader.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.loader;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import com.badlogic.gdx.math.Polygon;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.math.Vector3;
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionFactory;
-import com.bladecoder.engine.actions.Param;
-import com.bladecoder.engine.anim.AtlasFrameAnimation;
-import com.bladecoder.engine.anim.Tween;
-import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.AtlasRenderer;
-import com.bladecoder.engine.model.Dialog;
-import com.bladecoder.engine.model.DialogOption;
-import com.bladecoder.engine.model.ImageRenderer;
-import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.model.SpineRenderer;
-import com.bladecoder.engine.model.Sprite3DRenderer;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.Verb;
-import com.bladecoder.engine.model.VerbManager;
-import com.bladecoder.engine.model.SpriteActor.DepthType;
-import com.bladecoder.engine.polygonalpathfinder.PolygonalNavGraph;
-import com.bladecoder.engine.util.EngineLogger;
-
-public class ChapterXMLLoader extends DefaultHandler {
-	private BaseActor actor;
-	private Scene scene;
-
-	private Verb currentVerb;
-	private Dialog currentDialog;
-	private DialogOption currentOption;
-	private String initFrameAnimation = null;
-	private String player = null;
-
-	private float scale;
-
-	private Locator locator;
-
-	private List<Scene> scenes = new ArrayList<Scene>();
-	private String initScene;
-
-	public ChapterXMLLoader() {
-		scale = EngineAssetManager.getInstance().getScale();
-	}
-
-	public String getInitScene() {
-		return initScene;
-	}
-
-	public void startElement(String namespaceURI, String localName,
-			String qName, Attributes atts) throws SAXException {
-
-		if (currentVerb != null) {
-			parseAction(localName, atts, actor != null ? actor.getId() : null);
-		} else if (currentDialog != null) {
-
-			if (!localName.equals("option")) {
-				SAXParseException e2 = new SAXParseException(
-						"Only 'option' tag allowed in dialogs", locator);
-				error(e2);
-				throw e2;
-			}
-
-			String text = atts.getValue("text");
-			String responseText = atts.getValue("response_text");
-			String verb = atts.getValue("verb");
-			String next = atts.getValue("next");
-
-			if (verb != null && verb.trim().isEmpty())
-				verb = null;
-
-			if (text == null || text.trim().isEmpty()) {
-				SAXParseException e2 = new SAXParseException(
-						"'text' atribute mandatory for <option> tag", locator);
-				error(e2);
-				throw e2;
-			}
-
-			String visibleStr = atts.getValue("visible");
-
-			DialogOption o = new DialogOption();
-			o.setText(text);
-			o.setResponseText(responseText);
-			o.setVerbId(verb);
-			o.setNext(next);
-			o.setParent(currentOption);
-
-			if (visibleStr != null && !visibleStr.trim().isEmpty()) {
-				o.setVisible(Boolean.parseBoolean(visibleStr));
-			}
-
-			currentOption = o;
-
-			if (o.getParent() == null)
-				currentDialog.addOption(o);
-			else
-				o.getParent().addOption(o);
-
-		} else if (localName.equals("actor")) {
-			String type = atts.getValue("type");
-
-			if (type == null || type.isEmpty()) {
-				SAXParseException e2 = new SAXParseException(
-						"BaseActor 'type' attribute not found or empty", locator);
-				error(e2);
-				throw e2;
-			}
-
-			if (type.equals("no_renderer")) {
-				actor = new BaseActor();
-			} else {
-				actor = new SpriteActor();
-
-				if (type.equals("atlas")) { // ATLAS RENDERER
-					((SpriteActor) actor).setRenderer(new AtlasRenderer());
-				} else if (type.equals("image")) { // IMAGE RENDERER
-					((SpriteActor) actor).setRenderer(new ImageRenderer());					
-				} else if (type.equals("3d")) { // 3D RENDERER
-					Sprite3DRenderer r = new Sprite3DRenderer();
-					((SpriteActor) actor).setRenderer(r);
-
-					Vector3 camPos, camRot;
-					float fov = 67;
-
-					try {
-						Vector2 spriteSize = Param.parseVector2(atts
-								.getValue("sprite_size"));
-
-						spriteSize.x *= scale;
-						spriteSize.y *= scale;
-
-						r.setSpriteSize(spriteSize);
-
-						if (atts.getValue("cam_pos") != null) {
-
-							camPos = Param.parseVector3(atts
-									.getValue("cam_pos"));
-
-							r.setCameraPos(camPos.x, camPos.y, camPos.z);
-						}
-
-						if (atts.getValue("cam_rot") != null) {
-							camRot = Param.parseVector3(atts
-									.getValue("cam_rot"));
-
-							r.setCameraRot(camRot.x, camRot.y, camRot.z);
-						}
-
-						fov = Float.parseFloat(atts.getValue("fov"));
-						r.setCameraFOV(fov);
-
-						if (atts.getValue("camera_name") != null) {
-							r.setCameraName(atts.getValue("camera_name"));
-						}
-
-					} catch (Exception e) {
-						SAXParseException e2 = new SAXParseException(
-								"Wrong sprite3d params", locator, e);
-						error(e2);
-						throw e2;
-					}
-
-				} else if (type.equals("spine")) { // SPINE RENDERER
-					SpineRenderer r = new SpineRenderer();
-					((SpriteActor) actor).setRenderer(r);
-				}
-
-				if (atts.getValue("walking_speed") != null
-						&& !atts.getValue("walking_speed").isEmpty()) {
-					float s = Float.parseFloat(atts.getValue("walking_speed"))
-							* scale;
-					((SpriteActor) actor).setWalkingSpeed(s);
-				}
-
-				initFrameAnimation = atts.getValue("init_frame_animation");
-
-				// PARSE DEPTH MAP USE
-				String depthType = atts.getValue("depth_type");
-				((SpriteActor) actor).setDepthType(DepthType.NONE);
-
-				if (depthType != null && !depthType.isEmpty()) {
-					if (depthType.equals("vector"))
-						((SpriteActor) actor).setDepthType(DepthType.VECTOR);
-				}
-			}
-			
-
-			String id = atts.getValue("id");
-			String desc = atts.getValue("desc");
-
-			String state = atts.getValue("state");
-
-			if (id == null || id.isEmpty()) {
-				SAXParseException e2 = new SAXParseException(
-						"BaseActor 'id' attribute not found or empty", locator);
-				error(e2);
-				throw e2;
-			}
-
-			actor.setId(id);
-
-			if (desc != null)
-				actor.setDesc(desc);
-
-			if (state != null)
-				actor.setState(state);					
-
-			// PARSE BBOX
-			Polygon p = null;
-
-			if (atts.getValue("bbox") != null) {
-
-				try {
-					p = Param.parsePolygon(atts.getValue("bbox"));
-					p.setScale(scale, scale);
-				} catch (NumberFormatException e) {
-					SAXParseException e2 = new SAXParseException(
-							"Wrong Bounding Box Definition", locator, e);
-					error(e2);
-					throw e2;
-				}
-
-				actor.setBbox(p);
-			} else if (type.equals("no_renderer")) {
-				SAXParseException e2 = new SAXParseException(
-						"Bounding box definition not set for actor", locator);
-				error(e2);
-				throw e2;
-			} else {
-				p = new Polygon();
-				actor.setBbox(p);
-				((SpriteActor) actor).setBboxFromRenderer(true);
-			}	
-
-			// PARSE POSTITION
-			Vector2 pos = Param.parseVector2(atts.getValue("pos"));
-			if (pos == null) {
-				SAXParseException e2 = new SAXParseException(
-						"Wrong actor XML position", locator);
-				error(e2);
-				throw e2;
-			}
-
-			pos.x *= scale;
-			pos.y *= scale;
-
-			actor.setPosition(pos.x, pos.y);
-
-			if (atts.getValue("interaction") != null) {
-				boolean interaction = Boolean.parseBoolean(atts
-						.getValue("interaction"));
-				actor.setInteraction(interaction);
-			}
-
-			if (atts.getValue("visible") != null) {
-				boolean visible = Boolean
-						.parseBoolean(atts.getValue("visible"));
-				actor.setVisible(visible);
-			}
-
-			if (atts.getValue("obstacle") != null) {
-				boolean obstacle = Boolean.parseBoolean(atts
-						.getValue("obstacle"));
-				actor.setWalkObstacle(obstacle);
-			}
-
-			String layerStr = atts.getValue("layer");
-			
-			if(layerStr.equals("background")) {
-				actor.setLayer(BaseActor.ActorLayer.BACKGROUND);
-			} else if(layerStr.equals("foreground")) {
-				actor.setLayer(BaseActor.ActorLayer.FOREGROUND);			
-			} else {
-				actor.setLayer(BaseActor.ActorLayer.DYNAMIC);
-			}
-			
-			scene.addActor(actor);
-
-		} else if (localName.equals("frame_animation")) {
-
-			if (actor == null || !(actor instanceof SpriteActor)) {
-				SAXParseException e = new SAXParseException(
-						"'frame_animation' TAG must be inside sprite actors",
-						locator);
-				error(e);
-				throw e;
-			}
-
-			String speedstr = atts.getValue("speed");
-			String animationTypestr = atts.getValue("animation_type");
-			String delaystr = atts.getValue("delay");
-			String countstr = atts.getValue("count");
-			String soundId = atts.getValue("sound");
-			String inDstr = atts.getValue("inD");
-			String outDstr = atts.getValue("outD");
-			String preloadstr = atts.getValue("preload");
-			String disposewhenplayedstr = atts.getValue("dispose_when_played");
-
-			float speed = 1f;
-			float delay = 0f;
-			int animationType;
-			int count = Tween.INFINITY;
-			Vector2 inD = null, outD = null;
-			boolean preload = true;
-			boolean disposeWhenPlayed = false;
-
-			String id = atts.getValue("id");
-
-			if (id == null || id.isEmpty()) {
-				SAXParseException e = new SAXParseException(
-						"Animation 'id' not found or empty", locator);
-				error(e);
-				throw e;
-			}
-
-			String source = atts.getValue("source");
-			if (source == null || source.isEmpty()) {
-				SAXParseException e2 = new SAXParseException(
-						"Source name not found or empty", locator);
-				error(e2);
-				throw e2;
-			}
-
-			try {
-				if (speedstr != null && !speedstr.isEmpty())
-					speed = Float.parseFloat(speedstr);
-
-				if (delaystr != null && !delaystr.isEmpty())
-					delay = Float.parseFloat(delaystr);
-
-				if (countstr != null && !countstr.isEmpty())
-					count = Integer.parseInt(countstr);
-
-				if (preloadstr != null && !preloadstr.isEmpty())
-					preload = Boolean.parseBoolean(preloadstr);
-
-				if (disposewhenplayedstr != null
-						&& !disposewhenplayedstr.isEmpty())
-					disposeWhenPlayed = Boolean
-							.parseBoolean(disposewhenplayedstr);
-
-				if (inDstr != null && !inDstr.isEmpty()) {
-					inD = Param.parseVector2(inDstr);
-				}
-
-				if (outDstr != null && !outDstr.isEmpty()) {
-					outD = Param.parseVector2(outDstr);
-				}
-
-			} catch (NumberFormatException e) {
-				SAXParseException e2 = new SAXParseException(
-						"Wrong Sprite Animation parameters", locator, e);
-				error(e2);
-				throw e2;
-			}
-
-			if (animationTypestr == null || animationTypestr.isEmpty()
-					|| animationTypestr.equalsIgnoreCase("repeat")) {
-				animationType = Tween.REPEAT;
-			} else if (animationTypestr.equalsIgnoreCase("reverse")) {
-				animationType = Tween.REVERSE;
-			} else if (animationTypestr.equalsIgnoreCase("yoyo")) {
-				animationType = Tween.PINGPONG;
-			} else {
-				animationType = Tween.NO_REPEAT;
-			}
-
-			AtlasFrameAnimation sa = new AtlasFrameAnimation();
-
-			sa.set(id, source, speed, delay, count, animationType, soundId,
-					inD, outD, preload, disposeWhenPlayed);
-
-			((SpriteActor) actor).getRenderer().addFrameAnimation(sa);
-		} else if (localName.equals("verb")) {
-			parseVerb(localName, atts, actor != null ? actor.getVerbManager()
-					: scene.getVerbManager());
-		} else if (localName.equals("dialog")) {
-			String id = atts.getValue("id");
-
-			currentDialog = new Dialog();
-			currentDialog.setId(id);
-			currentDialog.setActor(actor.getId());
-			currentOption = null;
-
-			actor.addDialog(id, currentDialog);
-		} else if (localName.equals("sound")) {
-			parseSound(localName, atts, actor);
-		} else if (localName.equals("chapter")) {
-			initScene = atts.getValue("init_scene");
-		} else if (localName.equals("walk_zone")) {
-			PolygonalNavGraph polygonalPathFinder = new PolygonalNavGraph();
-			Polygon poly = Param.parsePolygon(atts.getValue("polygon"),
-					atts.getValue("pos"));
-			poly.setScale(scale, scale);
-			poly.setPosition(poly.getX() * scale, poly.getY() * scale);
-			polygonalPathFinder.setWalkZone(poly);
-
-			scene.setPolygonalNavGraph(polygonalPathFinder);
-		} else if (localName.equals("obstacle")) {
-			PolygonalNavGraph polygonalPathFinder = scene
-					.getPolygonalNavGraph();
-			Polygon poly = Param.parsePolygon(atts.getValue("polygon"),
-					atts.getValue("pos"));
-			poly.setScale(scale, scale);
-			poly.setPosition(poly.getX() * scale, poly.getY() * scale);
-			polygonalPathFinder.addObstacle(poly);
-		} else if (localName.equals("scene")) {
-			this.scene = new Scene();
-			scenes.add(scene);
-
-			if (initScene == null)
-				initScene = this.scene.getId();
-
-			String idScn = atts.getValue("id");
-			String bgFilename = atts.getValue("background");
-			String lightmap = atts.getValue("lightmap");
-			String musicFilename = atts.getValue("music");
-			String loopMusicStr = atts.getValue("loop_music");
-			String initialMusicDelayStr = atts.getValue("initial_music_delay");
-			String repeatMusicDelayStr = atts.getValue("repeat_music_delay");
-
-			scene.setDepthVector(Param.parseVector2(atts
-					.getValue("depth_vector")));
-			player = atts.getValue("player");
-
-			if (idScn == null || idScn.isEmpty()) {
-				SAXParseException e2 = new SAXParseException(
-						"Scene 'id' not found or empty", locator);
-				error(e2);
-				throw e2;
-			}
-
-			scene.setId(idScn);
-
-			scene.setBackground(bgFilename, lightmap);
-
-			if (musicFilename != null) {
-				boolean loopMusic = false;
-				float initialDelay = 0;
-				float repeatDelay = -1;
-
-				if (loopMusicStr != null)
-					loopMusic = Boolean.parseBoolean(loopMusicStr);
-				if (initialMusicDelayStr != null)
-					initialDelay = Float.parseFloat(initialMusicDelayStr);
-				if (repeatMusicDelayStr != null)
-					repeatDelay = Float.parseFloat(repeatMusicDelayStr);
-
-				scene.setMusic(musicFilename, loopMusic, initialDelay,
-						repeatDelay);
-			}
-		} else {
-//			SAXParseException e = new SAXParseException("Wrong label '"
-//					+ localName + "' loading Scene.", locator);
-//			error(e);
-//			throw e;
-			EngineLogger.error("TAG not supported in Chapter document: "  + localName + " LINE: " + locator.getLineNumber());
-		}
-	}
-
-	@Override
-	public void endElement(String namespaceURI, String localName, String qName)
-			throws SAXException {
-
-		if (localName.equals("verb"))
-			currentVerb = null;
-		else if (localName.equals("dialog"))
-			currentDialog = null;
-		else if (localName.equals("option"))
-			currentOption = currentOption.getParent();
-		else if (localName.equals("actor")) {
-			if (actor instanceof SpriteActor && initFrameAnimation != null
-					&& !initFrameAnimation.isEmpty()) {
-				((SpriteActor) actor).getRenderer().setInitFrameAnimation(
-						initFrameAnimation);
-			}
-
-			actor = null;
-		} else if (localName.equals("scene")) {
-			scene.setPlayer((SpriteActor) scene.getActor(player, false));
-		}
-	}
-
-	private void parseSound(String localName, Attributes atts, BaseActor actor)
-			throws SAXException {
-		String id = atts.getValue("id");
-		String filename = atts.getValue("filename");
-		String loopStr = atts.getValue("loop");
-		String volumeStr = atts.getValue("volume");
-
-		boolean loop = false;
-		float volume = 1f;
-
-		if (filename == null || filename.isEmpty())
-			error(new SAXParseException("Sound 'filename' not found or empty",
-					locator));
-
-		if (loopStr != null && !loopStr.isEmpty()) {
-			loop = Boolean.parseBoolean(loopStr);
-		}
-
-		if (volumeStr != null && !volumeStr.isEmpty()) {
-			volume = Float.parseFloat(volumeStr);
-		}
-
-		if (id == null || id.isEmpty())
-			id = filename;
-
-		actor.addSound(id, filename, loop, volume);
-	}
-
-	private void parseVerb(String localName, Attributes atts, VerbManager v) {
-
-		String id = atts.getValue("id");
-		String target = atts.getValue("target");
-		String state = atts.getValue("state");
-
-		if (target != null)
-			id = id + "." + target;
-
-		if (state != null)
-			id = id + "." + state;
-
-		currentVerb = new Verb(id);
-
-		v.addVerb(id, currentVerb);
-	}
-
-	
-	private final HashMap<String, String> actionParams = new HashMap<String, String>();
-	
-	private void parseAction(String localName, Attributes atts, String actor) {
-
-		if (localName.equals("action")) {
-			String actionName = null;
-			Action action = null;
-			String actionClass = null;
-			actionParams.clear();
-
-			for (int i = 0; i < atts.getLength(); i++) {
-				String attName = atts.getLocalName(i);
-
-				if (attName.equals("class")) {
-					actionClass = atts.getValue(attName);
-				} else if (attName.equals("action_name")) {
-					actionName = atts.getValue(attName);
-				} else {
-					String value = atts.getValue(attName);
-
-					actionParams.put(attName, value);
-				}
-			}
-
-			if (atts.getValue("actor") == null)
-				actionParams.put("actor", actor);
-
-			if (actionClass != null) {
-				action = ActionFactory.createByClass(actionClass, actionParams);
-			} else if (actionName != null) {
-				action = ActionFactory.create(actionName, actionParams);
-			}
-
-			if (action != null) {
-				currentVerb.add(action);
-			}
-		} else {
-			EngineLogger.error("TAG not supported inside VERB: "  + localName + " LINE: " + locator.getLineNumber());
-		}
-	}
-
-	public List<Scene> getScenes() {
-		return scenes;
-	}
-
-	@Override
-	public void setDocumentLocator(Locator l) {
-		locator = l;
-	}
-
-	@Override
-	public void error(SAXParseException e) throws SAXException {
-		EngineLogger.error(MessageFormat.format(
-				"{0} Line: {1} Column: {2}. {3}", actor.getId(),
-				e.getLineNumber(), e.getColumnNumber(), e.getMessage()));
-		EngineLogger.error("CAUSA", (Exception) e.getCause());
-	}
-
-}
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/loader/WorldXMLLoader.java b/blade-engine/src/com/bladecoder/engine/loader/WorldXMLLoader.java
deleted file mode 100644
index e3e1da733..000000000
--- a/blade-engine/src/com/bladecoder/engine/loader/WorldXMLLoader.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.loader;
-
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.HashMap;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionFactory;
-import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.i18n.I18N;
-import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.model.Verb;
-import com.bladecoder.engine.model.VerbManager;
-import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.util.EngineLogger;
-
-public class WorldXMLLoader extends DefaultHandler {
-	private static final String WORLD_FILENAME = "world.xml";
-	
-	private World world;
-
-	private Verb currentVerb;
-
-	private float scale;
-
-	private Locator locator;
-
-	public static void loadWorld(World world)
-			throws ParserConfigurationException, SAXException, IOException {
-		SAXParserFactory spf = SAXParserFactory.newInstance();
-		spf.setNamespaceAware(true);
-		SAXParser saxParser = spf.newSAXParser();
-
-		WorldXMLLoader parser = new WorldXMLLoader(world);
-		XMLReader xmlReader = saxParser.getXMLReader();
-		xmlReader.setContentHandler(parser);
-		xmlReader.parse(new InputSource(EngineAssetManager.getInstance()
-				.getModelFile(WORLD_FILENAME).read()));
-		
-		I18N.loadWorld(EngineAssetManager.MODEL_DIR + "world");
-	}
-	
-
-	public static void loadChapter(String chapter, World world)
-			throws ParserConfigurationException, SAXException, IOException {
-		if (chapter == null) {
-			chapter = world.getInitChapter();
-		}
-
-		SAXParserFactory spf = SAXParserFactory.newInstance();
-		spf.setNamespaceAware(true);
-		SAXParser saxParser = spf.newSAXParser();
-
-		ChapterXMLLoader parser = new ChapterXMLLoader();
-		XMLReader xmlReader = saxParser.getXMLReader();
-		xmlReader.setContentHandler(parser);
-		xmlReader.parse(new InputSource(EngineAssetManager.getInstance()
-				.getModelFile(chapter + ".chapter").read()));
-
-		I18N.loadChapter(EngineAssetManager.MODEL_DIR + chapter);
-
-		world.setChapter(chapter);
-
-		for (Scene s : parser.getScenes()) {
-			s.resetCamera(world.getWidth(), world.getHeight());
-
-			world.addScene(s);
-		}
-
-		if (parser.getInitScene() != null)
-			world.setCurrentScene(parser.getInitScene());
-		else if (parser.getScenes().size() > 0)
-			world.setCurrentScene(parser.getScenes().get(0).getId());
-	}	
-
-	public WorldXMLLoader(World world) {
-		this.world = world;
-	}
-
-	@Override
-	public void startElement(String namespaceURI, String localName,
-			String qName, Attributes atts) throws SAXException {
-
-		if (currentVerb != null) {
-			parseAction(localName, atts);
-		} else if (localName.equals("world")) {
-			int width, height;
-
-			try {
-				width = Integer.parseInt(atts.getValue("width"));
-				height = Integer.parseInt(atts.getValue("height"));
-
-				// When we know the world width, we can put the scale
-				EngineAssetManager.getInstance().setScale(width, height);
-				scale = EngineAssetManager.getInstance().getScale();
-
-				width = (int) (width * scale);
-				height = (int) (height * scale);
-
-			} catch (NumberFormatException e) {
-				SAXParseException e2 = new SAXParseException(
-						"World 'width' or 'height' missing or incorrect in XML.",
-						locator);
-				error(e2);
-				throw e2;
-			}
-
-			world.setWidth(width);
-			world.setHeight(height);
-			world.setInitChapter(atts.getValue("init_chapter"));
-		} else if (localName.equals("verb")) {
-			String id = atts.getValue("id");
-
-			currentVerb = new Verb(id);
-
-			VerbManager.addDefaultVerb(id, currentVerb);
-		}
-	}
-
-	@Override
-	public void endElement(String namespaceURI, String localName, String qName)
-			throws SAXException {
-
-		if (localName.equals("verb")) {
-			currentVerb = null;
-		}
-	}
-
-	private void parseAction(String localName, Attributes atts) {
-
-		if (localName.equals("action")) {
-			String actionName = null;
-			Action action = null;
-			HashMap<String, String> params = new HashMap<String, String>();
-			String actionClass = null;
-
-			for (int i = 0; i < atts.getLength(); i++) {
-				String attName = atts.getLocalName(i);
-
-				if (attName.equals("class")) {
-					actionClass = atts.getValue(attName);
-				} else if (attName.equals("action_name")) {
-					actionName = atts.getValue(attName);
-				} else {
-					String value = atts.getValue(attName);
-
-					params.put(attName, value);
-				}
-			}
-
-			if (actionClass != null) {
-				action = ActionFactory.createByClass(actionClass, params);
-			} else if (actionName != null) {
-				action = ActionFactory.create(actionName, params);
-			}
-
-			if (action != null) {
-				currentVerb.add(action);
-			}
-		} else {
-			EngineLogger.error("TAG not supported inside VERB: " + localName
-					+ " LINE: " + locator.getLineNumber());
-		}
-	}
-
-	@Override
-	public void setDocumentLocator(Locator l) {
-		locator = l;
-	}
-
-	@Override
-	public void error(SAXParseException e) throws SAXException {
-		EngineLogger.error(MessageFormat.format(
-				"{0} in 'world.xml' Line: {1} Column: {2}", e.getMessage(),
-				e.getLineNumber(), e.getColumnNumber()));
-	}
-
-}
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/model/SpriteRenderer.java b/blade-engine/src/com/bladecoder/engine/model/ActorRenderer.java
similarity index 56%
rename from blade-engine/src/com/bladecoder/engine/model/SpriteRenderer.java
rename to blade-engine/src/com/bladecoder/engine/model/ActorRenderer.java
index d7944a0da..d1f51c307 100644
--- a/blade-engine/src/com/bladecoder/engine/model/SpriteRenderer.java
+++ b/blade-engine/src/com/bladecoder/engine/model/ActorRenderer.java
@@ -15,39 +15,33 @@
  ******************************************************************************/
 package com.bladecoder.engine.model;
 
-import java.util.HashMap;
-
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.math.Polygon;
 import com.badlogic.gdx.utils.Json.Serializable;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.anim.FrameAnimation;
 import com.bladecoder.engine.assets.AssetConsumer;
 
-public interface SpriteRenderer extends Serializable, AssetConsumer {
+public interface ActorRenderer extends Serializable, AssetConsumer {
 
 	public void update(float delta);
-	public void draw(SpriteBatch batch, float x, float y, float scale);
-	
+
+	public void draw(SpriteBatch batch, float x, float y, float scaleX, float scaleY, float rotation, Color tint);
+
 	public float getWidth();
+
 	public float getHeight();
-	
-	public FrameAnimation getCurrentFrameAnimation();
-	public String getCurrentFrameAnimationId();
-	
-	public void lookat(float x, float y, Vector2 pf);
-	public void lookat(String direction);
-	public void stand();
-	public void startWalkFA(Vector2 p0, Vector2 pf);
-	public void startFrameAnimation(String id, int repeatType,
-			int count, ActionCallback cb);
-	
-	
-	public void addFrameAnimation(FrameAnimation fa);
-	public void setInitFrameAnimation(String fa);
-	public String getInitFrameAnimation();
-	
-	public String[] getInternalAnimations(String source);
-	public HashMap<String, FrameAnimation> getFrameAnimations();
-}
 
+	public int getOrgAlign();
+
+	public void setOrgAlign(int align);
+
+	/**
+	 * Compute the bbox based in the size of the animation/sprite. T
+	 * 
+	 * @param bbox The polygon to update. It will be updated when an animation
+	 *             starts/finishes.
+	 */
+	public void updateBboxFromRenderer(Polygon bbox);
+
+	public void setWorld(World world);
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/AnchorActor.java b/blade-engine/src/com/bladecoder/engine/model/AnchorActor.java
new file mode 100644
index 000000000..bd7a162d7
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/AnchorActor.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.model;
+
+
+/**
+ * Actor to anchor the position or walking targets for other actors.
+ * 
+ * @author rgarcia
+ */
+public class AnchorActor extends BaseActor {
+	@Override
+	public void update(float delta) {
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/AnimationRenderer.java b/blade-engine/src/com/bladecoder/engine/model/AnimationRenderer.java
new file mode 100644
index 000000000..bf4cb0c21
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/AnimationRenderer.java
@@ -0,0 +1,455 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.model;
+
+import java.util.HashMap;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import com.badlogic.gdx.math.Polygon;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+
+public abstract class AnimationRenderer implements ActorRenderer {
+
+	public final static String BACK = "back";
+	public final static String FRONT = "front";
+	public final static String RIGHT = "right";
+	public final static String LEFT = "left";
+	public final static String BACKRIGHT = "backright";
+	public final static String BACKLEFT = "backleft";
+	public final static String FRONTRIGHT = "frontright";
+	public final static String FRONTLEFT = "frontleft";
+
+	private final static float DEFAULT_DIM = 200;
+
+	protected HashMap<String, AnimationDesc> fanims = new HashMap<>();
+
+	/** Starts this anim the first time that the scene is loaded */
+	protected String initAnimation;
+
+	protected AnimationDesc currentAnimation;
+
+	protected CacheEntry currentSource;
+	protected boolean flipX;
+
+	protected final HashMap<String, CacheEntry> sourceCache = new HashMap<>();
+	protected Polygon bbox;
+
+	protected World world;
+
+	public class CacheEntry {
+		public int refCounter;
+	}
+
+	protected int orgAlign = Align.left;
+
+	public abstract void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb);
+
+	public abstract void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb,
+			String direction);
+
+	public abstract void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb, Vector2 p0,
+			Vector2 pf);
+
+	public abstract String[] getInternalAnimations(AnimationDesc anim);
+
+	public AnimationDesc getCurrentAnimation() {
+		return currentAnimation;
+	}
+
+	@Override
+	public float getWidth() {
+		return DEFAULT_DIM;
+	}
+
+	@Override
+	public float getHeight() {
+		return DEFAULT_DIM;
+	}
+
+	public static float getAlignDx(float width, int align) {
+		if ((align & Align.left) != 0)
+			return 0;
+		else if ((align & Align.right) != 0)
+			return -width;
+		else if ((align & Align.center) != 0)
+			return -width / 2.0f;
+
+		return -width / 2.0f;
+	}
+
+	public static float getAlignDy(float height, int align) {
+		if ((align & Align.bottom) != 0)
+			return 0;
+		else if ((align & Align.top) != 0)
+			return -height;
+		else if ((align & Align.center) != 0)
+			return -height / 2.0f;
+
+		return 0;
+	}
+
+	public String getCurrentAnimationId() {
+		if (currentAnimation == null)
+			return null;
+
+		String id = currentAnimation.id;
+
+		if (flipX) {
+			id = getFlipId(id);
+		}
+
+		return id;
+
+	}
+
+	/**
+	 * Checks if the character faces the target point to avoid changing the
+	 * animation.
+	 */
+	public boolean changeDir(Vector2 p0, Vector2 pf) {
+		int idx = getCurrentAnimationId().indexOf('.');
+
+		if (idx == -1) {
+			return true;
+		}
+
+		String id = getCurrentAnimationId().substring(0, idx);
+
+		String directionString = getDirectionString(p0, pf, getDirs(id, fanims));
+
+		if (getCurrentAnimationId().substring(idx + 1).equals(directionString)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder(super.toString());
+
+		sb.append("\n  Anims:");
+
+		for (String v : fanims.keySet()) {
+			sb.append(" ").append(v);
+		}
+
+		if (currentAnimation != null)
+			sb.append("\n  Current Anim: ").append(currentAnimation.id);
+
+		sb.append("\n");
+
+		return sb.toString();
+	}
+
+	@Override
+	public void updateBboxFromRenderer(Polygon bbox) {
+		this.bbox = bbox;
+		computeBbox();
+	}
+
+	protected void computeBbox() {
+		if (bbox == null)
+			return;
+
+		if (bbox.getVertices() == null || bbox.getVertices().length != 8) {
+			bbox.setVertices(new float[8]);
+		}
+
+		float dx = getAlignDx(getWidth(), orgAlign);
+		float dy = getAlignDy(getHeight(), orgAlign);
+
+		float[] verts = bbox.getVertices();
+
+		verts[0] = dx;
+		verts[1] = dy;
+
+		verts[2] = dx;
+		verts[3] = getHeight() + dy;
+
+		verts[4] = getWidth() + dx;
+		verts[5] = getHeight() + dy;
+
+		verts[6] = getWidth() + dx;
+		verts[7] = dy;
+		bbox.dirty();
+	}
+
+	public void addAnimation(AnimationDesc fa) {
+		if (initAnimation == null)
+			initAnimation = fa.id;
+
+		fanims.put(fa.id, fa);
+	}
+
+	public HashMap<String, AnimationDesc> getAnimations() {
+		return fanims;
+	}
+
+	public void setInitAnimation(String fa) {
+		initAnimation = fa;
+	}
+
+	public String getInitAnimation() {
+		return initAnimation;
+	}
+
+	@Override
+	public int getOrgAlign() {
+		return orgAlign;
+	}
+
+	@Override
+	public void setOrgAlign(int align) {
+		orgAlign = align;
+	}
+
+	protected AnimationDesc getAnimation(String id) {
+		AnimationDesc fa = fanims.get(id);
+		flipX = false;
+
+		if (fa == null && id.indexOf('.') != -1) {
+			// Search for flipped
+			String flipId = getFlipId(id);
+
+			fa = fanims.get(flipId);
+
+			if (fa != null)
+				flipX = true;
+			else {
+				// search for .left if .frontleft not found and viceversa
+				StringBuilder sb = new StringBuilder();
+
+				if (id.endsWith(FRONTLEFT)) {
+					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
+					sb.append(LEFT);
+				} else if (id.endsWith(FRONTRIGHT)) {
+					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
+					sb.append(RIGHT);
+				} else if (id.endsWith(BACKLEFT) || id.endsWith(BACKRIGHT)) {
+					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
+					sb.append(BACK);
+				} else if (id.endsWith(LEFT)) {
+					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
+					sb.append(FRONTLEFT);
+				} else if (id.endsWith(RIGHT)) {
+					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
+					sb.append(FRONTRIGHT);
+				}
+
+				String s = sb.toString();
+
+				fa = fanims.get(s);
+
+				if (fa == null) {
+					// Search for flipped
+					flipId = getFlipId(s);
+
+					fa = fanims.get(flipId);
+
+					if (fa != null) {
+						flipX = true;
+					} else if (s.endsWith(FRONT) || s.endsWith(BACK)) {
+						// search only for right or left animations
+						if (id.endsWith(LEFT)) {
+							sb.append(id.substring(0, id.lastIndexOf('.') + 1));
+							sb.append(LEFT);
+						} else {
+							sb.append(id.substring(0, id.lastIndexOf('.') + 1));
+							sb.append(RIGHT);
+						}
+
+						s = sb.toString();
+						fa = fanims.get(s);
+
+						if (fa == null) {
+							// Search for flipped
+							flipId = getFlipId(s);
+
+							fa = fanims.get(flipId);
+
+							if (fa != null) {
+								flipX = true;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return fa;
+	}
+
+	public static String getFlipId(String id) {
+		StringBuilder sb = new StringBuilder();
+
+		if (id.endsWith(LEFT)) {
+			sb.append(id.substring(0, id.length() - LEFT.length()));
+			sb.append(RIGHT);
+		} else if (id.endsWith(RIGHT)) {
+			sb.append(id.substring(0, id.length() - RIGHT.length()));
+			sb.append(LEFT);
+		}
+
+		return sb.toString();
+	}
+
+	private final static float DIRECTION_ASPECT_TOLERANCE = 3f;
+	private final static float DIRECTION_ASPECT_TOLERANCE_2 = 1.5f;
+
+	protected String getDirectionString(Vector2 p0, Vector2 pf, int numDirs) {
+
+		if (numDirs == 0 || numDirs == -1)
+			return null;
+
+		float dx = pf.x - p0.x;
+		float dy = pf.y - p0.y;
+		float ratio = Math.abs(dx / dy);
+		float ratio2 = ratio;
+
+		if (ratio2 < 1.0)
+			ratio2 = 1.0f / ratio;
+
+		// EngineLogger.debug("P0: " + p0 + " PF: " + pf + " dx: " + dx + " dy: " + dy +
+		// " RATIO: " + ratio);
+
+		if (ratio2 < DIRECTION_ASPECT_TOLERANCE && numDirs > 4) { // DIAGONAL
+																	// MOVEMENT
+			if (dy > 0) { // UP. MOVEMENT
+				if (dx > 0) { // TO THE RIGHT
+					return BACKRIGHT;
+				} else { // TO THE LEFT
+					return BACKLEFT;
+				}
+
+			} else { // DOWN. MOVEMENT
+				if (dx > 0) { // TO THE RIGHT
+					return FRONTRIGHT;
+				} else { // TO THE LEFT
+					return FRONTLEFT;
+				}
+			}
+		} else { // HOR OR VERT MOVEMENT
+			if (ratio > DIRECTION_ASPECT_TOLERANCE_2 || numDirs < 4) { // HOR.
+																		// MOVEMENT
+				if (dx > 0) { // TO THE RIGHT
+					return RIGHT;
+				} else { // TO THE LEFT
+					return LEFT;
+				}
+
+			} else { // VERT. MOVEMENT
+				if (dy > 0) { // TO THE TOP
+					return BACK;
+				} else { // TO THE BOTTOM
+					return FRONT;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns:
+	 * 
+	 * 8 -> when 8 dir animation mode (RIGHT, LEFT, FRONT, BACK, BACKRIGHT,
+	 * BACKLEFT, FRONTRIGHT, FRONTLEFT) 4 -> when 4 dir animation mode (RIGHT, LEFT,
+	 * FRONT, BACK) 2 -> when 2 dir animation mode (RIGHT, LEFT) 0 -> when no dirs
+	 * availables for the base animation -1 -> when base animation doesn't exists
+	 * 
+	 * @param base   Base animation
+	 * @param fanims
+	 * @return -1, 0, 2, 4 or 8
+	 */
+	protected int getDirs(String base, HashMap<String, AnimationDesc> fanims) {
+		String basePoint = base + ".";
+
+		if (fanims.containsKey(basePoint + FRONTRIGHT) || fanims.containsKey(basePoint + FRONTLEFT))
+			return 8;
+
+		if (fanims.containsKey(basePoint + BACK))
+			return 4;
+
+		if (fanims.containsKey(basePoint + LEFT) || fanims.containsKey(basePoint + RIGHT))
+			return 2;
+
+		if (fanims.containsKey(base))
+			return 0;
+
+		return -1;
+	}
+
+	@Override
+	public void write(Json json) {
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+
+			SortedMap<String, AnimationDesc> sortedAnims = new TreeMap<>();
+			sortedAnims.putAll(fanims);
+
+			json.writeValue("fanims", sortedAnims, sortedAnims.getClass(), null);
+			json.writeValue("initAnimation", initAnimation);
+			json.writeValue("orgAlign", orgAlign);
+
+		} else {
+
+			String currentAnimationId = null;
+
+			if (currentAnimation != null)
+				currentAnimationId = currentAnimation.id;
+
+			json.writeValue("currentAnimation", currentAnimationId);
+
+			json.writeValue("flipX", flipX);
+		}
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+
+			// In next versions, the fanims loading will be generic
+			// fanims = json.readValue("fanims", HashMap.class, AnimationDesc.class,
+			// jsonData);
+
+			initAnimation = json.readValue("initAnimation", String.class, jsonData);
+			orgAlign = json.readValue("orgAlign", int.class, Align.bottom, jsonData);
+		} else {
+
+			String currentAnimationId = json.readValue("currentAnimation", String.class, jsonData);
+
+			if (currentAnimationId != null)
+				currentAnimation = fanims.get(currentAnimationId);
+			flipX = json.readValue("flipX", Boolean.class, jsonData);
+		}
+	}
+
+	@Override
+	public void setWorld(World world) {
+		this.world = world;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/AtlasRenderer.java b/blade-engine/src/com/bladecoder/engine/model/AtlasRenderer.java
index f2a722d2f..6d01e11bd 100644
--- a/blade-engine/src/com/bladecoder/engine/model/AtlasRenderer.java
+++ b/blade-engine/src/com/bladecoder/engine/model/AtlasRenderer.java
@@ -18,343 +18,214 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.bladecoder.engine.model.SpriteRenderer;
-
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.anim.AtlasFrameAnimation;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.anim.AtlasAnimationDesc;
 import com.bladecoder.engine.anim.FATween;
-import com.bladecoder.engine.anim.FrameAnimation;
 import com.bladecoder.engine.anim.Tween;
 import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
 import com.bladecoder.engine.util.EngineLogger;
 import com.bladecoder.engine.util.RectangleRenderer;
 
-public class AtlasRenderer implements SpriteRenderer {
-
-	private HashMap<String, FrameAnimation> fanims = new HashMap<String, FrameAnimation>();
-	
-	/** Starts this anim the first time that the scene is loaded */
-	private String initFrameAnimation;
-
-	private AtlasFrameAnimation currentFrameAnimation;
+public class AtlasRenderer extends AnimationRenderer {
 
-	private TextureRegion tex;
-	private boolean flipX;
+	private AtlasRegion tex;
 	private FATween faTween;
-	
+
 	private int currentFrameIndex;
-	
-	private final HashMap<String, AtlasCacheEntry> sourceCache = new HashMap<String, AtlasCacheEntry>();
 
-	class AtlasCacheEntry {
-		int refCounter;
-	}
-	
-	
 	public AtlasRenderer() {
-		
-	}
 
-	@Override
-	public void setInitFrameAnimation(String fa) {
-		initFrameAnimation = fa;
-	}
-	
-	@Override
-	public String getInitFrameAnimation() {
-		return initFrameAnimation;
 	}
-	
+
 	@Override
-	public String[] getInternalAnimations(String source) {
-		retrieveSource(source);
-		
-		TextureAtlas atlas = EngineAssetManager.getInstance().getTextureAtlas(source);
-		
+	public String[] getInternalAnimations(AnimationDesc anim) {
+		retrieveSource(anim.source);
+
+		TextureAtlas atlas = EngineAssetManager.getInstance().getTextureAtlas(anim.source);
+
 		Array<AtlasRegion> animations = atlas.getRegions();
-		ArrayList<String> l = new ArrayList<String>();
-		
-		for(int i = 0; i< animations.size; i++) {
+		ArrayList<String> l = new ArrayList<>();
+
+		for (int i = 0; i < animations.size; i++) {
 			AtlasRegion a = animations.get(i);
-			if(!l.contains(a.name))
+			if (!l.contains(a.name))
 				l.add(a.name);
 		}
-		
-		
-		return l.toArray(new String[l.size()]);
-	}	
 
+		return l.toArray(new String[l.size()]);
+	}
 
 	@Override
 	public void update(float delta) {
-		if(faTween != null) {
-			faTween.update(this, delta);
-			if(faTween.isComplete()) {
+		if (faTween != null) {
+			faTween.update(delta);
+			if (faTween != null && faTween.isComplete()) {
 				faTween = null;
+				computeBbox();
 			}
 		}
 	}
-	
+
 	public void setFrame(int i) {
 		currentFrameIndex = i;
-		tex =  currentFrameAnimation.regions.get(i);
+		tex = ((AtlasAnimationDesc) currentAnimation).regions.get(i);
 	}
 
 	@Override
-	public void draw(SpriteBatch batch, float x, float y, float scale) {
-		
-		x = x - getWidth() / 2 * scale; // SET THE X ORIGIN TO THE CENTER OF THE SPRITE
+	public void draw(SpriteBatch batch, float x, float y, float scaleX, float scaleY, float rotation, Color tint) {
+
+		float dx = getAlignDx(getWidth(), orgAlign);
+		float dy = getAlignDy(getHeight(), orgAlign);
 
 		if (tex == null) {
-			RectangleRenderer.draw(batch, x, y, getWidth() * scale, getHeight()
-					* scale, Color.RED);
+			RectangleRenderer.draw(batch, x + dx * scaleX, y + dy * scaleY, getWidth() * scaleX, getHeight() * scaleY,
+					Color.RED);
+
 			return;
 		}
 
-		if (!flipX) {
-			batch.draw(tex, x, y, 0, 0, tex.getRegionWidth(),
-					tex.getRegionHeight(), scale, scale, 0);
-		} else {
-			batch.draw(tex, x + tex.getRegionWidth() * scale, y, 0,
-					0, -tex.getRegionWidth(), tex.getRegionHeight(),
-					scale, scale, 0);
-		}
+		x = x + tex.offsetX + dx;
+		y = y + tex.offsetY + dy;
+
+		if (tint != null)
+			batch.setColor(tint);
+
+		batch.draw(tex, x, y, -dx - tex.offsetX, -dy - tex.offsetY, tex.packedWidth, tex.packedHeight,
+				flipX ? -scaleX : scaleX, scaleY, rotation);
+
+		if (tint != null)
+			batch.setColor(Color.WHITE);
 	}
 
 	@Override
 	public float getWidth() {
 		if (tex == null)
-			return 200;
+			return super.getWidth();
 
-		return tex.getRegionWidth();
+		return tex.originalWidth;
 	}
 
 	@Override
 	public float getHeight() {
 		if (tex == null)
-			return 200;
+			return super.getHeight();
 
-		return tex.getRegionHeight();
+		return tex.originalHeight;
 	}
 
 	@Override
-	public FrameAnimation getCurrentFrameAnimation() {
-		return currentFrameAnimation;
-	}
+	public void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb) {
 
-	@Override
-	public HashMap<String, FrameAnimation> getFrameAnimations() {
-		return (HashMap<String, FrameAnimation>)fanims;
-	}
+		if (id == null)
+			id = initAnimation;
 
-	@Override
-	public void startFrameAnimation(String id, int repeatType, int count,
-			ActionCallback cb) {
-		
-		if(id == null)
-			id = initFrameAnimation;
-		
-		AtlasFrameAnimation fa = getFrameAnimation(id);
+		AtlasAnimationDesc fa = (AtlasAnimationDesc) getAnimation(id);
 
 		if (fa == null) {
-			EngineLogger.error("FrameAnimation not found: " + id);
+			EngineLogger.error("AnimationDesc not found: " + id);
 
 			return;
 		}
-		
-		if(currentFrameAnimation != null && currentFrameAnimation.disposeWhenPlayed) {
-			disposeSource(currentFrameAnimation.source);
-			currentFrameAnimation.regions = null;
+
+		if (currentAnimation != null && currentAnimation.disposeWhenPlayed) {
+			disposeSource(currentAnimation.source);
+			((AtlasAnimationDesc) currentAnimation).regions = null;
 		}
 
-		currentFrameAnimation = fa;
+		currentAnimation = fa;
 
 		// If the source is not loaded. Load it.
-		if (currentFrameAnimation != null
-				&& currentFrameAnimation.regions == null) {
+		if (fa.regions == null) {
 
 			retrieveFA(fa);
 
-			if (currentFrameAnimation.regions == null || currentFrameAnimation.regions.size == 0) {
-				EngineLogger.error(currentFrameAnimation.id + " has no regions in ATLAS " + currentFrameAnimation.source);
-				fanims.remove(currentFrameAnimation.id);
+			if (fa.regions == null || fa.regions.size == 0) {
+				EngineLogger.error(currentAnimation.id + " has no regions in ATLAS " + currentAnimation.source);
+				fanims.remove(currentAnimation.id);
 			}
 		}
 
-		if (currentFrameAnimation == null) {
-
-			tex = null;
-
-			return;
-		}
-
-		if (currentFrameAnimation.regions.size == 1
-				|| currentFrameAnimation.duration == 0.0) {
+		if (fa.regions.size == 1 || fa.duration == 0.0) {
 
 			setFrame(0);
+			computeBbox();
 
 			if (cb != null) {
-				ActionCallbackQueue.add(cb);
+				ActionCallback tmpcb = cb;
+				cb = null;
+				tmpcb.resume();
 			}
 
 			return;
 		}
 
-		if (repeatType == Tween.FROM_FA) {
-			repeatType = currentFrameAnimation.animationType;
-			count = currentFrameAnimation.count;
+		if (repeatType == Tween.Type.SPRITE_DEFINED) {
+			repeatType = currentAnimation.animationType;
+			count = currentAnimation.count;
 		}
-		
-		faTween = new FATween();
-		faTween.start(this, repeatType, count, currentFrameAnimation.duration, cb);
-	}
-
-	public int getNumFrames() {
-		return currentFrameAnimation.regions.size;
-	}
 
-	@Override
-	public String getCurrentFrameAnimationId() {
-		if (currentFrameAnimation == null)
-			return null;
-
-		String id = currentFrameAnimation.id;
-
-		if (flipX) {
-			id = FrameAnimation.getFlipId(id);
-		}
+		faTween = new FATween();
+		faTween.start(this, repeatType, count, currentAnimation.duration, cb);
 
-		return id;
+		if (repeatType == Tween.Type.REVERSE)
+			setFrame(getNumFrames() - 1);
+		else
+			setFrame(0);
 
+		computeBbox();
 	}
 
-	@Override
-	public void addFrameAnimation(FrameAnimation fa) {
-		if(initFrameAnimation == null)
-			initFrameAnimation = fa.id; 
-			
-		fanims.put(fa.id, (AtlasFrameAnimation)fa);
+	public int getNumFrames() {
+		return ((AtlasAnimationDesc) currentAnimation).regions.size;
 	}
 
 	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer(super.toString());
-
-		sb.append("\n  Anims:");
-
-		for (String v : fanims.keySet()) {
-			sb.append(" ").append(v);
-		}
-
-		sb.append("\n  Current Anim: ").append(currentFrameAnimation.id);
+	public void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb, String direction) {
+		StringBuilder sb = new StringBuilder(id);
 
-		sb.append("\n");
+		// if dir==null gets the current animation direction
+		if (direction == null) {
+			int idx = getCurrentAnimationId().indexOf('.');
 
-		return sb.toString();
-	}
-
-	private AtlasFrameAnimation getFrameAnimation(String id) {
-		FrameAnimation fa = fanims.get(id);
-		flipX = false;
-
-		if (fa == null) {
-			// Search for flipped
-			String flipId = FrameAnimation.getFlipId(id);
-
-			fa = fanims.get(flipId);
-
-			if (fa != null)
-				flipX = true;
-			else {
-				// search for .left if .frontleft not found and viceversa
-				StringBuilder sb = new StringBuilder();
-				
-				if (id.endsWith(FrameAnimation.FRONTLEFT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.LEFT);
-				} else if (id.endsWith(FrameAnimation.FRONTRIGHT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.RIGHT);
-				} else if (id.endsWith(FrameAnimation.BACKLEFT) || id.endsWith(FrameAnimation.BACKRIGHT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.BACK);
-				} else if (id.endsWith(FrameAnimation.LEFT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.FRONTLEFT);
-				} else if (id.endsWith(FrameAnimation.RIGHT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.FRONTRIGHT);			
-				}
-
-				String s = sb.toString();
-
-				fa = fanims.get(s);
-
-				if (fa == null) {
-					// Search for flipped
-					flipId = FrameAnimation.getFlipId(s);
-
-					fa = fanims.get(flipId);
-
-					if (fa != null)
-						flipX = true;
-				}
+			if (idx != -1) {
+				String dir = getCurrentAnimationId().substring(idx);
+				sb.append(dir);
 			}
+		} else {
+			sb.append('.');
+			sb.append(direction);
 		}
 
-		return (AtlasFrameAnimation)fa;
-	}
+		String anim = sb.toString();
 
-	@Override
-	public void lookat(float x, float y, Vector2 pf) {
-		lookat(FrameAnimation.getFrameDirection(x, y, pf));
-	}
-
-	@Override
-	public void lookat(String dir) {
-		StringBuilder sb = new StringBuilder();
-		sb.append(FrameAnimation.STAND_ANIM);
-		sb.append('.');
-		sb.append(dir);
-
-		startFrameAnimation(sb.toString(), Tween.FROM_FA, 1, null);
-	}
-
-	@Override
-	public void stand() {
-		String standFA = FrameAnimation.STAND_ANIM;
-		int idx = getCurrentFrameAnimationId().indexOf('.');
-
-		if (idx != -1) {
-			standFA += getCurrentFrameAnimationId().substring(idx);
+		if (getAnimation(anim) == null) {
+			anim = id;
 		}
 
-		startFrameAnimation(standFA, Tween.FROM_FA, 1, null);
+		startAnimation(anim, repeatType, count, null);
 	}
 
 	@Override
-	public void startWalkFA(Vector2 p0, Vector2 pf) {
-		String currentDirection = FrameAnimation.getFrameDirection(p0.x, p0.y, pf);
-		StringBuilder sb = new StringBuilder();
-		sb.append(FrameAnimation.WALK_ANIM).append('.').append(currentDirection);
-		startFrameAnimation(sb.toString(), Tween.FROM_FA, 1, null);
+	public void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb, Vector2 p0, Vector2 pf) {
+		startAnimation(id, repeatType, count, cb, getDirectionString(p0, pf, getDirs(id, fanims)));
 	}
-	
+
 	private void loadSource(String source) {
-		AtlasCacheEntry entry = sourceCache.get(source);
-		
-		if(entry == null) {
-			entry = new AtlasCacheEntry();
+		CacheEntry entry = sourceCache.get(source);
+
+		if (entry == null) {
+			entry = new CacheEntry();
 			sourceCache.put(source, entry);
 		}
 
@@ -363,23 +234,23 @@ private void loadSource(String source) {
 
 		entry.refCounter++;
 	}
-	
-	private void retrieveFA(AtlasFrameAnimation fa) {
+
+	private void retrieveFA(AtlasAnimationDesc fa) {
 		retrieveSource(fa.source);
 		fa.regions = EngineAssetManager.getInstance().getRegions(fa.source, fa.id);
 	}
 
 	private void retrieveSource(String source) {
-		AtlasCacheEntry entry = sourceCache.get(source);
-		
-		if(entry==null || entry.refCounter < 1) {
+		CacheEntry entry = sourceCache.get(source);
+
+		if (entry == null || entry.refCounter < 1) {
 			loadSource(source);
 			EngineAssetManager.getInstance().finishLoading();
 		}
 	}
-	
+
 	private void disposeSource(String source) {
-		AtlasCacheEntry entry = sourceCache.get(source);
+		CacheEntry entry = sourceCache.get(source);
 
 		if (entry.refCounter == 1) {
 			EngineAssetManager.getInstance().disposeAtlas(source);
@@ -387,97 +258,101 @@ private void disposeSource(String source) {
 
 		entry.refCounter--;
 	}
-	
 
 	@Override
 	public void loadAssets() {
-		for (FrameAnimation fa : fanims.values()) {
+		for (AnimationDesc fa : fanims.values()) {
 			if (fa.preload)
 				loadSource(fa.source);
 		}
 
-		if (currentFrameAnimation != null && !currentFrameAnimation.preload) {
-			loadSource(currentFrameAnimation.source);
-		} else if (currentFrameAnimation == null && initFrameAnimation != null) {
-			FrameAnimation fa = fanims.get(initFrameAnimation);
+		if (currentAnimation != null && !currentAnimation.preload) {
+			loadSource(currentAnimation.source);
+		} else if (currentAnimation == null && initAnimation != null) {
+			String a = initAnimation;
+
+			if (flipX) {
+				a = getFlipId(a);
+			}
+
+			AnimationDesc fa = fanims.get(a);
 
-			if (!fa.preload)
+			if (fa != null && !fa.preload)
 				loadSource(fa.source);
 		}
 	}
 
 	@Override
 	public void retrieveAssets() {
-		for (FrameAnimation fa : fanims.values()) {
-			if(fa.preload)
-				retrieveFA((AtlasFrameAnimation)fa);
+		for (AnimationDesc fa : fanims.values()) {
+			if (fa.preload)
+				retrieveFA((AtlasAnimationDesc) fa);
 		}
-		
-		if(currentFrameAnimation != null && !currentFrameAnimation.preload) {
-			retrieveFA(currentFrameAnimation);
-		} else if(currentFrameAnimation == null && initFrameAnimation != null) {
-			AtlasFrameAnimation fa = (AtlasFrameAnimation)fanims.get(initFrameAnimation);
-			
-			if(!fa.preload)
-				retrieveFA(fa);		
+
+		if (currentAnimation != null && !currentAnimation.preload) {
+			retrieveFA((AtlasAnimationDesc) currentAnimation);
+		} else if (currentAnimation == null && initAnimation != null) {
+			String a = initAnimation;
+
+			if (flipX) {
+				a = getFlipId(a);
+			}
+
+			AtlasAnimationDesc fa = (AtlasAnimationDesc) fanims.get(a);
+
+			if (fa != null && !fa.preload)
+				retrieveFA(fa);
 		}
 
-		if (currentFrameAnimation != null) {		
+		if (currentAnimation != null) {
 			setFrame(currentFrameIndex);
-		} else if(initFrameAnimation != null){
-			startFrameAnimation(initFrameAnimation, Tween.FROM_FA, 1, null);
+		} else if (initAnimation != null) {
+			startAnimation(initAnimation, Tween.Type.SPRITE_DEFINED, 1, null);
 		}
+
+		computeBbox();
 	}
 
 	@Override
 	public void dispose() {
 		for (String key : sourceCache.keySet()) {
-			EngineAssetManager.getInstance().disposeAtlas(key);
+			if (sourceCache.get(key).refCounter > 0)
+				EngineAssetManager.getInstance().disposeAtlas(key);
 		}
-		
+
 		sourceCache.clear();
 	}
 
 	@Override
 	public void write(Json json) {
+		super.write(json);
 
-		json.writeValue("fanims", fanims, HashMap.class, AtlasFrameAnimation.class);
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
 
-		String currentFrameAnimationId = null;
-
-		if (currentFrameAnimation != null)
-			currentFrameAnimationId = currentFrameAnimation.id;
-
-		json.writeValue("currentFrameAnimation", currentFrameAnimationId);
-		
-		json.writeValue("initFrameAnimation", initFrameAnimation);
+		} else {
+			json.writeValue("currentFrameIndex", currentFrameIndex);
 
-		json.writeValue("flipX", flipX);
-		json.writeValue("currentFrameIndex", currentFrameIndex);
-		
-		json.writeValue("faTween", faTween,
-				faTween == null ? null : FATween.class);
+			if (faTween != null)
+				json.writeValue("faTween", faTween);
+		}
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public void read(Json json, JsonValue jsonData) {
+		super.read(json, jsonData);
 
-		fanims = json.readValue("fanims", HashMap.class,
-				AtlasFrameAnimation.class, jsonData);
-
-		String currentFrameAnimationId = json.readValue(
-				"currentFrameAnimation", String.class, jsonData);
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			fanims = json.readValue("fanims", HashMap.class, AtlasAnimationDesc.class, jsonData);
+		} else {
 
-		if (currentFrameAnimationId != null)
-			currentFrameAnimation = (AtlasFrameAnimation)fanims.get(currentFrameAnimationId);
-		
-		initFrameAnimation = json.readValue("initFrameAnimation", String.class,
-				jsonData);
+			currentFrameIndex = json.readValue("currentFrameIndex", Integer.class, jsonData);
+			faTween = json.readValue("faTween", FATween.class, jsonData);
 
-		flipX = json.readValue("flipX", Boolean.class, jsonData);
-		currentFrameIndex = json.readValue("currentFrameIndex", Integer.class, jsonData);
-		faTween =  json.readValue("faTween", FATween.class, jsonData);
+			if (faTween != null)
+				faTween.setTarget(this);
+		}
 	}
-
 }
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/model/BaseActor.java b/blade-engine/src/com/bladecoder/engine/model/BaseActor.java
index 706e84134..ce4d692f9 100644
--- a/blade-engine/src/com/bladecoder/engine/model/BaseActor.java
+++ b/blade-engine/src/com/bladecoder/engine/model/BaseActor.java
@@ -15,59 +15,27 @@
  ******************************************************************************/
 package com.bladecoder.engine.model;
 
-import java.util.HashMap;
-
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.Dialog;
-import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.model.SoundFX;
-import com.bladecoder.engine.model.Verb;
-import com.bladecoder.engine.model.VerbManager;
-
 import com.badlogic.gdx.math.Polygon;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
-import com.bladecoder.engine.assets.AssetConsumer;
 import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
 
 /**
- * A BaseActor is any object in a scene or in the inventory.
+ * A BaseActor is the foundation for all actors in Scenes
  * 
  * @author rgarcia
  */
-public class BaseActor implements Comparable<BaseActor>, Serializable, AssetConsumer {
-	
-	public enum ActorLayer {BACKGROUND, DYNAMIC, FOREGROUND};
-
+abstract public class BaseActor implements Serializable {
 	protected String id;
-	protected String desc;
 	protected Scene scene = null;
-	
-	/** visibility and interaction activation */
-	private boolean interaction = true;
 	private boolean visible = true;
-
-	/** internal state. Can be used for actions to maintain a state machine */
-	protected String state;
-
-	protected VerbManager verbs = new VerbManager();
-	protected HashMap<String, SoundFX> sounds;
-	protected HashMap<String, String> customProperties;
-	
-	private String playingSound;
-
-	protected Polygon bbox;
-	
-	private HashMap<String, Dialog> dialogs;
-	
-	private boolean isWalkObstacle = false;
-	
-	private ActorLayer layer;
-	
-	/** State to know when the player is inside this actor to trigger the enter/leave verbs */ 
-	private boolean playerInside = false;
+	private final Polygon bbox = new Polygon();
+	private String initScene;
+	protected long dirtyProps = 0L;
 
 	public String getId() {
 		return id;
@@ -80,295 +48,117 @@ public void setId(String id) {
 	public Polygon getBBox() {
 		return bbox;
 	}
-	
-	public void setLayer(ActorLayer layer) {
-		this.layer = layer;
-	}
-	
-	public ActorLayer getLayer() {
-		return layer;
-	}
-	
+
 	public boolean hit(float x, float y) {
 		return getBBox().contains(x, y);
 	}
 
-	public boolean hasInteraction() {
-		return interaction;
-	}
-
-	public void setInteraction(boolean interaction) {
-		this.interaction = interaction;
-	}
-
-	public boolean isVisible() {			
+	public boolean isVisible() {
 		return visible;
 	}
 
 	public void setVisible(boolean visible) {
-		this.visible = visible;		
-	}
-
-	public void setBbox(Polygon bbox) {
-		this.bbox = bbox;
-	}
-
-	public String getDesc() {
-		return desc;
+		this.visible = visible;
+		setDirtyProp(DirtyProps.VISIBLE);
 	}
 
-	public void setDesc(String desc) {
-		this.desc = desc;
-	}
-
-	public VerbManager getVerbManager() {
-		return verbs;
-	}
-	
 	public void setScene(Scene s) {
 		scene = s;
 	}
-	
+
 	public Scene getScene() {
 		return scene;
 	}
-	
-	public void update(float delta) {
-		BaseActor player = scene.getPlayer();
-		if(isVisible() && player != null) {
-			boolean hit = hit(player.getX(), player.getY());
-			if(!hit && playerInside) {
-				// the player leaves
-				playerInside = false;
-				
-				Verb v = getVerb("leave");
-				if(v!=null)
-					v.run();
-			} else if(hit && !playerInside){
-				// the player enters
-				playerInside = true;
-				
-				Verb v = getVerb("enter");
-				if(v!=null)
-					v.run();				
-			}
-		}
-	}
 
-	public Verb getVerb(String id) {
-		return verbs.getVerb(id, state, null);
-	}
+	abstract public void update(float delta);
 
-	public Verb getVerb(String id, String target) {
-		return verbs.getVerb(id, state, target);
-	}
-	
-	public void runVerb(String id) {
-		verbs.runVerb(id, state, null);
-	}
-	
-	public void runVerb(String id, String target) {
-		verbs.runVerb(id, state, target);
+	protected void setDirtyProp(DirtyProps dp) {
+		dirtyProps |= (1L << dp.ordinal());
 	}
 
-	public void addSound(String id, String filename, boolean loop, float volume) {
-		if (sounds == null)
-			sounds = new HashMap<String, SoundFX>();
-
-		sounds.put(id, new SoundFX(filename, loop, volume));
-	}
-
-	public void playSound(String id) {
-		if(sounds == null) return;
-		
-		SoundFX s = sounds.get(id);
-
-		if (s != null) {
-			if(playingSound != null) {
-				SoundFX s2 = sounds.get(playingSound);
-				s2.stop();
-			}
-			
-			s.play();
-			playingSound = id;
-		}
-	}
-	
-	public void stopSound(String id) {
-		if(sounds == null) return;
-		
-		SoundFX s = sounds.get(id);
-
-		if (s != null) {
-			s.stop();
-		}
-		
-		playingSound = null;
-	}
-	
-	public void setCustomProperty(String name, String value) {
-		if(customProperties == null)
-			customProperties = new HashMap<String, String>();
-		
-		customProperties.put(name, value);
-	}
-	
-	public String getCustomProperty(String name) {
-		return customProperties.get(name);
+	protected boolean isDirty(DirtyProps dp) {
+		return (dirtyProps & (1L << dp.ordinal())) != 0;
 	}
 
 	@Override
 	public String toString() {
-		StringBuffer sb = new StringBuffer();
-
-		sb.append("\nObject: ").append(id).append(", state: ").append(state);
-		sb.append("\n  Desc: ").append(desc);
-		sb.append("\n  BBox: ").append(getBBox().toString());
-		sb.append("\n  Verbs:");
-
-		for (String v : verbs.getVerbs().keySet()) {
-			sb.append(" ").append(v);
-		}
+		StringBuilder sb = new StringBuilder();
 
+		sb.append("\nObject: ").append(id);
+		sb.append("\n  Visible: ").append(visible);
+		sb.append("\n  Pos: ").append(getBBox().getX() + " , " + getBBox().getY());
+		sb.append("\n  Scale: ").append(getBBox().getScaleX());
 		sb.append("\n");
 
 		return sb.toString();
 	}
 
-	@Override
-	public int compareTo(BaseActor o) {
-		return (int) (o.getBBox().getY() - this.getBBox().getY());
-	}
-
-	public String getState() {
-		return state;
-	}
-
-	public void setState(String state) {
-		this.state = state;
-	}
-	
-	public Dialog getDialog(String dialog) {
-		return dialogs.get(dialog);
-	}
-	
-	public void addDialog(String id, Dialog d) {
-		if(dialogs == null)
-			dialogs = new HashMap<String, Dialog> ();
-		
-		dialogs.put(id, d);
-	}
-	
 	public float getX() {
 		return bbox.getX();
 	}
-	
+
 	public float getY() {
 		return bbox.getY();
 	}
-	
-	public boolean isWalkObstacle() {
-		return isWalkObstacle;
-	}
 
-	public void setWalkObstacle(boolean isWalkObstacle) {
-		this.isWalkObstacle = isWalkObstacle;
+	public void setPosition(float x, float y) {
+		if (x != bbox.getX() || y != bbox.getY()) {
+			bbox.setPosition(x, y);
+			setDirtyProp(DirtyProps.POS);
+		}
 	}
 
-	public void setPosition(float x, float y) {
-		bbox.setPosition(x, y);
+	public String getInitScene() {
+		return initScene;
 	}
-	
-	@Override
-	public void loadAssets() {
-		if (sounds != null) {
-			for (SoundFX s : sounds.values()) {
-				s.loadAssets();
-			}
-		}
+
+	public void setInitScene(String initScene) {
+		this.initScene = initScene;
 	}
 
 	@Override
-	public void retrieveAssets() {
-		if (sounds != null) {
-			for (SoundFX s : sounds.values()) {
-				s.retrieveAssets();
-			}
-			
-			if(playingSound != null && sounds.get(playingSound).isLooping() == true) {
-				playSound(playingSound);
-			}
-		}
-		
-		// TODO: CHECK WHEN INVENTORY
-		if(isWalkObstacle && scene.getPolygonalNavGraph() != null && isVisible()) {
-			scene.getPolygonalNavGraph().addDinamicObstacle(bbox);
+	public void write(Json json) {
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			json.writeValue("id", id);
+			json.writeValue("bbox", bbox.getVertices());
+		} else {
+			if (dirtyProps != 0L)
+				json.writeValue("dirtyProps", dirtyProps);
 		}
-	}	
-
-	@Override
-	public void dispose() {
-		if (sounds != null) {
-			for (SoundFX s : sounds.values()) {
-				s.dispose();
-			}
 
-			sounds.clear();
-			sounds = null;
-			playingSound = null;
+		if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.POS)) {
+			float worldScale = EngineAssetManager.getInstance().getScale();
+			Vector2 scaledPos = new Vector2(bbox.getX() / worldScale, bbox.getY() / worldScale);
+			json.writeValue("pos", scaledPos);
 		}
+
+		if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.VISIBLE))
+			json.writeValue("visible", visible);
 	}
 
 	@Override
-	public void write(Json json) {
-		json.writeValue("id", id);
-		json.writeValue("interaction", interaction);
-		json.writeValue("visible", visible);
-		json.writeValue("desc", desc);
-		json.writeValue("verbs", verbs);
+	public void read(Json json, JsonValue jsonData) {
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			id = json.readValue("id", String.class, jsonData);
 
-		float worldScale = EngineAssetManager.getInstance().getScale();
-		Vector2 scaledPos = new Vector2(bbox.getX() / worldScale, bbox.getY() / worldScale);
-		json.writeValue("pos", scaledPos);	
-		json.writeValue("bbox", bbox.getVertices());
-		json.writeValue("state", state);
-		json.writeValue("sounds", sounds, sounds == null ? null : sounds.getClass(), SoundFX.class);
-		json.writeValue("playingSound", playingSound, playingSound == null ? null : playingSound.getClass());
-		
-		json.writeValue("customProperties", customProperties, customProperties == null ? null : customProperties.getClass(), String.class);
-		json.writeValue("dialogs", dialogs, dialogs == null ? null : dialogs.getClass(), Dialog.class);
-		
-		json.writeValue("isWalkObstacle", isWalkObstacle);
-		json.writeValue("layer", layer);
-		json.writeValue("playerInside", playerInside);
-	}
+			float[] verts = json.readValue("bbox", float[].class, jsonData);
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public void read (Json json, JsonValue jsonData) {
-		id = json.readValue("id", String.class, jsonData);
-		interaction = json.readValue("interaction", Boolean.class, jsonData);
-		visible = json.readValue("visible", Boolean.class, jsonData);
-		desc = json.readValue("desc", String.class, jsonData);
-		verbs = json.readValue("verbs", VerbManager.class, jsonData);
+			if (verts.length > 0)
+				bbox.setVertices(verts);
+		}
 
 		Vector2 pos = json.readValue("pos", Vector2.class, jsonData);
 
-		float worldScale = EngineAssetManager.getInstance().getScale();
-		bbox = new Polygon();
-		bbox.setPosition(pos.x * worldScale, pos.y * worldScale);
-		bbox.setVertices(json.readValue("bbox", float[].class, jsonData));
-		bbox.setScale(worldScale, worldScale);
-		
-		state = json.readValue("state", String.class, jsonData);
-		sounds = json.readValue("sounds", HashMap.class, SoundFX.class, jsonData);
-		playingSound = json.readValue("playingSound", String.class, jsonData);
-		customProperties = json.readValue("customProperties", HashMap.class, String.class, jsonData);
-		dialogs = json.readValue("dialogs", HashMap.class, Dialog.class, jsonData);
-		
-		isWalkObstacle = json.readValue("isWalkObstacle", Boolean.class, jsonData);
-		layer = json.readValue("layer", ActorLayer.class, jsonData);
-		playerInside = json.readValue("playerInside", Boolean.class, jsonData);
-	}
+		if (pos != null) {
+			float worldScale = EngineAssetManager.getInstance().getScale();
+			bbox.setPosition(pos.x * worldScale, pos.y * worldScale);
+			bbox.setScale(worldScale, worldScale);
+		}
 
+		visible = json.readValue("visible", boolean.class, visible, jsonData);
+
+		dirtyProps = json.readValue("dirtyProps", long.class, 0L, jsonData);
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/CharacterActor.java b/blade-engine/src/com/bladecoder/engine/model/CharacterActor.java
new file mode 100644
index 000000000..27d8a9421
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/CharacterActor.java
@@ -0,0 +1,349 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.model;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.anim.SpritePosTween;
+import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.anim.WalkTween;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+import com.bladecoder.engine.util.EngineLogger;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class CharacterActor extends SpriteActor {
+    public final static float DEFAULT_WALKING_SPEED = 1000f; // Speed units:
+    // pix/sec.
+
+    public final static String DEFAULT_STAND_ANIM = "stand";
+    public final static String DEFAULT_WALK_ANIM = "walk";
+    public final static String DEFAULT_TALK_ANIM = "talk";
+
+    private float walkingSpeed = DEFAULT_WALKING_SPEED;
+    private Color textColor;
+    private String textStyle;
+    private Vector2 talkingTextPos;
+
+    private String standAnim = DEFAULT_STAND_ANIM;
+    private String walkAnim = DEFAULT_WALK_ANIM;
+    private String talkAnim = DEFAULT_TALK_ANIM;
+
+    private HashMap<String, Dialog> dialogs;
+
+    public Color getTextColor() {
+        return textColor;
+    }
+
+    public void setTextColor(Color textColor) {
+        this.textColor = textColor;
+
+        setDirtyProp(DirtyProps.TEXT_COLOR);
+    }
+
+    public String getTextStyle() {
+        return textStyle;
+    }
+
+    public void setTextStyle(String textStyle) {
+        this.textStyle = textStyle;
+        setDirtyProp(DirtyProps.TEXT_STYLE);
+    }
+
+    public String getStandAnim() {
+        return standAnim;
+    }
+
+    public void setStandAnim(String standAnim) {
+        this.standAnim = standAnim;
+    }
+
+    public String getWalkAnim() {
+        return walkAnim;
+    }
+
+    public void setWalkAnim(String walkAnim) {
+        this.walkAnim = walkAnim;
+    }
+
+    public String getTalkAnim() {
+        return talkAnim;
+    }
+
+    public void setTalkAnim(String talkAnim) {
+        this.talkAnim = talkAnim;
+    }
+
+    public Dialog getDialog(String dialog) {
+        return dialogs.get(dialog);
+    }
+
+    public void addDialog(Dialog d) {
+        if (dialogs == null)
+            dialogs = new HashMap<>();
+
+        dialogs.put(d.getId(), d);
+    }
+
+    public void setWalkingSpeed(float s) {
+        walkingSpeed = s;
+
+        setDirtyProp(DirtyProps.WALKING_SPEED);
+    }
+
+    public float getWalkingSpeed() {
+        return walkingSpeed;
+    }
+
+    public Vector2 getTalkingTextPos() {
+        return talkingTextPos;
+    }
+
+    public void setTalkingTextPos(Vector2 talkingTextPos) {
+        this.talkingTextPos = talkingTextPos;
+        setDirtyProp(DirtyProps.TALKING_TEXT_POS);
+    }
+
+    public void lookat(Vector2 p) {
+        if (!(renderer instanceof AnimationRenderer))
+            return;
+
+        inAnim();
+        removeTween(SpritePosTween.class);
+        ((AnimationRenderer) renderer).startAnimation(standAnim, Tween.Type.SPRITE_DEFINED, -1, null,
+                new Vector2(getBBox().getX(), getBBox().getY()), p);
+        outAnim(Tween.Type.SPRITE_DEFINED);
+    }
+
+    public void lookat(String direction) {
+        if (!(renderer instanceof AnimationRenderer))
+            return;
+
+        inAnim();
+        removeTween(SpritePosTween.class);
+        ((AnimationRenderer) renderer).startAnimation(standAnim, Tween.Type.SPRITE_DEFINED, -1, null, direction);
+        outAnim(Tween.Type.SPRITE_DEFINED);
+    }
+
+    public void stand() {
+        if (!(renderer instanceof AnimationRenderer))
+            return;
+
+        inAnim();
+        removeTween(SpritePosTween.class);
+        ((AnimationRenderer) renderer).startAnimation(standAnim, Tween.Type.SPRITE_DEFINED, -1, null, null);
+        outAnim(Tween.Type.SPRITE_DEFINED);
+    }
+
+    public void talk() {
+        if (!(renderer instanceof AnimationRenderer))
+            return;
+
+        inAnim();
+        removeTween(SpritePosTween.class);
+        ((AnimationRenderer) renderer).startAnimation(talkAnim, Tween.Type.SPRITE_DEFINED, -1, null, null);
+        outAnim(Tween.Type.SPRITE_DEFINED);
+    }
+
+    public void startWalkAnim(Vector2 p0, Vector2 pf) {
+        if (!(renderer instanceof AnimationRenderer))
+            return;
+
+        inAnim();
+        ((AnimationRenderer) renderer).startAnimation(walkAnim, Tween.Type.SPRITE_DEFINED, -1, null, p0, pf);
+        outAnim(Tween.Type.SPRITE_DEFINED);
+    }
+
+    /**
+     * Walking Support
+     *
+     * @param pf Final position to walk
+     * @param cb The action callback
+     */
+    public void goTo(Vector2 pf, ActionCallback cb, boolean ignoreWalkZone) {
+        EngineLogger.debug(MessageFormat.format("GOTO {0},{1}", pf.x, pf.y));
+
+        Vector2 p0 = new Vector2(getBBox().getX(), getBBox().getY());
+
+        // stop previous movement
+        if (tweens.size() > 0) {
+            removeTween(SpritePosTween.class);
+            stand();
+        }
+
+        ArrayList<Vector2> walkingPath;
+
+        // Doesn't move if dst is less than 2px
+        if (p0.dst(pf) < 2.0f) {
+            setPosition(pf.x, pf.y);
+
+            // call the callback
+            if (cb != null) {
+                cb.resume();
+            }
+
+            return;
+        }
+
+        if (scene.getWalkZone() != null && !ignoreWalkZone) {
+            walkingPath = scene.getPolygonalNavGraph().findPath(p0.x, p0.y, pf.x, pf.y);
+        } else {
+            walkingPath = new ArrayList<>(2);
+            walkingPath.add(p0);
+            walkingPath.add(new Vector2(pf));
+        }
+
+        if (walkingPath == null || walkingPath.size() == 0) {
+            // call the callback even when the path is empty
+            if (cb != null) {
+                cb.resume();
+            }
+
+            return;
+        }
+
+        WalkTween t = new WalkTween();
+
+        t.start(this, walkingPath, walkingSpeed, cb);
+        addTween(t);
+    }
+
+    /**
+     * If the character is walking, the character position is set to the final
+     * position and the walk is finish.
+     * <p>
+     * This is used to fast walk between scenes. Used when double clicking.
+     */
+    public void fastWalk() {
+        for (Tween<SpriteActor> t : tweens) {
+            if (t instanceof WalkTween) {
+                WalkTween wt = (WalkTween) t;
+                wt.completeNow(this);
+                break;
+            }
+        }
+    }
+
+    public HashMap<String, Dialog> getDialogs() {
+        return dialogs;
+    }
+
+    @Override
+    public String toString() {
+
+        return super.toString() + "  Walking Speed: " + walkingSpeed +
+                "\nText Color: " + textColor;
+    }
+
+    @Override
+    public void write(Json json) {
+        super.write(json);
+
+        if (dialogs != null)
+            json.writeValue("dialogs", dialogs, HashMap.class, Dialog.class);
+
+        BladeJson bjson = (BladeJson) json;
+        if (bjson.getMode() == Mode.MODEL) {
+            if (textStyle != null)
+                json.writeValue("textStyle", textStyle);
+
+            if (textColor != null)
+                json.writeValue("textColor", textColor);
+
+            if (talkingTextPos != null) {
+                float worldScale = EngineAssetManager.getInstance().getScale();
+                json.writeValue("talkingTextPos",
+                        new Vector2(talkingTextPos.x / worldScale, talkingTextPos.y / worldScale));
+            }
+        } else {
+            if (!DEFAULT_STAND_ANIM.equals(standAnim))
+                json.writeValue("standAnim", standAnim);
+
+            if (!DEFAULT_WALK_ANIM.equals(walkAnim))
+                json.writeValue("walkAnim", walkAnim);
+
+            if (!DEFAULT_TALK_ANIM.equals(talkAnim))
+                json.writeValue("talkAnim", talkAnim);
+
+            if (isDirty(DirtyProps.TEXT_STYLE))
+                json.writeValue("textStyle", textStyle);
+
+            if (isDirty(DirtyProps.TEXT_COLOR))
+                json.writeValue("textColor", textColor);
+
+            if (isDirty(DirtyProps.TALKING_TEXT_POS)) {
+                float worldScale = EngineAssetManager.getInstance().getScale();
+                json.writeValue("talkingTextPos",
+                        new Vector2(talkingTextPos.x / worldScale, talkingTextPos.y / worldScale));
+            }
+        }
+
+        if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.WALKING_SPEED))
+            json.writeValue("walkingSpeed", walkingSpeed);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void read(Json json, JsonValue jsonData) {
+        super.read(json, jsonData);
+
+        BladeJson bjson = (BladeJson) json;
+        if (bjson.getMode() == Mode.MODEL) {
+            dialogs = json.readValue("dialogs", HashMap.class, Dialog.class, jsonData);
+
+            if (dialogs != null) {
+                for (Dialog d : dialogs.values())
+                    d.setActor(this);
+            }
+
+        } else {
+            if (dialogs != null) {
+                JsonValue dialogsValue = jsonData.get("dialogs");
+
+                for (Dialog d : dialogs.values()) {
+                    String id = d.getId();
+                    JsonValue dValue = dialogsValue.get(id);
+
+                    if (dValue != null)
+                        d.read(json, dValue);
+                }
+            }
+
+            standAnim = json.readValue("standAnim", String.class, DEFAULT_STAND_ANIM, jsonData);
+            walkAnim = json.readValue("walkAnim", String.class, DEFAULT_WALK_ANIM, jsonData);
+            talkAnim = json.readValue("talkAnim", String.class, DEFAULT_TALK_ANIM, jsonData);
+        }
+
+        textStyle = json.readValue("textStyle", String.class, textStyle, jsonData);
+        walkingSpeed = json.readValue("walkingSpeed", float.class, walkingSpeed, jsonData);
+        textColor = json.readValue("textColor", Color.class, textColor, jsonData);
+        talkingTextPos = json.readValue("talkingTextPos", Vector2.class, talkingTextPos, jsonData);
+
+        if (talkingTextPos != null) {
+            float worldScale = EngineAssetManager.getInstance().getScale();
+            talkingTextPos.x *= worldScale;
+            talkingTextPos.y *= worldScale;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/model/Dialog.java b/blade-engine/src/com/bladecoder/engine/model/Dialog.java
index e8a7f4e48..d180a4a78 100644
--- a/blade-engine/src/com/bladecoder/engine/model/Dialog.java
+++ b/blade-engine/src/com/bladecoder/engine/model/Dialog.java
@@ -16,26 +16,25 @@
 package com.bladecoder.engine.model;
 
 import java.util.ArrayList;
-
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.DialogOption;
-import com.bladecoder.engine.model.World;
+import java.util.List;
 
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
 
-public class Dialog implements Serializable   {
+public class Dialog implements Serializable {
 
 	public final static String DEFAULT_DIALOG_VERB = "dialog";
-	
-	private ArrayList<DialogOption> options = new ArrayList<DialogOption>();
-	
-	private DialogOption currentOption;
-	
+
+	private ArrayList<DialogOption> options = new ArrayList<>();
+
+	private int currentOption = -1;
+
 	private String id;
-	private String actor;
-	
+	private CharacterActor actor;
+
 	public String getId() {
 		return id;
 	}
@@ -43,167 +42,138 @@ public String getId() {
 	public void setId(String id) {
 		this.id = id;
 	}
-	
-	public String getActor() {
+
+	public CharacterActor getActor() {
 		return actor;
 	}
 
-	public void setActor(String actor) {
+	public void setActor(CharacterActor actor) {
 		this.actor = actor;
 	}
-	
-	public void selectOption(int i) {
-		
-		currentOption = getVisibleOptions().get(i);
-		
-		String v = currentOption.getVerbId();
-		
-		if(v == null) v = DEFAULT_DIALOG_VERB;
-		
-		// TODO: DELETE REFERENCE TO WORLD FROM DIALOG
-		BaseActor a = World.getInstance().getCurrentScene().getActor(actor, false);
-		a.runVerb(v);
-		
-		if(currentOption.getNext() != null) {
-			String next = currentOption.getNext();
-			
-			if(next.equalsIgnoreCase("parent"))
-				currentOption = currentOption.getParent();
+
+	public Dialog selectOption(int i) {
+		return selectOption(getVisibleOptions().get(i));
+	}
+
+	/**
+	 * @return The current visible options.
+	 */
+	public List<String> getChoices() {
+		ArrayList<DialogOption> options = getVisibleOptions();
+		List<String> choices = new ArrayList<>(options.size());
+
+		for (DialogOption o : options) {
+			choices.add(o.getText());
+		}
+
+		return choices;
+	}
+
+	public Dialog selectOption(DialogOption o) {
+
+		currentOption = options.indexOf(o);
+
+		String v = o.getVerbId();
+
+		if (v == null)
+			v = DEFAULT_DIALOG_VERB;
+
+		actor.runVerb(v);
+
+		if (o.isOnce())
+			o.setVisible(false);
+
+		currentOption = -1;
+
+		if (o.getNext() != null) {
+			String next = o.getNext();
+
+			if (next.equals("this"))
+				return this;
 			else
-				currentOption = findSerOption(next);
+				return actor.getDialog(next);
 		}
-		
+
+		return null;
 	}
-	
+
 	public void addOption(DialogOption o) {
 		options.add(o);
 	}
-	
-	public boolean ended() {
-		 return (getNumVisibleOptions() == 0);
-	}
 
-	private ArrayList<DialogOption> getOptions() {
-		if(currentOption == null) return options;
-			
-		return currentOption.options;
+	public ArrayList<DialogOption> getOptions() {
+		return options;
 	}
-	
-	public ArrayList<DialogOption> getVisibleOptions() {
-		ArrayList<DialogOption> current;
-		ArrayList<DialogOption> visible = new ArrayList<DialogOption>();
-		
-		if(currentOption == null) current = options;
-		else current =  currentOption.options;
-		
-		for(DialogOption o: current) {
-			if(o.isVisible()) visible.add(o);
+
+	private ArrayList<DialogOption> getVisibleOptions() {
+		ArrayList<DialogOption> visible = new ArrayList<>();
+
+		for (DialogOption o : options) {
+			if (o.isVisible())
+				visible.add(o);
 		}
-		
+
 		return visible;
-	}	
-	
+	}
+
 	public void reset() {
-		currentOption = null;
+		currentOption = -1;
 	}
-	
+
 	public int getNumVisibleOptions() {
 		int num = 0;
-		
-		for(DialogOption o:getOptions()) {
-			if(o.isVisible()) num++;
+
+		for (DialogOption o : getOptions()) {
+			if (o.isVisible())
+				num++;
 		}
-		
+
 		return num;
 	}
-	
-	public void setCurrentOption(DialogOption o) {
-		currentOption = o;
-	}
-	
+
 	public DialogOption getCurrentOption() {
-		return currentOption;
+		return currentOption == -1 ? null : options.get(currentOption);
 	}
 
-	
-	// ---------------------- SERIALIZATION --------------------------
-	
 	@Override
 	public void write(Json json) {
-		json.writeValue("id", id);
-		json.writeValue("actor", actor);
-		json.writeValue("options", options, ArrayList.class, DialogOption.class);
-		
-		String serCurrent = serOption(currentOption);		
-		json.writeValue("currentOption", serCurrent);	
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			json.writeValue("id", id);
+			// json.writeValue("actor", actor);
+		} else {
+			json.writeValue("currentOption", currentOption);
+		}
+
+		json.writeValue("options", options, DialogOption.class, DialogOption.class);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public void read (Json json, JsonValue jsonData) {
-//	public void read(Json json, OrderedMap<String, Object> jsonData) {
-		id = json.readValue("id", String.class, jsonData);
-		actor = json.readValue("actor", String.class, jsonData);
-		options = json.readValue("options", ArrayList.class, DialogOption.class, jsonData);
-		String currentSer = json.readValue("currentOption", String.class, jsonData);
-		currentOption = findSerOption(currentSer);
-		
-		// Recalculate parents
-		setParents(options, null);
-	}
+	public void read(Json json, JsonValue jsonData) {
 
-	private void setParents(ArrayList<DialogOption> list, DialogOption parent) {
-		for(DialogOption o:list) {
-			o.setParent(parent);
-			setParents(o.getOptions(), o);
-		}		
-	}
-	
-	public String serOption(DialogOption o) {
-		
-		if(o == null) return null;
-		
-		StringBuffer sb = new StringBuffer();
-		
-		DialogOption co = o;
-		DialogOption parent;
-		
-		do {
-			parent = co.getParent();
-			
-			int i;
-			
-			if(parent == null) {
-				i = options.indexOf(co);
-				sb.insert(0, i);
-			} else {
-				i = parent.getOptions().indexOf(co);
-				co = parent;
-				sb.insert(0, i);
-				sb.insert(0, ".");
-			}						
-		
-		} while(parent != null);
-		
-		return sb.toString();
-	}
-	
-	
-	public DialogOption findSerOption(String currentSer) {
-		if(currentSer == null) return null;
-		
-		String []list = currentSer.split("[.]");
-		
-		DialogOption o = null;
-		
-		for(String s:list) {
-			int i = Integer.parseInt(s);
-			
-			if(o == null) o = options.get(i);
-			else o = o.getOptions().get(i);
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			id = json.readValue("id", String.class, jsonData);
+			// actor = json.readValue("actor", String.class, jsonData);
+			options = json.readValue("options", ArrayList.class, DialogOption.class, jsonData);
+		} else {
+			JsonValue optionsValue = jsonData.get("options");
+
+			int i = 0;
+
+			for (DialogOption o : options) {
+				JsonValue jsonValue = optionsValue.get(i);
+
+				if (jsonValue == null)
+					break;
+
+				o.read(json, jsonValue);
+				i++;
+			}
+
+			currentOption = json.readValue("currentOption", int.class, jsonData);
 		}
-		
-		return o;
 	}
-
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/DialogOption.java b/blade-engine/src/com/bladecoder/engine/model/DialogOption.java
index b7fa08dbc..b69c65d55 100644
--- a/blade-engine/src/com/bladecoder/engine/model/DialogOption.java
+++ b/blade-engine/src/com/bladecoder/engine/model/DialogOption.java
@@ -15,88 +15,121 @@
  ******************************************************************************/
 package com.bladecoder.engine.model;
 
-import java.util.ArrayList;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
 
-import com.bladecoder.engine.model.DialogOption;
-
-public class DialogOption {
-	ArrayList<DialogOption> options = new ArrayList<DialogOption>();
-	
-	transient private DialogOption parent;
-		
+public class DialogOption implements Serializable {
 	private String text;
 	private String responseText;
 	private String verbId;
 	private String next;
 	private boolean visible = true;
-	
-	
-	public void addOption(DialogOption o) {
-		options.add(o);
-	}
-
+	private boolean once = false;
+	private String voiceId;
+	private String responseVoiceId;
 
 	public boolean isVisible() {
 		return visible;
 	}
 
-
 	public void setVisible(boolean visible) {
 		this.visible = visible;
 	}
 
-
 	public String getVerbId() {
 		return verbId;
 	}
 
-
 	public void setVerbId(String verbId) {
 		this.verbId = verbId;
 	}
 
-
 	public String getText() {
 		return text;
 	}
 
-
 	public void setText(String text) {
 		this.text = text;
 	}
 
-
-	public DialogOption getParent() {
-		return parent;
+	public String getVoiceId() {
+		return voiceId;
 	}
 
-
-	public void setParent(DialogOption parent) {
-		this.parent = parent;
+	public void setVoiceId(String voiceId) {
+		this.voiceId = voiceId;
 	}
 
-
-	public ArrayList<DialogOption> getOptions() {
-		return options;
+	public String getResponseVoiceId() {
+		return responseVoiceId;
 	}
 
+	public void setResponseVoiceId(String soundId) {
+		this.responseVoiceId = soundId;
+	}
 
 	public void setResponseText(String responseText) {
 		this.responseText = responseText;
 	}
-	
+
 	public String getResponseText() {
 		return responseText;
 	}
 
-
 	public String getNext() {
 		return next;
 	}
 
-
 	public void setNext(String next) {
 		this.next = next;
 	}
 
+	public boolean isOnce() {
+		return once;
+	}
+
+	public void setOnce(boolean once) {
+		this.once = once;
+	}
+
+	@Override
+	public void write(Json json) {
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			json.writeValue("text", text);
+			json.writeValue("responseText", responseText);
+			json.writeValue("verbId", verbId);
+			json.writeValue("next", next);
+			json.writeValue("once", once);
+			json.writeValue("soundId", voiceId);
+			json.writeValue("responseSoundId", responseVoiceId);
+		} else {
+
+		}
+
+		json.writeValue("visible", visible);
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			text = json.readValue("text", String.class, jsonData);
+			responseText = json.readValue("responseText", String.class, jsonData);
+			verbId = json.readValue("verbId", String.class, jsonData);
+			next = json.readValue("next", String.class, jsonData);
+			once = json.readValue("once", Boolean.class, jsonData);
+			voiceId = json.readValue("soundId", String.class, jsonData);
+			responseVoiceId = json.readValue("responseSoundId", String.class, jsonData);
+		} else {
+
+		}
+
+		visible = json.readValue("visible", boolean.class, false, jsonData);
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/DirtyProps.java b/blade-engine/src/com/bladecoder/engine/model/DirtyProps.java
new file mode 100644
index 000000000..616e76133
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/DirtyProps.java
@@ -0,0 +1,6 @@
+package com.bladecoder.engine.model;
+
+public enum DirtyProps {
+	POS, VISIBLE, DESC, ZINDEX, INTERACTION, STATE, LAYER, ROT, SCALEX, SCALEY, TINT, FAKE_DEPTH, BBOX_FROM_RENDERER,
+	WALKING_SPEED, TEXT_COLOR, TALKING_TEXT_POS, TEXT_STYLE;
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/ImageRenderer.java b/blade-engine/src/com/bladecoder/engine/model/ImageRenderer.java
index b314a629c..d45ffd1d8 100644
--- a/blade-engine/src/com/bladecoder/engine/model/ImageRenderer.java
+++ b/blade-engine/src/com/bladecoder/engine/model/ImageRenderer.java
@@ -17,132 +17,107 @@
 
 import java.util.HashMap;
 
-import com.bladecoder.engine.model.SpriteRenderer;
-
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.Texture.TextureFilter;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.anim.FrameAnimation;
+import com.bladecoder.engine.anim.AnimationDesc;
 import com.bladecoder.engine.anim.Tween;
 import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
 import com.bladecoder.engine.util.EngineLogger;
 import com.bladecoder.engine.util.RectangleRenderer;
 
-public class ImageRenderer implements SpriteRenderer {
-
-	private HashMap<String, FrameAnimation> fanims = new HashMap<String, FrameAnimation>();
-	
-	/** Starts this anim the first time that the scene is loaded */
-	private String initFrameAnimation;
-
-	private FrameAnimation currentFrameAnimation;
+public class ImageRenderer extends AnimationRenderer {
 
-	private ImageCacheEntry currentSource;
-	private boolean flipX;
-	
-	private final HashMap<String, ImageCacheEntry> sourceCache = new HashMap<String, ImageCacheEntry>();
-
-	class ImageCacheEntry {
-		int refCounter;
-		
+	class ImageCacheEntry extends CacheEntry {
 		Texture tex;
-	}	
-	
-	public ImageRenderer() {
-		
 	}
 
-	@Override
-	public void setInitFrameAnimation(String fa) {
-		initFrameAnimation = fa;
+	public ImageRenderer() {
+
 	}
-	
+
 	@Override
-	public String getInitFrameAnimation() {
-		return initFrameAnimation;
+	public String[] getInternalAnimations(AnimationDesc anim) {
+		return new String[] { anim.source.substring(0, anim.source.lastIndexOf('.')) };
 	}
-	
-	@Override
-	public String[] getInternalAnimations(String source) {
-		return new String[]{source.substring(0,source.lastIndexOf('.'))};
-	}	
-
 
 	@Override
 	public void update(float delta) {
 	}
 
 	@Override
-	public void draw(SpriteBatch batch, float x, float y, float scale) {
-		
-		x = x - getWidth() / 2 * scale; // SET THE X ORIGIN TO THE CENTER OF THE SPRITE
+	public void draw(SpriteBatch batch, float x, float y, float scaleX, float scaleY, float rotation, Color tint) {
 
-		if (currentSource == null || currentSource.tex == null) {
-			RectangleRenderer.draw(batch, x, y, getWidth() * scale, getHeight()
-					* scale, Color.RED);
+		float dx = getAlignDx(getWidth(), orgAlign);
+		float dy = getAlignDy(getHeight(), orgAlign);
+
+		ImageCacheEntry source = (ImageCacheEntry) currentSource;
+
+		if (source == null || source.tex == null) {
+			RectangleRenderer.draw(batch, x + dx * scaleX, y + dy * scaleY, getWidth() * scaleX, getHeight() * scaleY,
+					Color.RED);
 			return;
 		}
 
-		if (!flipX) {
-			batch.draw(currentSource.tex, x, y, currentSource.tex.getWidth() *  scale,
-					currentSource.tex.getHeight() * scale);
-		} else {
-			batch.draw(currentSource.tex, x, y, -currentSource.tex.getWidth() *  scale,
-					currentSource.tex.getHeight() * scale);
-		}
+		if (tint != null)
+			batch.setColor(tint);
+
+		x = x + dx;
+		y = y + dy;
+
+		batch.draw(source.tex, x, y, -dx, -dy, getWidth(), getHeight(), scaleX, scaleY, rotation, 0, 0,
+				source.tex.getWidth(), source.tex.getHeight(), flipX, false);
+
+		if (tint != null)
+			batch.setColor(Color.WHITE);
 	}
 
 	@Override
 	public float getWidth() {
-		if (currentSource == null || currentSource.tex == null)
-			return 200;
+		ImageCacheEntry source = (ImageCacheEntry) currentSource;
+
+		if (source == null || source.tex == null)
+			return super.getWidth();
 
-		return currentSource.tex.getWidth();
+		return source.tex.getWidth();
 	}
 
 	@Override
 	public float getHeight() {
-		if (currentSource == null || currentSource.tex == null)
-			return 200;
+		ImageCacheEntry source = (ImageCacheEntry) currentSource;
 
-		return currentSource.tex.getHeight();
-	}
+		if (source == null || source.tex == null)
+			return super.getHeight();
 
-	@Override
-	public FrameAnimation getCurrentFrameAnimation() {
-		return currentFrameAnimation;
+		return source.tex.getHeight();
 	}
 
 	@Override
-	public HashMap<String, FrameAnimation> getFrameAnimations() {
-		return (HashMap<String, FrameAnimation>)fanims;
-	}
-
-	@Override
-	public void startFrameAnimation(String id, int repeatType, int count,
-			ActionCallback cb) {
-		FrameAnimation fa = getFrameAnimation(id);
-		
-		if(cb != null)
-			ActionCallbackQueue.add(cb);
+	public void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb) {
+		AnimationDesc fa = getAnimation(id);
 
 		if (fa == null) {
-			EngineLogger.error("FrameAnimation not found: " + id);
+			EngineLogger.error("AnimationDesc not found: " + id);
 
 			return;
 		}
 
-		if (currentFrameAnimation != null
-				&& currentFrameAnimation.disposeWhenPlayed)
-			disposeSource(currentFrameAnimation.source);
+		if (cb != null) {
+			cb.resume();
+		}
+
+		if (currentAnimation != null && currentAnimation.disposeWhenPlayed)
+			disposeSource(currentAnimation.source);
 
-		currentFrameAnimation = fa;
+		currentAnimation = fa;
 		currentSource = sourceCache.get(fa.source);
 
 		// If the source is not loaded. Load it.
@@ -155,143 +130,50 @@ public void startFrameAnimation(String id, int repeatType, int count,
 			currentSource = sourceCache.get(fa.source);
 
 			if (currentSource == null) {
-				EngineLogger.error("Could not load FrameAnimation: " + id);
-				currentFrameAnimation = null;
+				EngineLogger.error("Could not load AnimationDesc: " + id);
+				currentAnimation = null;
 
+				computeBbox();
 				return;
 			}
 		}
-	}
-
-	@Override
-	public String getCurrentFrameAnimationId() {
-		if (currentFrameAnimation == null)
-			return null;
-
-		String id = currentFrameAnimation.id;
-
-		if (flipX) {
-			id = FrameAnimation.getFlipId(id);
-		}
-
-		return id;
 
+		computeBbox();
 	}
 
 	@Override
-	public void addFrameAnimation(FrameAnimation fa) {
-		if(initFrameAnimation == null)
-			initFrameAnimation = fa.id; 
-			
-		fanims.put(fa.id, fa);
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer(super.toString());
-
-		sb.append("\n  Anims:");
-
-		for (String v : fanims.keySet()) {
-			sb.append(" ").append(v);
-		}
-
-		sb.append("\n  Current Anim: ").append(currentFrameAnimation.id);
-
-		sb.append("\n");
+	public void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb, String direction) {
+		StringBuilder sb = new StringBuilder(id);
 
-		return sb.toString();
-	}
-
-	private FrameAnimation getFrameAnimation(String id) {
-		FrameAnimation fa = fanims.get(id);
-		flipX = false;
+		// if dir==null gets the current animation direction
+		if (direction == null) {
+			int idx = getCurrentAnimationId().indexOf('.');
 
-		if (fa == null) {
-			// Search for flipped
-			String flipId = FrameAnimation.getFlipId(id);
-
-			fa = fanims.get(flipId);
-
-			if (fa != null)
-				flipX = true;
-			else {
-				// search for .left if .frontleft not found and viceversa
-				StringBuilder sb = new StringBuilder();
-				
-				if (id.endsWith(FrameAnimation.FRONTLEFT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.LEFT);
-				} else if (id.endsWith(FrameAnimation.FRONTRIGHT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.RIGHT);
-				} else if (id.endsWith(FrameAnimation.BACKLEFT) || id.endsWith(FrameAnimation.BACKRIGHT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.BACK);
-				} else if (id.endsWith(FrameAnimation.LEFT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.FRONTLEFT);
-				} else if (id.endsWith(FrameAnimation.RIGHT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.FRONTRIGHT);			
-				}
-
-				String s = sb.toString();
-
-				fa = fanims.get(s);
-
-				if (fa == null) {
-					// Search for flipped
-					flipId = FrameAnimation.getFlipId(s);
-
-					fa = fanims.get(flipId);
-
-					if (fa != null)
-						flipX = true;
-				}
+			if (idx != -1) {
+				String dir = getCurrentAnimationId().substring(idx);
+				sb.append(dir);
 			}
+		} else {
+			sb.append('.');
+			sb.append(direction);
 		}
 
-		return fa;
-	}
+		String anim = sb.toString();
 
-	@Override
-	public void lookat(float x, float y, Vector2 pf) {
-		lookat(FrameAnimation.getFrameDirection(x, y, pf));
-	}
-
-	@Override
-	public void lookat(String dir) {
-		StringBuilder sb = new StringBuilder();
-		sb.append(FrameAnimation.STAND_ANIM);
-		sb.append('.');
-		sb.append(dir);
-
-		startFrameAnimation(sb.toString(), Tween.FROM_FA, 1, null);
-	}
-
-	@Override
-	public void stand() {
-		String standFA = FrameAnimation.STAND_ANIM;
-		int idx = getCurrentFrameAnimationId().indexOf('.');
-
-		if (idx != -1) {
-			standFA += getCurrentFrameAnimationId().substring(idx);
+		if (getAnimation(anim) == null) {
+			anim = id;
 		}
 
-		startFrameAnimation(standFA, Tween.FROM_FA, 1, null);
+		startAnimation(anim, repeatType, count, null);
 	}
 
 	@Override
-	public void startWalkFA(Vector2 p0, Vector2 pf) {
-		String currentDirection = FrameAnimation.getFrameDirection(p0.x, p0.y, pf);
-		StringBuilder sb = new StringBuilder();
-		sb.append(FrameAnimation.WALK_ANIM).append('.').append(currentDirection);
-		startFrameAnimation(sb.toString(), Tween.FROM_FA, 1, null);
+	public void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb, Vector2 p0, Vector2 pf) {
+		startAnimation(id, repeatType, count, cb, getDirectionString(p0, pf, getDirs(id, fanims)));
 	}
-	
+
 	private void loadSource(String source) {
-		ImageCacheEntry entry = sourceCache.get(source);
+		CacheEntry entry = sourceCache.get(source);
 
 		if (entry == null) {
 			entry = new ImageCacheEntry();
@@ -300,8 +182,10 @@ private void loadSource(String source) {
 
 		if (entry.refCounter == 0) {
 			// I18N for images
-			if(source.charAt(0) == '@')
-			source = I18N.getString(source.substring(1));
+			if (source.charAt(0) == I18N.PREFIX) {
+				source = getI18NSource(source.substring(1));
+			}
+
 			EngineAssetManager.getInstance().loadTexture(EngineAssetManager.IMAGE_DIR + source);
 		}
 
@@ -309,7 +193,7 @@ private void loadSource(String source) {
 	}
 
 	private void retrieveSource(String source) {
-		ImageCacheEntry entry = sourceCache.get(source);
+		CacheEntry entry = sourceCache.get(source);
 
 		if (entry == null || entry.refCounter < 1) {
 			loadSource(source);
@@ -317,17 +201,36 @@ private void retrieveSource(String source) {
 			entry = sourceCache.get(source);
 		}
 
-		if (entry.tex == null) {
+		if (((ImageCacheEntry) entry).tex == null) {
 			// I18N for images
-			if(source.charAt(0) == '@')
-				source = I18N.getString(source.substring(1));
-			
-			entry.tex = EngineAssetManager.getInstance().getTexture(EngineAssetManager.IMAGE_DIR + source);
+			if (source.charAt(0) == I18N.PREFIX) {
+				source = getI18NSource(source.substring(1));
+			}
+
+			((ImageCacheEntry) entry).tex = EngineAssetManager.getInstance()
+					.getTexture(EngineAssetManager.IMAGE_DIR + source);
+
+			((ImageCacheEntry) entry).tex.setFilter(TextureFilter.Linear, TextureFilter.Linear);
 		}
 	}
 
+	private String getI18NSource(String source) {
+		String lang = world.getI18N().getCurrentLocale().getLanguage();
+
+		int pointIdx = source.lastIndexOf('.');
+		String ext = source.substring(pointIdx);
+		String name = source.substring(0, pointIdx);
+
+		String localName = name + "_" + lang + ext;
+
+		if (EngineAssetManager.getInstance().assetExists(EngineAssetManager.IMAGE_DIR + localName))
+			return localName;
+
+		return source;
+	}
+
 	private void disposeSource(String source) {
-		ImageCacheEntry entry = sourceCache.get(source);
+		ImageCacheEntry entry = (ImageCacheEntry) sourceCache.get(source);
 
 		if (entry.refCounter == 1) {
 			EngineAssetManager.getInstance().disposeTexture(entry.tex);
@@ -339,17 +242,17 @@ private void disposeSource(String source) {
 
 	@Override
 	public void loadAssets() {
-		for (FrameAnimation fa : fanims.values()) {
+		for (AnimationDesc fa : fanims.values()) {
 			if (fa.preload)
 				loadSource(fa.source);
 		}
 
-		if (currentFrameAnimation != null && !currentFrameAnimation.preload) {
-			loadSource(currentFrameAnimation.source);
-		} else if (currentFrameAnimation == null && initFrameAnimation != null) {
-			FrameAnimation fa = fanims.get(initFrameAnimation);
+		if (currentAnimation != null && !currentAnimation.preload) {
+			loadSource(currentAnimation.source);
+		} else if (currentAnimation == null && initAnimation != null) {
+			AnimationDesc fa = fanims.get(initAnimation);
 
-			if (!fa.preload)
+			if (fa != null && !fa.preload)
 				loadSource(fa.source);
 		}
 	}
@@ -362,59 +265,38 @@ public void retrieveAssets() {
 				retrieveSource(key);
 		}
 
-		if (currentFrameAnimation != null) {
-			ImageCacheEntry entry = sourceCache
-					.get(currentFrameAnimation.source);
+		if (currentAnimation != null) {
+			CacheEntry entry = sourceCache.get(currentAnimation.source);
 			currentSource = entry;
-		} else if (initFrameAnimation != null) {
-			startFrameAnimation(initFrameAnimation, Tween.FROM_FA, 1, null);
+		} else if (initAnimation != null) {
+			startAnimation(initAnimation, Tween.Type.SPRITE_DEFINED, 1, null);
 		}
+
+		computeBbox();
 	}
 
 	@Override
 	public void dispose() {
-		for (ImageCacheEntry entry : sourceCache.values()) {
-			EngineAssetManager.getInstance().disposeTexture(entry.tex);
+		for (CacheEntry entry : sourceCache.values()) {
+			Texture tex = ((ImageCacheEntry) entry).tex;
+			if (entry.refCounter > 0 && tex != null)
+				EngineAssetManager.getInstance().disposeTexture(tex);
 		}
 
 		sourceCache.clear();
 		currentSource = null;
 	}
 
-	@Override
-	public void write(Json json) {
-
-		json.writeValue("fanims", fanims, HashMap.class, FrameAnimation.class);
-
-		String currentFrameAnimationId = null;
-
-		if (currentFrameAnimation != null)
-			currentFrameAnimationId = currentFrameAnimation.id;
-
-		json.writeValue("currentFrameAnimation", currentFrameAnimationId);
-		
-		json.writeValue("initFrameAnimation", initFrameAnimation);
-
-		json.writeValue("flipX", flipX);
-	}
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public void read(Json json, JsonValue jsonData) {
+		super.read(json, jsonData);
 
-		fanims = json.readValue("fanims", HashMap.class,
-				FrameAnimation.class, jsonData);
-
-		String currentFrameAnimationId = json.readValue(
-				"currentFrameAnimation", String.class, jsonData);
-
-		if (currentFrameAnimationId != null)
-			currentFrameAnimation = fanims.get(currentFrameAnimationId);
-		
-		initFrameAnimation = json.readValue("initFrameAnimation", String.class,
-				jsonData);
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			fanims = json.readValue("fanims", HashMap.class, AnimationDesc.class, jsonData);
+		} else {
 
-		flipX = json.readValue("flipX", Boolean.class, jsonData);
+		}
 	}
-
 }
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/model/InteractiveActor.java b/blade-engine/src/com/bladecoder/engine/model/InteractiveActor.java
new file mode 100644
index 000000000..dae7999c7
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/InteractiveActor.java
@@ -0,0 +1,272 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.model;
+
+import java.util.HashMap;
+import java.util.Map.Entry;
+
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+
+/**
+ * An InteractiveActor is any object in a scene or in the inventory that has
+ * user interaction.
+ * 
+ * @author rgarcia
+ */
+public class InteractiveActor extends BaseActor implements Comparable<InteractiveActor> {
+	protected String desc;
+	protected float zIndex;
+	protected boolean interaction = true;
+
+	/** internal state. Can be used for actions to maintain a state machine */
+	protected String state;
+
+	protected final VerbManager verbs = new VerbManager();
+
+	/**
+	 * State to know when the player is inside this actor to trigger the enter/exit
+	 * verbs
+	 */
+	private boolean playerInside = false;
+
+	protected String layer;
+
+	/**
+	 * Characters use this point to walk to the actor.
+	 */
+	private final Vector2 refPoint = new Vector2();
+
+	public void setLayer(String layer) {
+		this.layer = layer;
+
+		setDirtyProp(DirtyProps.LAYER);
+	}
+
+	public String getLayer() {
+		return layer;
+	}
+
+	/**
+	 * @return Is visible and has interaction
+	 */
+	public boolean canInteract() {
+		return interaction && isVisible();
+	}
+
+	public boolean getInteraction() {
+		return interaction;
+	}
+
+	public void setInteraction(boolean interaction) {
+		this.interaction = interaction;
+		setDirtyProp(DirtyProps.INTERACTION);
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+		setDirtyProp(DirtyProps.DESC);
+	}
+
+	public Vector2 getRefPoint() {
+		return refPoint;
+	}
+
+	public void setRefPoint(float x, float y) {
+		refPoint.set(x, y);
+	}
+
+	public VerbManager getVerbManager() {
+		return verbs;
+	}
+
+	@Override
+	public void update(float delta) {
+		InteractiveActor player = null;
+
+		if (scene != null)
+			player = scene.getPlayer();
+
+		if (isVisible() && player != null) {
+			boolean hit = hit(player.getX(), player.getY());
+			if (!hit && playerInside) {
+				// the player leaves
+				playerInside = false;
+
+				Verb v = getVerb("exit");
+				if (v != null)
+					v.run(null, null);
+			} else if (hit && !playerInside) {
+				// the player enters
+				playerInside = true;
+
+				Verb v = getVerb("enter");
+				if (v != null)
+					v.run(null, null);
+			}
+		}
+	}
+
+	public Verb getVerb(String id) {
+		return verbs.getVerb(id, state, null);
+	}
+
+	public Verb getVerb(String id, String target) {
+		return verbs.getVerb(id, state, target);
+	}
+
+	public void runVerb(String id) {
+		verbs.runVerb(id, state, null, null);
+	}
+
+	public void runVerb(String id, String target) {
+		verbs.runVerb(id, state, target, null);
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder();
+
+		sb.append(super.toString());
+		sb.append("  State: ").append(state);
+		sb.append("\n  Desc: ").append(desc);
+		sb.append("\n  Verbs:");
+
+		for (String v : verbs.getVerbs().keySet()) {
+			sb.append(" ").append(v);
+		}
+
+		sb.append("\n");
+
+		return sb.toString();
+	}
+
+	public float getZIndex() {
+		return zIndex;
+	}
+
+	public void setZIndex(float z) {
+		zIndex = z;
+
+		setDirtyProp(DirtyProps.ZINDEX);
+	}
+
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+		setDirtyProp(DirtyProps.STATE);
+	}
+
+	@Override
+	public int compareTo(InteractiveActor o) {
+		return (int) (o.getBBox().getY() - this.getBBox().getY());
+	}
+
+	@Override
+	public void write(Json json) {
+		super.write(json);
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			if (desc != null)
+				json.writeValue("desc", desc);
+
+			if (state != null)
+				json.writeValue("state", state);
+
+			float worldScale = EngineAssetManager.getInstance().getScale();
+			json.writeValue("refPoint", new Vector2(getRefPoint().x / worldScale, getRefPoint().y / worldScale));
+		} else {
+			json.writeValue("playerInside", playerInside);
+
+			if (isDirty(DirtyProps.DESC))
+				json.writeValue("desc", desc);
+
+			if (isDirty(DirtyProps.STATE))
+				json.writeValue("state", state);
+		}
+
+		verbs.write(json);
+
+		if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.INTERACTION))
+			json.writeValue("interaction", interaction);
+
+		if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.ZINDEX))
+			json.writeValue("zIndex", zIndex);
+
+		if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.LAYER))
+			json.writeValue("layer", layer);
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		super.read(json, jsonData);
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			layer = json.readValue("layer", String.class, jsonData);
+			Vector2 r = json.readValue("refPoint", Vector2.class, jsonData);
+
+			if (r != null) {
+				float worldScale = EngineAssetManager.getInstance().getScale();
+				getRefPoint().set(r.x * worldScale, r.y * worldScale);
+			}
+
+			// Load actor sounds for backwards compatibility.
+			@SuppressWarnings("unchecked")
+			HashMap<String, SoundDesc> sounds = json.readValue("sounds", HashMap.class, SoundDesc.class, jsonData);
+
+			if (sounds != null) {
+				for (Entry<String, SoundDesc> e : sounds.entrySet()) {
+					e.getValue().setId(id + "_" + e.getKey());
+					bjson.getWorld().getSounds().put(id + "_" + e.getKey(), e.getValue());
+				}
+			}
+
+		} else {
+
+			playerInside = json.readValue("playerInside", boolean.class, false, jsonData);
+			String newLayer = json.readValue("layer", String.class, jsonData);
+
+			if (newLayer != null && !newLayer.equals(layer)) {
+				if (scene != null) {
+					if (scene.getLayer(layer).remove(this))
+						scene.getLayer(newLayer).add(this);
+				}
+
+				layer = newLayer;
+			}
+		}
+
+		verbs.read(json, jsonData);
+		interaction = json.readValue("interaction", boolean.class, interaction, jsonData);
+		state = json.readValue("state", String.class, state, jsonData);
+		zIndex = json.readValue("zIndex", float.class, zIndex, jsonData);
+		desc = json.readValue("desc", String.class, desc, jsonData);
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/Inventory.java b/blade-engine/src/com/bladecoder/engine/model/Inventory.java
index ef60f7fc5..ffe22ae6c 100644
--- a/blade-engine/src/com/bladecoder/engine/model/Inventory.java
+++ b/blade-engine/src/com/bladecoder/engine/model/Inventory.java
@@ -17,15 +17,19 @@
 
 import java.util.ArrayList;
 
-import com.bladecoder.engine.model.SpriteActor;
-
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.SceneActorRef;
 import com.bladecoder.engine.assets.AssetConsumer;
+import com.bladecoder.engine.serialization.BladeJson;
 import com.bladecoder.engine.util.EngineLogger;
 
-public class Inventory implements AssetConsumer {
-	ArrayList<SpriteActor> items;
+public class Inventory implements AssetConsumer, Serializable  {
+	private ArrayList<SpriteActor> items;
 	
 	private boolean visible = true;
+	transient private boolean disposed= true;
 
 	public Inventory() {
 		items = new ArrayList<SpriteActor>();
@@ -35,11 +39,11 @@ public int getNumItems() {
 		return items.size();
 	}
 
-	public SpriteActor getItem(int i) {
+	public SpriteActor get(int i) {
 		return items.get(i);
 	}
 
-	public SpriteActor getItem(String actorId) {
+	public SpriteActor get(String actorId) {
 		for (SpriteActor a : items) {
 			if (a.getId().equals(actorId))
 				return a;
@@ -54,23 +58,37 @@ public void addItem(SpriteActor actor) {
 		} else
 			EngineLogger.error("BaseActor already in inventory: " + actor.getId());
 
-		//actor.setFrameAnimation("inventory");
 	}
 
 	public void removeItem(SpriteActor item) {
 		items.remove(item);
 	}
 	
-	public void removeItem(String item) {
+	public SpriteActor removeItem(String item) {
 		for (SpriteActor a : items) {
 			if (a.getId().equals(item)){
 				items.remove(a);
-				break;
+				return a;
 			}
-		}	
+		}
+		
+		return null;
+	}
+	
+	public void update(float delta) {
+		for (SpriteActor a : items) {
+			a.update(delta);
+		}
 	}
 	
+	/**
+	 * Dispose and remove all items.
+	 */
 	public void removeAllItems() {
+		for (SpriteActor a : items) {
+			a.dispose();
+		}
+		
 		items.clear();
 	}	
 
@@ -93,12 +111,67 @@ public void retrieveAssets() {
 		for (SpriteActor a : items) {
 			a.retrieveAssets();
 		}
+		
+		disposed = false;
 	}	
 	
 	@Override
 	public void dispose() {
 		for (SpriteActor a : items)
 			a.dispose();
+		
+		disposed = true;
 	}
 	
+	public boolean isDisposed() {
+		return disposed;
+	}
+
+	
+	@Override
+	public void write(Json json) {
+		SceneActorRef actorRef;
+		
+		json.writeValue("visible", visible);
+
+		json.writeObjectStart("items");
+		for (SpriteActor a : items) {
+			actorRef = new SceneActorRef(a.getInitScene(), a.getId());
+			json.writeValue(actorRef.toString(), a);
+		}
+		json.writeObjectEnd();
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		BladeJson bjson = (BladeJson) json;
+		
+		visible = json.readValue("visible", Boolean.class, jsonData);
+		
+		items.clear();
+		
+		JsonValue jsonValueActors = jsonData.get("items");
+		SceneActorRef actorRef;
+
+		// GET ACTORS FROM HIS INIT SCENE.
+		for (int i = 0; i < jsonValueActors.size; i++) {
+			JsonValue jsonValueAct = jsonValueActors.get(i);
+			actorRef = new SceneActorRef(jsonValueAct.name);
+			Scene sourceScn = bjson.getWorld().getScene(actorRef.getSceneId());
+
+			BaseActor actor = sourceScn.getActor(actorRef.getActorId(), false);
+			sourceScn.removeActor(actor);
+			addItem((SpriteActor)actor);
+		}
+		
+		// READ ACTOR STATE. 
+		// The state must be retrieved after getting actors from his init scene to restore verb cb properly.
+		for (int i = 0; i < jsonValueActors.size; i++) {
+			JsonValue jsonValueAct = jsonValueActors.get(i);
+			actorRef = new SceneActorRef(jsonValueAct.name);
+
+			SpriteActor actor = items.get(i);
+			actor.read(json, jsonValueAct);
+		}
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/MusicDesc.java b/blade-engine/src/com/bladecoder/engine/model/MusicDesc.java
new file mode 100644
index 000000000..fabd0be92
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/MusicDesc.java
@@ -0,0 +1,92 @@
+package com.bladecoder.engine.model;
+
+/**
+ * Keeps the information to play a music file.
+ * 
+ * @author rgarcia
+ */
+public class MusicDesc {
+	private String filename;
+	
+	private boolean loop = false;
+	
+	/**
+	 * The music starts to play after the delay.
+	 */
+	private float initialDelay = 0;
+	
+	/** 
+	 * Time for repeating the music when no looping.
+	 *    
+	 * -1 for no repeat 
+	 */
+	private float repeatDelay = -1;
+	
+	/**
+	 * Stops the music when leaving the current scene 
+	 */
+	private boolean stopWhenLeaving = true;
+	
+	private float volume = 1.0f;
+	
+	public MusicDesc() {
+		
+	}
+	
+	public MusicDesc(MusicDesc md) {
+		filename = md.getFilename();
+		loop = md.isLoop();
+		initialDelay = md.getInitialDelay();
+		repeatDelay = md.getRepeatDelay();
+		stopWhenLeaving = md.isStopWhenLeaving();
+		volume = md.getVolume();
+	}
+
+	public String getFilename() {
+		return filename;
+	}
+
+	public void setFilename(String musicFilename) {
+		this.filename = musicFilename;
+	}
+
+	public boolean isLoop() {
+		return loop;
+	}
+
+	public void setLoop(boolean loop) {
+		this.loop = loop;
+	}
+
+	public float getInitialDelay() {
+		return initialDelay;
+	}
+
+	public void setInitialDelay(float initialDelay) {
+		this.initialDelay = initialDelay;
+	}
+
+	public float getRepeatDelay() {
+		return repeatDelay;
+	}
+
+	public void setRepeatDelay(float repeatDelay) {
+		this.repeatDelay = repeatDelay;
+	}
+
+	public boolean isStopWhenLeaving() {
+		return stopWhenLeaving;
+	}
+
+	public void setStopWhenLeaving(boolean stopWhenLeaving) {
+		this.stopWhenLeaving = stopWhenLeaving;
+	}
+
+	public float getVolume() {
+		return volume;
+	}
+
+	public void setVolume(float volume) {
+		this.volume = volume;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/MusicManager.java b/blade-engine/src/com/bladecoder/engine/model/MusicManager.java
new file mode 100644
index 000000000..f8cad597f
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/MusicManager.java
@@ -0,0 +1,284 @@
+package com.bladecoder.engine.model;
+
+import java.io.FileNotFoundException;
+
+import com.badlogic.gdx.Application.ApplicationType;
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.audio.Music;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.anim.MusicVolumeTween;
+import com.bladecoder.engine.assets.AssetConsumer;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engine.util.InterpolationMode;
+
+/**
+ * Simple music engine.
+ *
+ * Plays a music file, if another music is playing, stops it before playing the
+ * new music.
+ *
+ * @author rgarcia
+ */
+public class MusicManager implements Serializable, AssetConsumer {
+	private MusicDesc desc = null;
+
+	private Music music = null;
+
+	private float currentMusicDelay = 0;
+	private boolean isPlayingSer = false;
+	private float musicPosSer = 0;
+	transient private boolean isPaused = false;
+	private MusicVolumeTween volumeTween;
+
+	// the global configurable by user volume
+	public static float VOLUME_MULTIPLIER = 1f;
+
+	private final Task backgroundLoadingTask = new Task() {
+		@Override
+		public void run() {
+			if (!EngineAssetManager.getInstance().isLoading()) {
+				cancel();
+				retrieveAssets();
+			}
+		}
+	};
+
+	public void playMusic() {
+		if (music != null && !music.isPlaying()) {
+
+			try {
+				music.play();
+				music.setLooping(desc.isLoop());
+				music.setVolume(desc.getVolume() * VOLUME_MULTIPLIER);
+			} catch (Exception e) {
+
+				// DEAL WITH OPENAL BUG
+				if (Gdx.app.getType() == ApplicationType.Desktop && e.getMessage().contains("40963")) {
+					EngineLogger.debug("!!!!!!!!!!!!!!!!!!!!!!!ERROR playing music trying again...!!!!!!!!!!!!!!!");
+
+					MusicDesc desc2 = desc;
+					desc = null;
+					setMusic(desc2);
+
+					return;
+				}
+
+				EngineLogger.error("Error Playing music: " + desc.getFilename(), e);
+			}
+		}
+	}
+
+	public void pauseMusic() {
+		if (music != null && music.isPlaying()) {
+			music.pause();
+			isPaused = true;
+		}
+	}
+
+	public void resumeMusic() {
+		if (music != null && isPaused) {
+			music.play();
+			isPaused = false;
+		}
+	}
+
+	public void stopMusic() {
+		if (music != null)
+			music.stop();
+	}
+
+	public void setMusic(MusicDesc d) {
+		if (desc != null && d != null && d.getFilename() != null && d.getFilename().equals(desc.getFilename())) {
+
+			EngineLogger.debug(">>>NOT SETTING MUSIC: This music file is already playing.");
+			return;
+		}
+
+		EngineLogger.debug(">>>SETTING MUSIC.");
+		stopMusic();
+		volumeTween = null;
+		currentMusicDelay = 0;
+
+		if (d != null) {
+			if (desc != null) {
+				dispose();
+			}
+
+			desc = new MusicDesc(d);
+
+			// Load the music file in background to avoid
+			// blocking the UI
+			loadTask();
+		} else {
+			dispose();
+			desc = null;
+		}
+	}
+
+	private void loadTask() {
+		loadAssets();
+
+		backgroundLoadingTask.cancel();
+		Timer.schedule(backgroundLoadingTask, 0, 0);
+	}
+
+	public void setVolume(float volume) {
+		if (desc != null)
+			desc.setVolume(volume);
+
+		if (music != null && music.isPlaying())
+			music.setVolume(volume * VOLUME_MULTIPLIER);
+	}
+
+	public float getVolume() {
+		if (desc != null)
+			return desc.getVolume();
+
+		return 1f;
+	}
+
+	public void leaveScene(MusicDesc newMusicDesc) {
+
+		if (desc != null && !desc.isStopWhenLeaving()
+				&& (newMusicDesc == null || newMusicDesc.getFilename().equals(desc.getFilename())))
+			return;
+
+		if (desc != null) {
+			currentMusicDelay = 0f;
+			stopMusic();
+			dispose();
+		}
+
+		if (newMusicDesc != null) {
+			desc = new MusicDesc(newMusicDesc);
+		} else {
+			desc = null;
+		}
+	}
+
+	public void update(float delta) {
+		// music delay update
+		if (music != null) {
+			if (!music.isPlaying()) {
+
+				boolean initialTime = false;
+
+				if (currentMusicDelay <= desc.getInitialDelay())
+					initialTime = true;
+
+				currentMusicDelay += delta;
+
+				if (initialTime) {
+					if (currentMusicDelay > desc.getInitialDelay())
+						playMusic();
+				} else {
+					if (desc.getRepeatDelay() >= 0
+							&& currentMusicDelay > desc.getRepeatDelay() + desc.getInitialDelay()) {
+						currentMusicDelay = desc.getInitialDelay() + delta;
+						playMusic();
+					}
+				}
+			}
+
+			if (volumeTween != null) {
+				volumeTween.update(delta);
+
+				if (volumeTween != null && volumeTween.isComplete()) {
+					volumeTween = null;
+				}
+			}
+		}
+	}
+
+	@Override
+	public void dispose() {
+		if (music != null) {
+			EngineLogger.debug("DISPOSING MUSIC: " + desc.getFilename());
+			EngineAssetManager.getInstance().disposeMusic(desc.getFilename());
+			music = null;
+			desc = null;
+			volumeTween = null;
+		}
+	}
+
+	@Override
+	public void loadAssets() {
+		if (music == null && desc != null) {
+			EngineLogger.debug("LOADING MUSIC: " + desc.getFilename());
+
+			try {
+				EngineAssetManager.getInstance().loadMusic(desc.getFilename());
+			} catch (FileNotFoundException e) {
+				EngineLogger.error("Not found: " + e.getLocalizedMessage());
+				desc = null;
+			}
+		}
+	}
+
+	@Override
+	public void retrieveAssets() {
+		if (music == null && desc != null) {
+			// Check if not loaded, this happens when setting a cached scene
+			if (!EngineAssetManager.getInstance().isLoaded(EngineAssetManager.MUSIC_DIR + desc.getFilename())) {
+				// Load the music file in background to avoid
+				// blocking the UI
+				loadTask();
+				return;
+			}
+
+			EngineLogger.debug("RETRIEVING MUSIC: " + desc.getFilename());
+
+			music = EngineAssetManager.getInstance().getMusic(desc.getFilename());
+
+			if (isPlayingSer) {
+				playMusic();
+
+				if (music != null) {
+					music.setPosition(musicPosSer);
+					musicPosSer = 0f;
+				}
+
+				isPlayingSer = false;
+			}
+		}
+	}
+
+	public void fade(float volume, float duration, ActionCallback cb) {
+		if (music != null) {
+			volumeTween = new MusicVolumeTween();
+			volumeTween.start(this, volume, duration, InterpolationMode.FADE, cb);
+		} else if (cb != null) {
+			cb.resume();
+		}
+	}
+
+	@Override
+	public void write(Json json) {
+		json.writeValue("desc", desc);
+		json.writeValue("currentMusicDelay", currentMusicDelay);
+		json.writeValue("isPlaying", music != null && (music.isPlaying() || isPaused));
+		json.writeValue("musicPos", music != null && (music.isPlaying() || isPaused) ? music.getPosition() : 0f);
+
+		if (volumeTween != null)
+			json.writeValue("volumeTween", volumeTween);
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		desc = json.readValue("desc", MusicDesc.class, jsonData);
+		currentMusicDelay = json.readValue("currentMusicDelay", float.class, jsonData);
+		isPlayingSer = json.readValue("isPlaying", boolean.class, jsonData);
+		musicPosSer = json.readValue("musicPos", float.class, jsonData);
+
+		volumeTween = json.readValue("volumeTween", MusicVolumeTween.class, jsonData);
+		if (volumeTween != null) {
+			volumeTween.setTarget(this);
+		}
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/ObstacleActor.java b/blade-engine/src/com/bladecoder/engine/model/ObstacleActor.java
new file mode 100644
index 000000000..3a4f40e03
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/ObstacleActor.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.model;
+
+import com.badlogic.gdx.utils.Json;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+import com.bladecoder.engine.util.PolygonUtils;
+
+/**
+ * An Obstacle actor is used to restrict the walk zone in the scene
+ * 
+ * @author rgarcia
+ */
+public class ObstacleActor extends BaseActor {
+
+	@Override
+	public void setVisible(boolean visible) {
+		super.setVisible(visible);
+
+		if (scene != null && scene.getPolygonalNavGraph() != null) {
+			if (visible)
+				scene.getPolygonalNavGraph().addDinamicObstacle(getBBox());
+			else
+				scene.getPolygonalNavGraph().removeDinamicObstacle(getBBox());
+		}
+	}
+
+	@Override
+	public void update(float delta) {
+	}
+
+	@Override
+	public void setPosition(float x, float y) {
+		boolean inNavGraph = false;
+
+		if (scene != null && scene.getPolygonalNavGraph() != null) {
+			inNavGraph = scene.getPolygonalNavGraph().removeDinamicObstacle(getBBox());
+		}
+
+		getBBox().setPosition(x, y);
+
+		if (inNavGraph) {
+			scene.getPolygonalNavGraph().addDinamicObstacle(getBBox());
+		}
+	}
+
+	@Override
+	public void write(Json json) {
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			PolygonUtils.ensureClockWise(getBBox().getVertices(), 0, getBBox().getVertices().length);
+			getBBox().dirty();
+		}
+
+		super.write(json);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/ParticleRenderer.java b/blade-engine/src/com/bladecoder/engine/model/ParticleRenderer.java
new file mode 100644
index 000000000..e38835225
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/ParticleRenderer.java
@@ -0,0 +1,231 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.model;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.ParticleEffect;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.math.Matrix4;
+import com.badlogic.gdx.math.Polygon;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+import com.bladecoder.engine.util.RectangleRenderer;
+
+public class ParticleRenderer implements ActorRenderer {
+
+	private final static float DEFAULT_DIM = 100;
+
+	private final ParticleEffect effect = new ParticleEffect();
+
+	private float lastAnimationTime = 0;
+
+	private Polygon bbox;
+
+	private String particleName;
+	private String atlasName;
+
+	private TextureAtlas atlasTex;
+
+	private float tmpPosX = 0;
+	private float tmpPosY = 0;
+	private static final Matrix4 tmp = new Matrix4();
+
+	private int orgAlign = Align.bottom;
+
+	public ParticleRenderer() {
+
+	}
+
+	public void reset() {
+		tmpPosX = tmpPosY = 0;
+		effect.reset();
+	}
+
+	@Override
+	public int getOrgAlign() {
+		return orgAlign;
+	}
+
+	@Override
+	public void setOrgAlign(int align) {
+		orgAlign = align;
+	}
+
+	@Override
+	public void update(float delta) {
+		try {
+			effect.update(delta);
+		} catch (Exception e) {
+			// avoid crashing if atlas is not found
+		}
+	}
+
+	@Override
+	public void draw(SpriteBatch batch, float x, float y, float scaleX, float scaleY, float rotation, Color tint) {
+
+		float finalScaleX = EngineAssetManager.getInstance().getScale() * scaleX;
+		float finalScaleY = EngineAssetManager.getInstance().getScale() * scaleY;
+
+		if (effect.getEmitters().size > 0) {
+
+			Matrix4 tm = batch.getTransformMatrix();
+			tmp.set(tm);
+
+			if (tmpPosX != x / finalScaleX || tmpPosY != y / finalScaleY) {
+				tmpPosX = x / finalScaleX;
+				tmpPosY = y / finalScaleY;
+
+				effect.setPosition(tmpPosX, tmpPosY);
+			}
+
+			tm.rotate(0, 0, 1, rotation).scale(finalScaleX, finalScaleY, 1);
+
+			batch.setTransformMatrix(tm);
+
+			if (tint != null)
+				batch.setColor(tint);
+
+			effect.draw(batch);
+
+			if (tint != null)
+				batch.setColor(Color.WHITE);
+
+			batch.setTransformMatrix(tmp);
+		} else {
+			x = x - getWidth() / 2 * finalScaleX;
+			RectangleRenderer.draw(batch, x, y, getWidth() * finalScaleX, getHeight() * finalScaleY, Color.RED);
+		}
+	}
+
+	@Override
+	public float getWidth() {
+		return DEFAULT_DIM;
+	}
+
+	@Override
+	public float getHeight() {
+		return DEFAULT_DIM;
+	}
+
+	public String getParticleName() {
+		return particleName;
+	}
+
+	public void setParticleName(String particleName) {
+		this.particleName = particleName;
+	}
+
+	public String getAtlasName() {
+		return atlasName;
+	}
+
+	public void setAtlasName(String atlasName) {
+		this.atlasName = atlasName;
+	}
+
+	@Override
+	public void updateBboxFromRenderer(Polygon bbox) {
+		this.bbox = bbox;
+
+		computeBbox();
+	}
+
+	private void computeBbox() {
+		if (bbox == null)
+			return;
+
+		if (bbox.getVertices() == null || bbox.getVertices().length != 8) {
+			bbox.setVertices(new float[8]);
+		}
+
+		float[] verts = bbox.getVertices();
+
+		verts[0] = -getWidth() / 2;
+		verts[1] = 0f;
+		verts[2] = -getWidth() / 2;
+		verts[3] = getHeight();
+		verts[4] = getWidth() / 2;
+		verts[5] = getHeight();
+		verts[6] = getWidth() / 2;
+		verts[7] = 0f;
+		bbox.dirty();
+	}
+
+	@Override
+	public void loadAssets() {
+		EngineAssetManager.getInstance().loadAtlas(getAtlasName());
+	}
+
+	@Override
+	public void retrieveAssets() {
+
+		if (!EngineAssetManager.getInstance().isAtlasLoaded(atlasName)) {
+			loadAssets();
+			EngineAssetManager.getInstance().finishLoading();
+		}
+
+		atlasTex = EngineAssetManager.getInstance().getTextureAtlas(getAtlasName());
+
+		effect.load(EngineAssetManager.getInstance().getParticle(getParticleName()), atlasTex);
+		effect.start();
+		// reset tmp to force repositioning
+		tmpPosX = Float.MAX_VALUE;
+		effect.update(lastAnimationTime);
+
+		computeBbox();
+	}
+
+	@Override
+	public void dispose() {
+		EngineAssetManager.getInstance().disposeAtlas(getAtlasName());
+	}
+
+	@Override
+	public void write(Json json) {
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			json.writeValue("atlasName", getAtlasName());
+			json.writeValue("particleName", getParticleName());
+			json.writeValue("orgAlign", orgAlign);
+		} else {
+			json.writeValue("lastAnimationTime", lastAnimationTime);
+		}
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			setAtlasName(json.readValue("atlasName", String.class, jsonData));
+			setParticleName(json.readValue("particleName", String.class, jsonData));
+			orgAlign = json.readValue("orgAlign", int.class, Align.bottom, jsonData);
+		} else {
+			lastAnimationTime = json.readValue("lastAnimationTime", Float.class, jsonData);
+		}
+	}
+
+	@Override
+	public void setWorld(World world) {
+		// TODO Auto-generated method stub
+
+	}
+}
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/model/Scene.java b/blade-engine/src/com/bladecoder/engine/model/Scene.java
index 91615d0b4..563ef227b 100644
--- a/blade-engine/src/com/bladecoder/engine/model/Scene.java
+++ b/blade-engine/src/com/bladecoder/engine/model/Scene.java
@@ -16,109 +16,108 @@
 package com.bladecoder.engine.model;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.SceneCamera;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.Transition;
-import com.bladecoder.engine.model.Verb;
-import com.bladecoder.engine.model.VerbManager;
-import com.bladecoder.engine.model.World;
-
-import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.Texture.TextureFilter;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
 import com.badlogic.gdx.math.Polygon;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.actions.SceneActorRef;
+import com.bladecoder.engine.anim.Timers;
 import com.bladecoder.engine.assets.AssetConsumer;
 import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.pathfinder.NavNode;
 import com.bladecoder.engine.polygonalpathfinder.NavNodePolygonal;
 import com.bladecoder.engine.polygonalpathfinder.PolygonalNavGraph;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
 import com.bladecoder.engine.util.EngineLogger;
 
-public class Scene implements Serializable,
-		AssetConsumer {
-	
-	public static final Color ACTOR_BBOX_COLOR = new Color(0.2f, 0.2f, 0.8f,
-			1f);
-	private static final TextureFilter BG_TEXFILTER_MAG = TextureFilter.Linear;
-	private static final TextureFilter BG_TEXFILTER_MIN = TextureFilter.Linear;
+public class Scene implements Serializable, AssetConsumer {
+
+	public static final Color ACTOR_BBOX_COLOR = new Color(0.2f, 0.2f, 0.8f, 1f);
 	public static final Color WALKZONE_COLOR = Color.GREEN;
 	public static final Color OBSTACLE_COLOR = Color.RED;
+	public static final Color ANCHOR_COLOR = Color.RED;
+	public static final float ANCHOR_RADIUS = 14f;
 
-	/** 
+	public static final String VAR_PLAYER = "$PLAYER";
+	public static final String VAR_PLAYER_2 = "$P";
+
+	/**
 	 * All actors in the scene
 	 */
-	private HashMap<String, BaseActor> actors = new HashMap<String, BaseActor>();
+	private Map<String, BaseActor> actors = new ConcurrentHashMap<>();
 
 	/**
-	 * BaseActor layers: Background actors, dynamic (ordered) and foreground
+	 * BaseActor layers
 	 */
-	private final List<BaseActor> bgActors = new ArrayList<BaseActor>();
-	private final List<BaseActor> dynamicActors = new ArrayList<BaseActor>();
-	private final List<BaseActor> fgActors = new ArrayList<BaseActor>();
-	
+	private List<SceneLayer> layers = new ArrayList<>();
+
+	private Timers timers = new Timers();
+
 	private SceneCamera camera = new SceneCamera();
-	
-	private Texture[] background;
-	private Texture[] lightMap;
-	private String backgroundFilename;
-	private String lightMapFilename;
-	
+
+	private Array<AtlasRegion> background;
+	private String backgroundAtlas;
+	private String backgroundRegionId;
+
 	/** For polygonal PathFinding */
-	private PolygonalNavGraph polygonalNavGraph;
-	
-	/** depth vector. x: scale when y=0, y: scale when y=scene height */
-	private Vector2 depthVector;
+	private final PolygonalNavGraph polygonalNavGraph = new PolygonalNavGraph();
 
-	/** For FADEIN/FADEOUT */
-	private Transition transition;
+	/**
+	 * depth vector. X: the actor 'y' position for a 0.0 scale, Y: the actor 'y'
+	 * position for a 1.0 scale.
+	 */
+	private Vector2 depthVector;
 
 	private String player;
-	
+
 	/** The actor the camera will follow */
 	private SpriteActor followActor;
 
-	private Music music = null;
-	private boolean loopMusic = false;
-	private float repeatMusicDelay = 0;
-	private float initialMusicDelay = 0;
-	private float currentMusicDelay = 0;
+	/**
+	 * Music for the scene.
+	 */
+	private MusicDesc musicDesc;
 
-	private String musicFilename;
-	private boolean isPlayingSer = false;
+	private Vector2 sceneSize;
 
-	transient private boolean isMusicPaused = false;
-	
 	private String id;
-	
+
 	/** internal state. Can be used for actions to maintain a state machine */
 	private String state;
-	
-	private VerbManager verbs = new VerbManager();
-	
-	/**
-	 * Add support for the use of global custom properties/variables in the game
-	 * logic
-	 */
-	private HashMap<String, String> customProperties;
 
-	public Scene() {	
+	private final VerbManager verbs = new VerbManager();
+
+	private final SceneSoundManager soundManager;
+
+	private final TextManager textManager;
+
+	private final World w;
+
+	/** The current walkzone actor */
+	private String walkZone;
+
+	public Scene(World w) {
+		this.w = w;
+
+		textManager = new TextManager(this);
+		soundManager = new SceneSoundManager(w);
 	}
-	
+
 	public String getId() {
 		return id;
 	}
@@ -126,70 +125,70 @@ public String getId() {
 	public void setId(String id) {
 		this.id = id;
 	}
-	
+
 	public String getState() {
 		return state;
 	}
-	
+
 	public void setState(String s) {
 		state = s;
 	}
 
-	
-	public void setCustomProperty(String name, String value) {
-		if(customProperties == null)
-			customProperties = new HashMap<String, String>();
-		
-		customProperties.put(name, value);
-	}
-	
-	public String getCustomProperty(String name) {
-		return customProperties.get(name);
+	public List<SceneLayer> getLayers() {
+		return layers;
 	}
 
-	public void playMusic() {
-		if (music != null && !music.isPlaying()) {
-			music.play();
-			music.setLooping(loopMusic);
+	public SceneLayer getLayer(String name) {
+		for (SceneLayer l : layers) {
+			if (name.equals(l.getName()))
+				return l;
 		}
+
+		return null;
 	}
 
-	public void pauseMusic() {
-		if (music != null && music.isPlaying()) {
-			music.pause();
-			isMusicPaused = true;
-		}
+	public void addLayer(SceneLayer layer) {
+		layers.add(layer);
 	}
 
-	public void resumeMusic() {
-		if (music != null && isMusicPaused) {
-			music.play();
-			isMusicPaused = false;
-		}
+	public TextManager getTextManager() {
+		return textManager;
 	}
 
-	public void stopMusic() {
-		if (music != null)
-			music.stop();
+	public World getWorld() {
+		return w;
 	}
-	
+
+	public Timers getTimers() {
+		return timers;
+	}
+
+	public void addTimer(float time, ActionCallback cb) {
+		timers.addTimer(time, cb);
+	}
+
+	public MusicDesc getMusicDesc() {
+		return musicDesc;
+	}
+
+	public void setMusicDesc(MusicDesc musicDesc) {
+		this.musicDesc = musicDesc;
+	}
+
 	public float getFakeDepthScale(float y) {
-		if(depthVector==null)
+		if (depthVector == null)
 			return 1.0f;
-		
-		// interpolation equation
-		return Math.abs(depthVector.x + (depthVector.y - depthVector.x) * y
-				/ camera.getScrollingHeight());
+
+		float worldScale = EngineAssetManager.getInstance().getScale();
+
+		return Math.max(0, (y - depthVector.x * worldScale) / ((depthVector.y - depthVector.x) * worldScale));
 	}
 
-	public void setMusic(String filename, boolean loop, float initialDelay,
-			float repeatDelay) {
-		loopMusic = loop;
-		musicFilename = filename;
-		initialMusicDelay = initialDelay;
-		repeatMusicDelay = repeatDelay;
+	public void init() {
+		timers.clear();
+		textManager.reset();
 	}
-	
+
 	public VerbManager getVerbManager() {
 		return verbs;
 	}
@@ -197,104 +196,67 @@ public VerbManager getVerbManager() {
 	public Verb getVerb(String id) {
 		return verbs.getVerb(id, state, null);
 	}
-	
+
 	public void runVerb(String id) {
-		verbs.runVerb(id, state, null);
+		verbs.runVerb(id, state, null, null);
 	}
 
 	public void update(float delta) {
-		// We draw the elements in order: from top to bottom.
-		// so we need to order the array list
-		Collections.sort(dynamicActors);
-
-		if (transition != null) {
-			transition.update(delta);
+		camera.update(delta);
 
-			if (transition.isFinish()) {
-				transition = null;
-			}
+		if (followActor != null) {
+			camera.updatePos(followActor);
 		}
 
-		// music delay update
-		if (music != null && !music.isPlaying()) {
-			boolean initialTime = false;
-
-			if (currentMusicDelay <= initialMusicDelay)
-				initialTime = true;
-
-			currentMusicDelay += delta;
+		timers.update(delta);
+		textManager.update(delta);
 
-			if (initialTime) {
-				if (currentMusicDelay > initialMusicDelay)
-					playMusic();
-			} else {
-				if (repeatMusicDelay >= 0
-						&& currentMusicDelay > repeatMusicDelay
-								+ initialMusicDelay) {
-					currentMusicDelay = initialMusicDelay;
-					playMusic();
-				}
-			}
-		}
+		for (BaseActor a : actors.values()) {
+			// stops if scene has changed, ex. a Leave has been done in some actor update.
+			if (w.getCurrentScene() != this)
+				break;
 
-		for (BaseActor a:actors.values()) {
 			a.update(delta);
 		}
-		
-		camera.update(delta);
+
+		// We draw the elements in order: from top to bottom.
+		// so we need to order the array list
+		for (SceneLayer layer : layers)
+			layer.update();
 	}
 
-	public void draw(SpriteBatch spriteBatch) {
-		
+	public void draw(SpriteBatch batch) {
+
 		if (background != null) {
-			spriteBatch.disableBlending();
+			batch.disableBlending();
+			batch.setProjectionMatrix(camera.calculateParallaxMatrix(1, 1));
+			batch.begin();
 
 			float x = 0;
 
-			for (Texture tile : background) {
-				spriteBatch.draw(tile, x, 0f);
-				x += tile.getWidth();
+			for (AtlasRegion tile : background) {
+				batch.draw(tile, x, 0f);
+				x += tile.getRegionWidth();
 			}
 
-			spriteBatch.enableBlending();
-		}
-		
-		for (BaseActor a : bgActors) {
-			if(a instanceof SpriteActor)
-				((SpriteActor)a).draw(spriteBatch);
+			batch.end();
+			batch.enableBlending();
 		}
 
-		for (BaseActor a : dynamicActors) {
-			if(a instanceof SpriteActor)
-				((SpriteActor)a).draw(spriteBatch);
-		}
-
-		for (BaseActor a : fgActors) {
-			if(a instanceof SpriteActor)
-				((SpriteActor)a).draw(spriteBatch);
-		}
-
-		// Draw the light map
-		if (lightMap != null) {
-			// Multiplicative blending for light maps
-			spriteBatch.setBlendFunction(GL20.GL_DST_COLOR, GL20.GL_ZERO);
-
-			float x = 0;
-
-			for (Texture tile : lightMap) {
-				spriteBatch.draw(tile, x, 0f);
-				x += tile.getWidth();
-			}
+		// draw layers from bottom to top
+		for (int i = layers.size() - 1; i >= 0; i--) {
+			SceneLayer layer = layers.get(i);
 
-			spriteBatch.setBlendFunction(GL20.GL_SRC_ALPHA,
-					GL20.GL_ONE_MINUS_SRC_ALPHA);
+			batch.setProjectionMatrix(camera.calculateParallaxMatrix(layer.getParallaxMultiplier(), 1));
+			batch.begin();
+			layer.draw(batch);
+			batch.end();
 		}
 	}
 
 	public void drawBBoxLines(ShapeRenderer renderer) {
 		// renderer.begin(ShapeType.Rectangle);
 		renderer.begin(ShapeType.Line);
-		renderer.setColor(ACTOR_BBOX_COLOR);
 
 		for (BaseActor a : actors.values()) {
 			Polygon p = a.getBBox();
@@ -302,30 +264,33 @@ public void drawBBoxLines(ShapeRenderer renderer) {
 			if (p == null) {
 				EngineLogger.error("ERROR DRAWING BBOX FOR: " + a.getId());
 			}
-			
-			Rectangle r = a.getBBox().getBoundingRectangle();
 
-			renderer.polygon(p.getTransformedVertices());
-			renderer.rect(r.getX(), r.getY(), r.getWidth(), r.getHeight());
+			if (a instanceof ObstacleActor) {
+				renderer.setColor(OBSTACLE_COLOR);
+				renderer.polygon(p.getTransformedVertices());
+			} else if (a instanceof AnchorActor) {
+				renderer.setColor(Scene.ANCHOR_COLOR);
+				renderer.line(p.getX() - Scene.ANCHOR_RADIUS, p.getY(), p.getX() + Scene.ANCHOR_RADIUS, p.getY());
+				renderer.line(p.getX(), p.getY() - Scene.ANCHOR_RADIUS, p.getX(), p.getY() + Scene.ANCHOR_RADIUS);
+			} else {
+				renderer.setColor(ACTOR_BBOX_COLOR);
+				renderer.polygon(p.getTransformedVertices());
+			}
+
+			// Rectangle r = a.getBBox().getBoundingRectangle();
+			// renderer.rect(r.getX(), r.getY(), r.getWidth(), r.getHeight());
 		}
-		
-		if(polygonalNavGraph != null) {
+
+		if (walkZone != null) {
 			renderer.setColor(WALKZONE_COLOR);
 			renderer.polygon(polygonalNavGraph.getWalkZone().getTransformedVertices());
-			
-			ArrayList<Polygon> obstacles = polygonalNavGraph.getObstacles();
-			
-			renderer.setColor(OBSTACLE_COLOR);
-			for(Polygon p: obstacles) {
-				renderer.polygon(p.getTransformedVertices());
-			}
-			
+
 			// DRAW LINEs OF SIGHT
 			renderer.setColor(Color.WHITE);
 			ArrayList<NavNodePolygonal> nodes = polygonalNavGraph.getGraphNodes();
-			for(NavNodePolygonal n:nodes) {
-				for(NavNode n2:n.neighbors) {
-					renderer.line(n.x, n.y, ((NavNodePolygonal)n2).x, ((NavNodePolygonal)n2).y);
+			for (NavNodePolygonal n : nodes) {
+				for (NavNodePolygonal n2 : n.neighbors) {
+					renderer.line(n.x, n.y, n2.x, n2.y);
 				}
 			}
 		}
@@ -333,124 +298,182 @@ public void drawBBoxLines(ShapeRenderer renderer) {
 		renderer.end();
 	}
 
-	public void setTransition(Transition t) {
-		transition = t;
-	}
+	public BaseActor getActor(String id, boolean searchInventory) {
 
-	public Transition getTransition() {
-		return transition;
-	}
+		if ((VAR_PLAYER.equals(id) || VAR_PLAYER_2.equals(id)) && player != null)
+			return actors.get(player);
 
-	public BaseActor getActor(String id, boolean searchInventory) {
-		BaseActor a = actors.get(id);
+		BaseActor a = id == null ? null : actors.get(id);
 
 		if (a == null && searchInventory) {
-			a = World.getInstance().getInventory().getItem(id);
+			for (Inventory i : w.getInventories().values()) {
+				a = i.get(id);
+
+				if (a != null)
+					return a;
+			}
+
+			// Search the uiActors
+			a = w.getUIActors().get(id);
 		}
 
 		return a;
 	}
 
-	public HashMap<String, BaseActor> getActors() {
+	public Map<String, BaseActor> getActors() {
 		return actors;
 	}
 
 	public void addActor(BaseActor actor) {
-		actors.put(actor.getId(), actor);
-		actor.setScene(this);
-		
-		switch(actor.getLayer()) {
-		case BACKGROUND:
-			bgActors.add(actor);
-			break;
-		case DYNAMIC:
-			dynamicActors.add(actor);
-			break;
-		case FOREGROUND:
-			fgActors.add(actor);
-			break;		
+		BaseActor prev = actors.put(actor.getId(), actor);
+
+		if (prev != null) {
+			EngineLogger.error("Actor '" + actor.getId() + "' already exists in scene '" + id + "'.");
 		}
-	}
 
-	public void setBackground(String bgFilename, String lightMapFilename) {
+		actor.setScene(this);
+
+		if (actor instanceof InteractiveActor) {
+			InteractiveActor ia = (InteractiveActor) actor;
 
-		if (bgFilename != null && !bgFilename.isEmpty()) {
-			ArrayList<String> tiles = getTilesByFilename(bgFilename);
+			SceneLayer layer = getLayer(ia.getLayer());
 
-			if (tiles.size() > 0) {
-				backgroundFilename = bgFilename;
-				background = new Texture[tiles.size()];
+			if (layer == null) { // fallback for compatibility
+				layer = new SceneLayer();
+				layer.setName(ia.getLayer());
+				layers.add(layer);
 			}
+
+			layer.add(ia);
 		}
+	}
 
-		// SET LIGHT MAP
-		if (lightMapFilename != null && !lightMapFilename.isEmpty()) {
-			ArrayList<String> tiles = getTilesByFilename(lightMapFilename);
+	public void setBackground(String bgAtlas, String bgId, String lightMapAtlas, String lightMapId) {
+		this.backgroundAtlas = bgAtlas;
+		this.backgroundRegionId = bgId;
+	}
 
-			if (tiles.size() > 0) {
-				this.lightMapFilename = lightMapFilename;
-				lightMap = new Texture[tiles.size()];
+	/**
+	 * Returns the Interactive actor at the position. The actor must have the
+	 * interaction property enabled.
+	 */
+	public InteractiveActor getInteractiveActorAt(float x, float y) {
+
+		for (SceneLayer layer : layers) {
+
+			if (!layer.isVisible())
+				continue;
+
+			// Obtain actors in reverse (close to camera)
+			for (int i = layer.getActors().size() - 1; i >= 0; i--) {
+				BaseActor a = layer.getActors().get(i);
+
+				if (a instanceof InteractiveActor && ((InteractiveActor) a).canInteract() && a.hit(x, y)) {
+					return (InteractiveActor) a;
+				}
 			}
 		}
+
+		return null;
 	}
 
+	private final Rectangle tmpToleranceRect = new Rectangle();
+
 	/**
-	 * Search for files based in the filename parameter. Used for bg images and maps.
+	 * Obtains the actor at (x,y) with TOLERANCE.
 	 * 
-	 * ex. for filename 'bg_0.png': bg_0.png, bg_1.png, bg_2.png... ex. for
-	 * filename 'bg.png': bg.png, bg_1.png, bg_2.png...
+	 * Creates a square with size = TOLERANCE and checks:
 	 * 
-	 * @param filename
-	 *            The filename used as search base
-	 * @return
+	 * 1. if some vertex from the TOLERANCE square is inside an actor bbox. 2. if
+	 * some actor of the actor vertexes is inside the TOLERANCE square.
 	 */
-	private ArrayList<String> getTilesByFilename(String filename) {
-		ArrayList<String> tiles = new ArrayList<String>();
+	public InteractiveActor getInteractiveActorAt(float x, float y, float tolerance) {
+		if (tolerance <= 0) {
+			return getInteractiveActorAt(x, y);
+		}
+
+		List<SceneLayer> layers = getLayers();
 
-		StringBuilder sb = new StringBuilder();
+		tmpToleranceRect.x = x - tolerance / 2;
+		tmpToleranceRect.y = y - tolerance / 2;
+		tmpToleranceRect.width = tolerance;
+		tmpToleranceRect.height = tolerance;
 
-		// name without extension
-		String name = filename.substring(0, filename.lastIndexOf('.'));
-		// extension
-		String ext = filename.substring(filename.lastIndexOf('.'));
-		String nameWithoutIndex = name.endsWith("_0") ? name.substring(0,
-				name.length() - 2) : name;
+		for (SceneLayer layer : layers) {
 
-		int i = 0;
+			if (!layer.isVisible())
+				continue;
 
-		sb.append(EngineAssetManager.BACKGROUND_DIR).append(filename);
+			// Obtain actors in reverse (close to camera)
+			for (int l = layer.getActors().size() - 1; l >= 0; l--) {
+				BaseActor a = layer.getActors().get(l);
 
-		while (EngineAssetManager.getInstance().assetExists(sb.toString())) {
-			i++;
+				if (a instanceof InteractiveActor && ((InteractiveActor) a).canInteract()) {
+
+					if (a.hit(x, y) || a.hit(tmpToleranceRect.x, tmpToleranceRect.y)
+							|| a.hit(tmpToleranceRect.x + tmpToleranceRect.width, tmpToleranceRect.y)
+							|| a.hit(tmpToleranceRect.x, tmpToleranceRect.y + tmpToleranceRect.height)
+							|| a.hit(tmpToleranceRect.x + tmpToleranceRect.width,
+									tmpToleranceRect.y + tmpToleranceRect.height))
+						return (InteractiveActor) a;
+
+					float[] verts = a.getBBox().getTransformedVertices();
+					for (int i = 0; i < verts.length; i += 2) {
+						float vx = verts[i];
+						float vy = verts[i + 1];
+
+						if (tmpToleranceRect.contains(vx, vy))
+							return (InteractiveActor) a;
+					}
+				}
+			}
 
-			tiles.add(sb.toString());
-			sb.setLength(0);
-			sb.append(EngineAssetManager.BACKGROUND_DIR)
-					.append(nameWithoutIndex).append("_").append(i).append(ext);
 		}
 
-		return tiles;
+		return null;
 	}
 
+	/**
+	 * Returns the actor at the position. Including not interactive actors.
+	 */
 	public BaseActor getActorAt(float x, float y) {
-		for (BaseActor a:fgActors) {
-			if ( a.hasInteraction() && a.hit(x, y)) {
-				return a;
+
+		// 1. Search for ANCHOR Actors
+		for (BaseActor a : actors.values()) {
+			if (a instanceof AnchorActor) {
+				float dst = Vector2.dst(x, y, a.getX(), a.getY());
+
+				if (dst < ANCHOR_RADIUS)
+					return a;
+			}
+		}
+
+		// 2. Search for INTERACTIVE Actors
+		for (SceneLayer layer : layers) {
+
+			if (!layer.isVisible())
+				continue;
+
+			// Obtain actors in reverse (close to camera)
+			for (int i = layer.getActors().size() - 1; i >= 0; i--) {
+				BaseActor a = layer.getActors().get(i);
+
+				if (a.hit(x, y)) {
+					return a;
+				}
 			}
 		}
-				
-		// Se recorre la lista al revés para quedarnos con el más cercano a la
-		// cámara
-		for (int i = dynamicActors.size() - 1; i >= 0; i--) {
-			BaseActor a = dynamicActors.get(i);
 
-			if (a.hasInteraction() && a.hit(x, y)) {
+		// 3. Search for OBSTACLE actors
+		for (BaseActor a : actors.values()) {
+			if (a instanceof ObstacleActor && a.hit(x, y)) {
 				return a;
 			}
 		}
-		
-		for (BaseActor a:bgActors) {
-			if (a.hasInteraction() && a.hit(x, y)) {
+
+		// 4. Search for WALKZONE actors
+		for (BaseActor a : actors.values()) {
+			if (a instanceof WalkZoneActor && a.hit(x, y)) {
 				return a;
 			}
 		}
@@ -458,7 +481,7 @@ public BaseActor getActorAt(float x, float y) {
 		return null;
 	}
 
-	public void setPlayer(SpriteActor a) {
+	public void setPlayer(CharacterActor a) {
 		if (a != null) {
 			player = a.getId();
 			a.setInteraction(false);
@@ -467,296 +490,382 @@ public void setPlayer(SpriteActor a) {
 		}
 	}
 
-	public SpriteActor getPlayer() {
-		return (SpriteActor) actors.get(player);
+	public CharacterActor getPlayer() {
+		if (player == null)
+			return null;
+
+		return (CharacterActor) actors.get(player);
+	}
+
+	public String getWalkZone() {
+		return walkZone;
+	}
+
+	public void setWalkZone(String walkZone) {
+		this.walkZone = walkZone;
 	}
 
 	public Vector2 getDepthVector() {
 		return depthVector;
 	}
-	
+
 	public void setDepthVector(Vector2 v) {
 		depthVector = v;
 	}
 
+	public String getBackgroundAtlas() {
+		return backgroundAtlas;
+	}
+
+	public void setBackgroundAtlas(String backgroundAtlas) {
+		this.backgroundAtlas = backgroundAtlas;
+	}
+
+	public String getBackgroundRegionId() {
+		return backgroundRegionId;
+	}
+
+	public void setBackgroundRegionId(String backgroundRegionId) {
+		this.backgroundRegionId = backgroundRegionId;
+	}
+
 	public void removeActor(BaseActor a) {
 
 		if (a.getId().equals(player)) {
 			player = null;
 		}
 
-		actors.remove(a.getId());
-		
-		switch(a.getLayer()) {
-		case BACKGROUND:
-			bgActors.remove(a);
-			break;
-		case DYNAMIC:
-			dynamicActors.remove(a);
-			break;
-		case FOREGROUND:
-			fgActors.remove(a);
-			break;		
-		}
-		
-		if(a.isWalkObstacle() && polygonalNavGraph != null)
+		BaseActor r = actors.remove(a.getId());
+
+		if (r == null) {
+			EngineLogger.error("Removing actor from scene: Actor not found");
+			return;
+		}
+
+		if (a instanceof InteractiveActor) {
+			InteractiveActor ia = (InteractiveActor) a;
+			SceneLayer layer = getLayer(ia.getLayer());
+			layer.getActors().remove(ia);
+		}
+
+		if (a instanceof ObstacleActor && walkZone != null)
 			polygonalNavGraph.removeDinamicObstacle(a.getBBox());
-			
+
+		a.setScene(null);
+
 	}
 
-	public Texture[] getBackground() {
+	public Array<AtlasRegion> getBackground() {
 		return background;
 	}
-	
+
 	public SceneCamera getCamera() {
 		return camera;
 	}
-	
+
 	public void resetCamera(float worldWidth, float worldHeight) {
 		camera.create(worldWidth, worldHeight);
 
 		if (getPlayer() != null)
 			setCameraFollowActor(getPlayer());
 	}
-	
+
 	public void setCameraFollowActor(SpriteActor a) {
 		followActor = a;
-		
-		if(a != null)
+
+		if (a != null)
 			camera.updatePos(a);
 	}
-	
+
 	public SpriteActor getCameraFollowActor() {
 		return followActor;
 	}
 
-	@Override
-	public void loadAssets() {
-
-		if (background != null) {
-			ArrayList<String> tiles = getTilesByFilename(backgroundFilename);
-
-			// LOAD BACKGROUND TEXTURES
-			for (String filename : tiles) {
-				EngineAssetManager.getInstance().loadTexture(filename);
-			}
+	public SceneSoundManager getSoundManager() {
+		return soundManager;
+	}
 
+	public void calcWalkzone() {
+		if (walkZone != null) {
+			polygonalNavGraph.createInitialGraph(actors.get(walkZone), actors.values());
 		}
+	}
 
-		// LOAD LIGHT MAP
-		if (lightMap != null) {
-			ArrayList<String> tiles = getTilesByFilename(lightMapFilename);
+	@Override
+	public void loadAssets() {
 
-			for (String filename : tiles) {
-				EngineAssetManager.getInstance().loadTexture(filename);
-			}
-		}
+		soundManager.loadAssets();
+		textManager.getVoiceManager().loadAssets();
 
-		if (musicFilename != null)
-			EngineAssetManager.getInstance().loadMusic(musicFilename);
+		if (backgroundAtlas != null && !backgroundAtlas.isEmpty()) {
+			EngineAssetManager.getInstance().loadAtlas(backgroundAtlas);
+		}
 
 		for (BaseActor a : actors.values()) {
-			a.loadAssets();
+			if (a instanceof AssetConsumer)
+				((AssetConsumer) a).loadAssets();
 		}
+
+		// CALC WALK GRAPH
+		calcWalkzone();
 	}
 
 	@Override
 	public void retrieveAssets() {
 
 		// RETRIEVE BACKGROUND
-		if (background != null) {
-			ArrayList<String> tiles = getTilesByFilename(backgroundFilename);
+		if (backgroundAtlas != null && !backgroundAtlas.isEmpty()) {
+			background = EngineAssetManager.getInstance().getRegions(backgroundAtlas, backgroundRegionId);
 
 			int width = 0;
 
-			for (int i = 0; i < background.length; i++) {
-				Texture texture = EngineAssetManager.getInstance().getTexture(
-						tiles.get(i));
-				texture.setFilter(BG_TEXFILTER_MIN, BG_TEXFILTER_MAG);
-				background[i] = texture;
-				width += texture.getWidth();
+			for (int i = 0; i < background.size; i++) {
+				width += background.get(i).getRegionWidth();
 			}
 
-			int height = background[0].getHeight();
-			
-			// Sets the scrolling dimensions. It must be done here because 
+			int height = background.get(0).getRegionHeight();
+
+			// Sets the scrolling dimensions. It must be done here because
 			// the background must be loaded to calculate the bbox
-			camera.setScrollingDimensions(width,
-						height);
-			
-//			if(followActor != null)
-//				camera.updatePos(followActor);
-		}
-
-		// RETRIEVE LIGHT MAP
-		if (lightMap != null) {
-			ArrayList<String> tiles = getTilesByFilename(lightMapFilename);
-
-			for (int i = 0; i < lightMap.length; i++) {
-				Texture texture = EngineAssetManager.getInstance().getTexture(
-						tiles.get(i));
-				// texture.setFilter(BG_TEXFILTER_MIN, BG_TEXFILTER_MAG);
-				texture.setFilter(TextureFilter.Nearest, TextureFilter.Nearest);
-				lightMap[i] = texture;
-			}
+			if (sceneSize == null)
+				camera.setScrollingDimensions(width, height);
+
+			// if(followActor != null)
+			// camera.updatePos(followActor);
 		}
-		
-		// CALC WALK GRAPH
-		if(polygonalNavGraph != null) {
-			polygonalNavGraph.createInitialGraph();
+
+		if (sceneSize != null) {
+			float scale = EngineAssetManager.getInstance().getScale();
+			camera.setScrollingDimensions(sceneSize.x * scale, sceneSize.y * scale);
 		}
 
+		soundManager.retrieveAssets();
+		textManager.getVoiceManager().retrieveAssets();
+
 		// RETRIEVE ACTORS
 		for (BaseActor a : actors.values()) {
-			a.retrieveAssets();
+			if (a instanceof AssetConsumer)
+				((AssetConsumer) a).retrieveAssets();
 		}
 
-		if (musicFilename != null) {
-			music = EngineAssetManager.getInstance().getMusic(musicFilename);
-			if (isPlayingSer) { // TODO must be in World???
-				playMusic();
-				isPlayingSer = false;
-			}
-		}
+		if (getWorld().getListener() != null)
+			getWorld().getListener().text(textManager.getCurrentText());
 	}
 
 	@Override
 	public void dispose() {
 
-		if (background != null) {
-			for (Texture tile : background)
-				if (tile != null)
-					EngineAssetManager.getInstance().disposeTexture(tile);
-		}
-
-		if (lightMap != null) {
-			for (Texture tile : lightMap)
-				if (tile != null)
-					EngineAssetManager.getInstance().disposeTexture(tile);
+		if (backgroundAtlas != null && !backgroundAtlas.isEmpty()) {
+			EngineAssetManager.getInstance().disposeAtlas(backgroundAtlas);
 		}
 
-		// orderedActors.clear();
-
 		for (BaseActor a : actors.values()) {
-			a.dispose();
+			if (a instanceof AssetConsumer)
+				((AssetConsumer) a).dispose();
 		}
 
-		if (musicFilename != null && music != null) {
-			EngineAssetManager.getInstance().disposeMusic(musicFilename);
-			music = null;
-		}
+		soundManager.dispose();
+		getTextManager().getVoiceManager().dispose();
+	}
 
-		transition = null;
+	public Vector2 getSceneSize() {
+		return sceneSize;
 	}
-	
 
-	public PolygonalNavGraph getPolygonalNavGraph() {
-		return polygonalNavGraph;
+	public void setSceneSize(Vector2 sceneSize) {
+		this.sceneSize = sceneSize;
 	}
 
-	public void setPolygonalNavGraph(PolygonalNavGraph polygonalNavGraph) {
-		this.polygonalNavGraph = polygonalNavGraph;
+	public void orderLayersByZIndex() {
+		for (SceneLayer l : layers) {
+			l.orderByZIndex();
+		}
 	}
 
+	public PolygonalNavGraph getPolygonalNavGraph() {
+		return polygonalNavGraph;
+	}
 
-	// TODO SAVE BG WIDTH AND HEIGHT + WALKZONE
 	@Override
 	public void write(Json json) {
-		json.writeValue("id", id);
-		json.writeValue("state", state, state == null ? null : state.getClass());
-		json.writeValue("verbs", verbs);
-		
-		json.writeValue("actors", actors);
-		json.writeValue("player", player,
-				player == null ? null : player.getClass());
-
-		json.writeValue(
-				"background",
-				backgroundFilename,
-				backgroundFilename == null ? null : backgroundFilename
-						.getClass());
-
-		json.writeValue("lightMap", lightMapFilename,
-				lightMapFilename == null ? null : lightMapFilename.getClass());
-
-		json.writeValue("musicFilename", musicFilename,
-				musicFilename == null ? null : musicFilename.getClass());
-		json.writeValue("loopMusic", loopMusic);
-		json.writeValue("initialMusicDelay", initialMusicDelay);
-		json.writeValue("repeatMusicDelay", repeatMusicDelay);
-
-		json.writeValue("isPlaying", music != null && music.isPlaying());
-		// TODO save music positionSer when available in API
-
-		json.writeValue("transition", transition, transition == null ? null
-				: transition.getClass());
-		
-		json.writeValue("camera", camera);
-		
-		json.writeValue("followActor", followActor == null ? null : followActor.getId(),
-				followActor == null ? null : String.class);
-		
-		json.writeValue("customProperties", customProperties, customProperties == null ? null : customProperties.getClass());
-		
-		json.writeValue("depthVector", depthVector);
-		
-		json.writeValue("polygonalNavGraph", polygonalNavGraph, polygonalNavGraph == null ? null : PolygonalNavGraph.class);
+		BladeJson bjson = (BladeJson) json;
+		bjson.setScene(this);
+
+		if (bjson.getMode() == Mode.MODEL) {
+
+			json.writeValue("id", id);
+			json.writeValue("layers", layers, layers.getClass(), SceneLayer.class);
+
+			SortedMap<String, BaseActor> sortedActors = new TreeMap<>(actors);
+			json.writeValue("actors", sortedActors);
+
+			if (backgroundAtlas != null) {
+				json.writeValue("backgroundAtlas", backgroundAtlas);
+				json.writeValue("backgroundRegionId", backgroundRegionId);
+			}
+
+			json.writeValue("musicDesc", musicDesc);
+
+			if (depthVector != null)
+				json.writeValue("depthVector", depthVector);
+
+			if (sceneSize != null)
+				json.writeValue("sceneSize", sceneSize);
+
+		} else {
+			SceneActorRef actorRef;
+
+			json.writeObjectStart("actors");
+			SortedMap<String, BaseActor> sortedActors = new TreeMap<>(actors);
+			for (BaseActor a : sortedActors.values()) {
+				actorRef = new SceneActorRef(a.getInitScene(), a.getId());
+				json.writeValue(actorRef.toString(), a);
+			}
+			json.writeObjectEnd();
+
+			json.writeValue("camera", camera);
+
+			if (followActor != null)
+				json.writeValue("followActor", followActor.getId());
+
+			soundManager.write(json);
+
+			if (!timers.isEmpty())
+				json.writeValue("timers", timers);
+
+			if (textManager.getCurrentText() != null)
+				json.writeValue("textmanager", textManager);
+		}
+
+		verbs.write(json);
+
+		if (state != null)
+			json.writeValue("state", state);
+
+		if (player != null)
+			json.writeValue("player", player);
+
+		json.writeValue("walkZone", walkZone);
+		bjson.setScene(null);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
 	public void read(Json json, JsonValue jsonData) {
-		id = json.readValue("id", String.class, jsonData);
-		state = json.readValue("state", String.class, jsonData);
-		verbs = json.readValue("verbs", VerbManager.class, jsonData);
+		BladeJson bjson = (BladeJson) json;
+		bjson.setScene(this);
 
-		actors = json.readValue("actors", HashMap.class, BaseActor.class,
-				jsonData);
-		player = json.readValue("player", String.class, jsonData);
+		if (bjson.getMode() == Mode.MODEL) {
 
-		for (BaseActor a : actors.values()) {			
-			a.setScene(this);
-			
-			switch(a.getLayer()) {
-			case BACKGROUND:
-				bgActors.add(a);
-				break;
-			case DYNAMIC:
-				dynamicActors.add(a);
-				break;
-			case FOREGROUND:
-				fgActors.add(a);
-				break;		
+			id = json.readValue("id", String.class, jsonData);
+			layers = json.readValue("layers", ArrayList.class, SceneLayer.class, jsonData);
+			actors = json.readValue("actors", ConcurrentHashMap.class, BaseActor.class, jsonData);
+
+			for (BaseActor actor : actors.values()) {
+				actor.setScene(this);
+				actor.setInitScene(id);
+
+				if (actor instanceof InteractiveActor) {
+					InteractiveActor ia = (InteractiveActor) actor;
+
+					SceneLayer layer = getLayer(ia.getLayer());
+					layer.add(ia);
+				}
+			}
+
+			orderLayersByZIndex();
+
+			backgroundAtlas = json.readValue("backgroundAtlas", String.class, jsonData);
+			backgroundRegionId = json.readValue("backgroundRegionId", String.class, jsonData);
+
+			musicDesc = json.readValue("musicDesc", MusicDesc.class, jsonData);
+
+			depthVector = json.readValue("depthVector", Vector2.class, jsonData);
+
+			sceneSize = json.readValue("sceneSize", Vector2.class, jsonData);
+
+			// FOR BACKWARDS COMPATIBILITY
+			if (jsonData.get("polygonalNavGraph") != null) {
+
+				JsonValue jsonValuePNG = jsonData.get("polygonalNavGraph");
+
+				float worldScale = EngineAssetManager.getInstance().getScale();
+
+				Polygon walkZonePol = json.readValue("walkZone", Polygon.class, jsonValuePNG);
+				walkZonePol.setScale(worldScale, worldScale);
+				walkZonePol.setPosition(walkZonePol.getX() * worldScale, walkZonePol.getY() * worldScale);
+
+				WalkZoneActor wz = new WalkZoneActor();
+				wz.setId("walkzone");
+				wz.getBBox().setVertices(walkZonePol.getVertices());
+				wz.getBBox().setScale(walkZonePol.getScaleX(), walkZonePol.getScaleY());
+				wz.getBBox().setPosition(walkZonePol.getX(), walkZonePol.getY());
+				wz.setScene(this);
+				wz.setInitScene(id);
+
+				actors.put(wz.getId(), wz);
+				walkZone = wz.getId();
+			}
+
+		} else {
+			JsonValue jsonValueActors = jsonData.get("actors");
+			SceneActorRef actorRef;
+
+			// GET ACTORS FROM HIS INIT SCENE AND MOVE IT TO THE LOADING SCENE.
+			for (int i = 0; i < jsonValueActors.size; i++) {
+				JsonValue jsonValueAct = jsonValueActors.get(i);
+				actorRef = new SceneActorRef(jsonValueAct.name);
+				Scene sourceScn = w.getScene(actorRef.getSceneId());
+
+				if (sourceScn != this) {
+					BaseActor actor = sourceScn.getActor(actorRef.getActorId(), false);
+					sourceScn.removeActor(actor);
+					addActor(actor);
+				}
+			}
+
+			// READ ACTOR STATE.
+			// The state must be retrieved after getting actors from his init
+			// scene to restore verb cb properly.
+			for (int i = 0; i < jsonValueActors.size; i++) {
+				JsonValue jsonValueAct = jsonValueActors.get(i);
+				actorRef = new SceneActorRef(jsonValueAct.name);
+
+				BaseActor actor = getActor(actorRef.getActorId(), false);
+
+				if (actor != null)
+					actor.read(json, jsonValueAct);
+				else
+					EngineLogger.debug("Actor not found: " + actorRef);
+			}
+
+			orderLayersByZIndex();
+
+			camera = json.readValue("camera", SceneCamera.class, jsonData);
+			String followActorId = json.readValue("followActor", String.class, jsonData);
+
+			if (followActorId != null)
+				setCameraFollowActor((SpriteActor) actors.get(followActorId));
+			else
+				setCameraFollowActor(null);
+
+			soundManager.read(json, jsonData);
+
+			if (jsonData.get("timers") != null)
+				timers = json.readValue("timers", Timers.class, jsonData);
+
+			if (jsonData.get("textmanager") != null) {
+				textManager.read(json, jsonData.get("textmanager"));
 			}
 		}
 
-		backgroundFilename = json.readValue("background", String.class,
-				jsonData);
-		lightMapFilename = json.readValue("lightMap", String.class, jsonData);
-
-		setBackground(backgroundFilename, lightMapFilename);
-
-		musicFilename = json.readValue("musicFilename", String.class, jsonData);
-		loopMusic = json.readValue("loopMusic", Boolean.class, jsonData);
-		initialMusicDelay = json.readValue("initialMusicDelay", Float.class,
-				jsonData);
-		repeatMusicDelay = json.readValue("repeatMusicDelay", Float.class,
-				jsonData);
-
-		isPlayingSer = json.readValue("isPlaying", Boolean.class, jsonData);
-		// TODO restore positionSer for music when available in API
-
-		transition = json.readValue("transition", Transition.class, jsonData);
-		
-		camera = json.readValue("camera", SceneCamera.class, jsonData);
-		String followActorId = json.readValue("followActor", String.class,
-				jsonData);
-		
-		setCameraFollowActor((SpriteActor)actors.get(followActorId));
-		
-		customProperties = json.readValue("customProperties", HashMap.class, String.class, jsonData);
-		
-		depthVector = json.readValue("depthVector", Vector2.class, jsonData);
-		polygonalNavGraph = json.readValue("polygonalNavGraph", PolygonalNavGraph.class, jsonData);
+		verbs.read(json, jsonData);
+		state = json.readValue("state", String.class, jsonData);
+		player = json.readValue("player", String.class, jsonData);
+
+		if (jsonData.get("walkZone") != null)
+			walkZone = json.readValue("walkZone", String.class, jsonData);
+
+		bjson.setScene(null);
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/SceneCamera.java b/blade-engine/src/com/bladecoder/engine/model/SceneCamera.java
index ea8980f0d..5b00d60ae 100644
--- a/blade-engine/src/com/bladecoder/engine/model/SceneCamera.java
+++ b/blade-engine/src/com/bladecoder/engine/model/SceneCamera.java
@@ -15,10 +15,10 @@
  ******************************************************************************/
 package com.bladecoder.engine.model;
 
-import com.bladecoder.engine.model.SpriteActor;
-
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.math.Matrix4;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.utils.Json;
@@ -28,12 +28,14 @@
 import com.bladecoder.engine.actions.ActionCallback;
 import com.bladecoder.engine.anim.CameraTween;
 import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.util.InterpolationMode;
+
+public class SceneCamera extends OrthographicCamera implements Serializable {
 
-public class SceneCamera extends OrthographicCamera implements Serializable  {
-	
 	private static final float START_SCROLLX = 0.1f;
 	private static final float START_SCROLLY = 0.15f;
-	
+
 	// to avoid create new vector when calling getPosition
 	private final static Vector2 tmpPos = new Vector2();
 
@@ -41,125 +43,105 @@ public class SceneCamera extends OrthographicCamera implements Serializable  {
 	private float startScrollDistanceY;
 
 	private float scrollingWidth, scrollingHeight;
-	
+
 	private CameraTween cameraTween;
-	
+
+	private Matrix4 parallaxView = new Matrix4();
+	private Matrix4 parallaxCombined = new Matrix4();
+	private Vector3 tmp = new Vector3();
+	private Vector3 tmp2 = new Vector3();
+
 	public SceneCamera() {
 	}
-	
+
 	public void create(float worldWidth, float worldHeight) {
 		scrollingWidth = worldWidth;
 		scrollingHeight = worldHeight;
-		
+
 		zoom = 1.0f;
-		
+
 		setToOrtho(false, worldWidth, worldHeight);
 		update();
-		
-		startScrollDistanceX = worldWidth * START_SCROLLX; // When the followed actor reach 1/4 of
-		  // the world scrolling starts
 
+		startScrollDistanceX = worldWidth * START_SCROLLX;
 		startScrollDistanceY = worldHeight * START_SCROLLY;
 	}
-	
-	public float getWidth() {
-		return viewportWidth;
-	}
-	
-	public float getHeight() {
-		return viewportHeight;
-	}
-	
+
 	public float getScrollingWidth() {
 		return scrollingWidth;
 	}
-	
+
 	public float getScrollingHeight() {
 		return scrollingHeight;
 	}
 
 	public void setScrollingDimensions(float w, float h) {
-		scrollingWidth = w;
-		scrollingHeight = h;
+		scrollingWidth = Math.max(w, viewportWidth);
+		scrollingHeight = Math.max(h, viewportHeight);
 	}
-	
+
 	public void update(float delta) {
-		if(cameraTween != null) {
-			cameraTween.update(delta, this);
-			if(cameraTween.isComplete()) {
+		if (cameraTween != null) {
+			cameraTween.update(delta);
+			if (cameraTween != null && cameraTween.isComplete()) {
 				cameraTween = null;
 			}
 		}
-	}	
+	}
 
 	public void setPosition(float x, float y) {
 
 		float maxleft = viewportWidth / 2 * zoom;
 		float maxright = (scrollingWidth - viewportWidth / 2 * zoom);
-		
+
 		float maxbottom = viewportHeight / 2 * zoom;
 		float maxtop = (scrollingHeight - viewportHeight / 2 * zoom);
 
-		if (x <= maxleft )
-			x = maxleft;
-		else if (x >= maxright)
-			x = maxright;
-		
-		if (y <= maxbottom)
-			y = maxbottom;
-		else if (y >= maxtop)
-			y = maxtop;
+		x = MathUtils.clamp(x, maxleft, maxright);
+		y = MathUtils.clamp(y, maxbottom, maxtop);
 
 		position.set(x, y, 0);
+
 		update();
 	}
-	
+
 	public void setZoom(float zoom) {
 		this.zoom = zoom;
 		update();
 	}
-	
+
 	public Vector2 getPosition() {
 		Vector3 p = position;
 		return tmpPos.set(p.x, p.y);
 	}
-	
+
 	public float getZoom() {
 		return zoom;
 	}
 
+	public void stopAnim() {
+		cameraTween = null;
+	}
+
 	/**
 	 * Create camera animation.
-	 * 
-	 * @param manager
-	 * @param type
-	 * @param speed
-	 *            is in pixels/seg
-	 * @param destX
-	 * @param destY
 	 */
-	public void startAnimation(float destX, float destY, float zoom, float duration, ActionCallback cb) {
+	public void startAnimation(float destX, float destY, float zoom, float duration, InterpolationMode interpolation,
+			ActionCallback cb) {
 		cameraTween = new CameraTween();
-		
-		cameraTween.start(this, Tween.NO_REPEAT, 1, destX, destY, zoom, duration, cb);
+
+		cameraTween.start(this, Tween.Type.NO_REPEAT, 1, destX, destY, zoom, duration, interpolation, cb);
 	}
 
 	public void getInputUnProject(Viewport viewport, Vector3 out) {
 
 		out.set(Gdx.input.getX(), Gdx.input.getY(), 0);
 
-		unproject(out, viewport.getScreenX(), viewport.getScreenY(), 
-				viewport.getScreenWidth(), viewport.getScreenHeight());
-
-		if (out.x >= scrollingWidth)
-			out.x = scrollingWidth - 1;
-		else if (out.x < 0)
-			out.x = 0;
+		unproject(out, viewport.getScreenX(), viewport.getScreenY(), viewport.getScreenWidth(),
+				viewport.getScreenHeight());
 
-		if (out.y >= scrollingHeight)
-			out.y = scrollingHeight - 1;
-		else if (out.y < 0)
-			out.y = 0;
+		out.x = MathUtils.clamp(out.x, 0, scrollingWidth - 1);
+		out.y = MathUtils.clamp(out.y, 0, scrollingHeight - 1);
 	}
 
 	public void updatePos(SpriteActor followActor) {
@@ -167,7 +149,7 @@ public void updatePos(SpriteActor followActor) {
 		float posx = followActor.getX();
 		float cy = position.y;
 		float posy = followActor.getY();
-		
+
 		boolean translate = false;
 
 		if (cx - posx > startScrollDistanceX * zoom) {
@@ -177,16 +159,16 @@ public void updatePos(SpriteActor followActor) {
 			cx = cx + (posx - cx - startScrollDistanceX * zoom);
 			translate = true;
 		}
-		
-		if (cy - posy  + followActor.getHeight() > startScrollDistanceY * zoom) {
+
+		if (cy - posy + followActor.getHeight() > startScrollDistanceY * zoom) {
 			cy = cy - (cy - posy - startScrollDistanceY * zoom);
 			translate = true;
 		} else if (posy - cy > startScrollDistanceY * zoom) {
 			cy = cy + (posy - cy - startScrollDistanceY * zoom);
 			translate = true;
 		}
-		
-		if(translate) {
+
+		if (translate) {
 			setPosition(cx, cy);
 		}
 	}
@@ -194,36 +176,61 @@ public void updatePos(SpriteActor followActor) {
 	public void scene2screen(Viewport viewport, Vector3 out) {
 		project(out, 0, 0, viewport.getScreenWidth(), viewport.getScreenHeight());
 	}
-	
+
+	public Matrix4 calculateParallaxMatrix(float parallaxX, float parallaxY) {
+		update();
+		tmp.set(position);
+//		tmp.x *= parallaxX;
+		tmp.y *= parallaxY;
+
+		tmp.x = (tmp.x - scrollingWidth / 2) * parallaxX + scrollingWidth / 2;
+
+		parallaxView.setToLookAt(tmp, tmp2.set(tmp).add(direction), up);
+		parallaxCombined.set(projection);
+		Matrix4.mul(parallaxCombined.val, parallaxView.val);
+		return parallaxCombined;
+	}
+
 	@Override
 	public void write(Json json) {
-		json.writeValue("startScrollDistanceX", startScrollDistanceX);
-		json.writeValue("startScrollDistanceY", startScrollDistanceY);
-		json.writeValue("width", viewportWidth);
-		json.writeValue("height", viewportHeight);
-		json.writeValue("scrollingWidth", scrollingWidth);
-		json.writeValue("scrollingHeight", scrollingHeight);
-		json.writeValue("pos", getPosition());
+		float worldScale = EngineAssetManager.getInstance().getScale();
+
+		json.writeValue("width", viewportWidth / worldScale);
+		json.writeValue("height", viewportHeight / worldScale);
+		json.writeValue("scrollingWidth", scrollingWidth / worldScale);
+		json.writeValue("scrollingHeight", scrollingHeight / worldScale);
+
+		Vector2 p = getPosition();
+		p.x = p.x / worldScale;
+		p.y = p.y / worldScale;
+		json.writeValue("pos", p);
 		json.writeValue("zoom", getZoom());
-		json.writeValue("cameraTween", cameraTween);
+
+		if (cameraTween != null)
+			json.writeValue("cameraTween", cameraTween);
 	}
 
 	@Override
 	public void read(Json json, JsonValue jsonData) {
-		startScrollDistanceX = json.readValue("startScrollDistanceX", Float.class, jsonData);
-		startScrollDistanceY = json.readValue("startScrollDistanceY", Float.class, jsonData);
-		
-		viewportWidth = json.readValue("width", Float.class, jsonData);
-		viewportHeight = json.readValue("height", Float.class, jsonData);
-		scrollingWidth = json.readValue("scrollingWidth", Float.class, jsonData);
-		scrollingHeight = json.readValue("scrollingHeight", Float.class, jsonData);
+		float worldScale = EngineAssetManager.getInstance().getScale();
+
+		viewportWidth = json.readValue("width", Float.class, jsonData) * worldScale;
+		viewportHeight = json.readValue("height", Float.class, jsonData) * worldScale;
+		scrollingWidth = json.readValue("scrollingWidth", Float.class, jsonData) * worldScale;
+		scrollingHeight = json.readValue("scrollingHeight", Float.class, jsonData) * worldScale;
 		Vector2 pos = json.readValue("pos", Vector2.class, jsonData);
+		pos.x *= worldScale;
+		pos.y *= worldScale;
 		float z = json.readValue("zoom", Float.class, jsonData);
-		
+
 		create(viewportWidth, viewportHeight);
-		setPosition(pos.x, pos.y);
-		setZoom(z);
+		this.zoom = z;
+		position.set(pos.x, pos.y, 0);
+		update();
 
 		cameraTween = json.readValue("cameraTween", CameraTween.class, jsonData);
-	}	
+		if (cameraTween != null) {
+			cameraTween.setTarget(this);
+		}
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/SceneLayer.java b/blade-engine/src/com/bladecoder/engine/model/SceneLayer.java
new file mode 100644
index 000000000..e4a9bda33
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/SceneLayer.java
@@ -0,0 +1,86 @@
+package com.bladecoder.engine.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+
+public class SceneLayer {
+	private String name;
+	private boolean visible = true;
+	private boolean dynamic;
+	private float parallax = 1.0f;
+	
+	transient private final List<InteractiveActor> actors = new ArrayList<InteractiveActor>();
+	
+	public void update() {
+		if(dynamic && visible)
+			Collections.sort(actors);
+	}
+	
+	public void draw(SpriteBatch spriteBatch) {
+		if(!visible)
+			return;
+		
+		for (BaseActor a : actors) {
+			if(a instanceof SpriteActor)
+				((SpriteActor)a).draw(spriteBatch);
+		}
+	}
+	
+	public void add(InteractiveActor actor) {
+		actors.add(actor);
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public boolean isVisible() {
+		return visible;
+	}
+
+	public void setVisible(boolean visible) {
+		this.visible = visible;
+	}
+
+	public boolean isDynamic() {
+		return dynamic;
+	}
+
+	public void setDynamic(boolean dynamic) {
+		this.dynamic = dynamic;
+	}
+
+	public List<InteractiveActor> getActors() {
+		return actors;
+	}
+
+	public void orderByZIndex() {
+		Collections.sort(actors, new Comparator<InteractiveActor>() {
+
+			@Override
+			public int compare(InteractiveActor a1, InteractiveActor a2) {
+				return (int) (a1.getZIndex() - a2.getZIndex());
+			}
+		});
+	}
+
+	public boolean remove(BaseActor actor) {
+		return actors.remove(actor);
+	}
+
+	public float getParallaxMultiplier() {
+		return parallax;
+	}
+
+	public void setParallaxMultiplier(float parallaxMultiplier) {
+		this.parallax = parallaxMultiplier;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/SceneSoundManager.java b/blade-engine/src/com/bladecoder/engine/model/SceneSoundManager.java
new file mode 100644
index 000000000..73dca9f40
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/SceneSoundManager.java
@@ -0,0 +1,197 @@
+package com.bladecoder.engine.model;
+
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Map.Entry;
+
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.assets.AssetConsumer;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.util.EngineLogger;
+
+/**
+ * Manages scene sounds.
+ * 
+ * @author rgarcia
+ */
+public class SceneSoundManager implements Serializable, AssetConsumer {
+
+	private HashMap<String, LoadedSound> loadedSounds = new HashMap<>(0);
+	private final World w;
+
+	// the global configurable by user volume
+	public static float VOLUME_MULTIPLIER = 1f;
+
+	public SceneSoundManager(World w) {
+		this.w = w;
+	}
+
+	public void addSoundToLoad(SoundDesc s) {
+		loadedSounds.put(s.getId(), new LoadedSound(s));
+	}
+
+	public void playSound(String id) {
+
+		LoadedSound s = loadedSounds.get(id);
+
+		if (s == null) {
+			// Not loaded, load and add to the loaded list.
+			SoundDesc sd = w.getSounds().get(id);
+
+			if (sd != null) {
+				addSoundToLoad(sd);
+				s = loadedSounds.get(id);
+
+				EngineLogger.debug("LOADING SOUND: " + s.desc.getId() + " - " + s.desc.getFilename());
+
+				try {
+					EngineAssetManager.getInstance().loadSound(s.desc.getFilename());
+				} catch (FileNotFoundException e) {
+					EngineLogger.error("Sound file not found:" + e.getMessage());
+					return;
+				}
+
+				EngineAssetManager.getInstance().finishLoading();
+				s.sound = EngineAssetManager.getInstance().getSound(s.desc.getFilename());
+			}
+		}
+
+		if (s != null && s.sound != null) {
+			if (s.desc.getLoop())
+				s.sound.loop(s.desc.getVolume() * VOLUME_MULTIPLIER, s.desc.getPitch(), s.desc.getPan());
+			else
+				s.sound.play(s.desc.getVolume() * VOLUME_MULTIPLIER, s.desc.getPitch(), s.desc.getPan());
+
+			s.playing = true;
+		} else {
+			EngineLogger.error("Sound Not Found: " + id);
+		}
+	}
+
+	/**
+	 * Deletes the current sound played by the actor.
+	 * 
+	 * Note that actor sounds are like: actor_id
+	 * 
+	 * @param actor
+	 */
+	public void stopCurrentSound(String actor) {
+		for (LoadedSound s : loadedSounds.values()) {
+			String start = actor + "_";
+
+			if (s.desc.getId().startsWith(start) && s.playing)
+				stopSound(s.desc.getId());
+		}
+	}
+
+	public void stopSound(String id) {
+		LoadedSound s = loadedSounds.get(id);
+
+		if (s != null) {
+			s.sound.stop();
+			s.playing = false;
+		} else {
+			EngineLogger.debug("Sound Not Found: " + id);
+		}
+	}
+
+	public void stop() {
+		for (LoadedSound s : loadedSounds.values()) {
+			if (s.playing && s.sound != null)
+				stopSound(s.desc.getId());
+		}
+	}
+
+	public void resume() {
+		for (LoadedSound s : loadedSounds.values()) {
+			if (s.playing && s.sound != null)
+				s.sound.resume();
+		}
+	}
+
+	public void pause() {
+		for (LoadedSound s : loadedSounds.values()) {
+			if (s.playing && s.sound != null)
+				s.sound.pause();
+		}
+	}
+
+	@Override
+	public void dispose() {
+		for (LoadedSound s : loadedSounds.values()) {
+
+			if (s.playing)
+				s.sound.stop();
+
+			EngineAssetManager.getInstance().disposeSound(s.desc.getFilename());
+		}
+	}
+
+	@Override
+	public void loadAssets() {
+		for (LoadedSound s : loadedSounds.values()) {
+
+			try {
+				EngineAssetManager.getInstance().loadSound(s.desc.getFilename());
+			} catch (FileNotFoundException e) {
+				loadedSounds.remove(s.desc.getId());
+				EngineLogger.error("Sound file not found:" + e.getMessage());
+			}
+
+		}
+	}
+
+	@Override
+	public void retrieveAssets() {
+		for (LoadedSound s : loadedSounds.values()) {
+			s.sound = EngineAssetManager.getInstance().getSound(s.desc.getFilename());
+
+			// restore playing looping
+			if (s.playing) {
+				s.playing = false;
+
+				if (s.desc.getLoop())
+					playSound(s.desc.getId());
+			}
+
+		}
+	}
+
+	@Override
+	public void write(Json json) {
+		json.writeValue("loadedSounds", loadedSounds, loadedSounds.getClass(), LoadedSound.class);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		loadedSounds = json.readValue("loadedSounds", HashMap.class, LoadedSound.class, jsonData);
+
+		if (loadedSounds == null)
+			loadedSounds = new HashMap<>(0);
+
+		// Retrieve desc from World sound description.
+		for (Entry<String, LoadedSound> e : loadedSounds.entrySet()) {
+			e.getValue().desc = w.getSounds().get(e.getKey());
+		}
+	}
+
+	public static class LoadedSound {
+		transient SoundDesc desc;
+		transient Sound sound;
+
+		// flag to restore the sound when looping.
+		boolean playing = false;
+
+		public LoadedSound(SoundDesc s) {
+			desc = s;
+		}
+
+		public LoadedSound() {
+
+		}
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/SoundDesc.java b/blade-engine/src/com/bladecoder/engine/model/SoundDesc.java
new file mode 100644
index 000000000..30e86bf11
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/SoundDesc.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.model;
+
+public class SoundDesc {
+	private String id;
+	private boolean loop;
+	private String filename;
+	private float volume = 1f;
+	private float pitch = 1f;
+	private float pan = 0f;
+	private boolean preload;
+	
+	public SoundDesc() {
+		
+	}
+	
+	public SoundDesc(String id, String filename, boolean loop, float volume, float pan, float pitch, boolean preload) {
+		this.id = id;
+		this.filename = filename;
+		this.loop = loop;
+		this.volume = volume;
+		this.pan = pan;
+		this.setPitch(pitch);
+	}
+	
+	public boolean getLoop() {
+		return loop;
+	}
+	
+	public String getId() {
+		return id != null? id: filename;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public float getPan() {
+		return pan;
+	}
+
+	public void setPan(float pan) {
+		this.pan = pan;
+	}
+
+	public void setLoop(boolean loop) {
+		this.loop = loop;
+	}
+	
+	public float getVolume() {
+		return volume;
+	}
+
+	public void setVolume(float volume) {
+		this.volume = volume;
+	}
+
+	public String getFilename() {
+		return filename;
+	}
+
+	public void setFilename(String filename) {
+		this.filename = filename;
+	}
+
+	public boolean isPreload() {
+		return preload;
+	}
+
+	public void setPreload(boolean preload) {
+		this.preload = preload;
+	}
+
+	public float getPitch() {
+		return pitch;
+	}
+
+	public void setPitch(float pitch) {
+		this.pitch = pitch;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/SoundFX.java b/blade-engine/src/com/bladecoder/engine/model/SoundFX.java
deleted file mode 100644
index 60723d03e..000000000
--- a/blade-engine/src/com/bladecoder/engine/model/SoundFX.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.model;
-
-import com.badlogic.gdx.audio.Sound;
-import com.bladecoder.engine.assets.AssetConsumer;
-import com.bladecoder.engine.assets.EngineAssetManager;
-
-public class SoundFX implements AssetConsumer {
-	transient private Sound s;
-	private boolean loop;
-	private String filename;
-	private float volume = 1f;
-	
-	public SoundFX() {
-		
-	}
-	
-	public SoundFX(String filename, boolean loop, float volume) {
-		this.filename = filename;
-		this.loop = loop;
-		this.volume = volume;
-	}
-	
-	public void play() {
-		if(loop) s.loop();
-		else s.play(volume);
-	}
-
-	public void stop() {
-		s.stop();
-	}
-	
-	public boolean isLooping() {
-		return loop;
-	}
-	
-	@Override
-	public void loadAssets() {
-		EngineAssetManager.getInstance().loadSound(filename);
-	}
-	
-	@Override
-	public void retrieveAssets() {
-		s = EngineAssetManager.getInstance().getSound(filename);
-	}
-	
-	@Override
-	public void dispose() {
-		EngineAssetManager.getInstance().disposeSound(filename);
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/model/SpineRenderer.java b/blade-engine/src/com/bladecoder/engine/model/SpineRenderer.java
deleted file mode 100644
index 277a28623..000000000
--- a/blade-engine/src/com/bladecoder/engine/model/SpineRenderer.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.model;
-
-import java.util.HashMap;
-
-import com.bladecoder.engine.model.SpriteRenderer;
-
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.anim.AtlasFrameAnimation;
-import com.bladecoder.engine.anim.FrameAnimation;
-import com.bladecoder.engine.anim.Tween;
-import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.util.ActionCallbackSerialization;
-import com.bladecoder.engine.util.EngineLogger;
-import com.bladecoder.engine.util.RectangleRenderer;
-import com.esotericsoftware.spine.Animation;
-import com.esotericsoftware.spine.AnimationState;
-import com.esotericsoftware.spine.AnimationState.AnimationStateListener;
-import com.esotericsoftware.spine.AnimationStateData;
-import com.esotericsoftware.spine.Event;
-import com.esotericsoftware.spine.Skeleton;
-import com.esotericsoftware.spine.SkeletonBinary;
-import com.esotericsoftware.spine.SkeletonBounds;
-import com.esotericsoftware.spine.SkeletonData;
-import com.esotericsoftware.spine.SkeletonRenderer;
-
-public class SpineRenderer implements SpriteRenderer {
-
-	private HashMap<String, FrameAnimation> fanims = new HashMap<String, FrameAnimation>();
-
-	/** Starts this anim the first time that the scene is loaded */
-	private String initFrameAnimation;
-	private FrameAnimation currentFrameAnimation;
-
-	private ActionCallback animationCb = null;
-	private String animationCbSer = null;
-
-	private int currentCount;
-	private int currentAnimationType;
-
-	private boolean flipX;
-
-	private SkeletonCacheEntry currentSource;
-
-	private SkeletonRenderer renderer;
-	private SkeletonBounds bounds;
-
-	private final HashMap<String, SkeletonCacheEntry> sourceCache = new HashMap<String, SkeletonCacheEntry>();
-
-	private float lastAnimationTime = 0;
-
-	class SkeletonCacheEntry {
-		int refCounter;
-		Skeleton skeleton;
-		AnimationState animation;
-	}
-
-	public SpineRenderer() {
-
-	}
-
-	private AnimationStateListener animationListener = new AnimationStateListener() {
-		@Override
-		public void complete(int trackIndex, int loopCount) {
-			if (currentAnimationType == Tween.REPEAT
-					&& (currentCount == Tween.INFINITY || currentCount > loopCount)) {
-				return;
-			}
-
-			currentSource.animation.setTimeScale(0);
-			if (animationCb != null || animationCbSer != null) {
-
-				if (animationCb == null) {
-					animationCb = ActionCallbackSerialization
-							.find(animationCbSer);
-					animationCbSer = null;
-				}
-
-				ActionCallbackQueue.add(animationCb);
-				animationCb = null;
-			}
-		}
-
-		@Override
-		public void end(int arg0) {
-		}
-
-		@Override
-		public void event(int arg0, Event arg1) {
-		}
-
-		@Override
-		public void start(int arg0) {
-		}
-	};
-
-	@Override
-	public HashMap<String, FrameAnimation> getFrameAnimations() {
-		return fanims;
-	}
-
-	@Override
-	public void addFrameAnimation(FrameAnimation fa) {
-		if (initFrameAnimation == null)
-			initFrameAnimation = fa.id;
-
-		fanims.put(fa.id, fa);
-	}
-
-	@Override
-	public String getCurrentFrameAnimationId() {
-		if (currentFrameAnimation == null)
-			return null;
-
-		String id = currentFrameAnimation.id;
-
-		if (flipX) {
-			id = FrameAnimation.getFlipId(id);
-		}
-
-		return id;
-
-	}
-
-	@Override
-	public void setInitFrameAnimation(String fa) {
-		initFrameAnimation = fa;
-	}
-
-	@Override
-	public String getInitFrameAnimation() {
-		return initFrameAnimation;
-	}
-
-	@Override
-	public String[] getInternalAnimations(String source) {
-		retrieveSource(source);
-
-		Array<Animation> animations = sourceCache.get(source).skeleton
-				.getData().getAnimations();
-		String[] result = new String[animations.size];
-
-		for (int i = 0; i < animations.size; i++) {
-			Animation a = animations.get(i);
-			result[i] = a.getName();
-		}
-
-		return result;
-	}
-
-	@Override
-	public void update(float delta) {
-		if (currentSource != null && currentSource.skeleton != null) {
-			currentSource.animation.update(delta);
-			currentSource.animation.apply(currentSource.skeleton);
-			currentSource.skeleton.updateWorldTransform();
-
-			lastAnimationTime += delta;
-		}
-	}
-
-	@Override
-	public void draw(SpriteBatch batch, float x, float y, float scale) {
-
-		if (currentSource != null && currentSource.skeleton != null) {
-			currentSource.skeleton.setX(x / scale);
-			currentSource.skeleton.setY(y / scale);
-
-			batch.setTransformMatrix(batch.getTransformMatrix().scale(scale,
-					scale, 1.0f));
-			renderer.draw(batch, currentSource.skeleton);
-			batch.setTransformMatrix(batch.getTransformMatrix().scale(
-					1 / scale, 1 / scale, 1.0f));
-		} else {
-			x = x - getWidth() / 2 * scale;
-			RectangleRenderer.draw(batch, x, y, getWidth() * scale, getHeight()
-					* scale, Color.RED);
-		}
-	}
-
-	@Override
-	public float getWidth() {
-		if (bounds != null && bounds.getWidth() > 0) {
-			return bounds.getWidth();
-		}
-
-		return 200;
-	}
-
-	@Override
-	public float getHeight() {
-		if (bounds != null && bounds.getHeight() > 0)
-			return bounds.getHeight();
-
-		return 200;
-	}
-
-	@Override
-	public FrameAnimation getCurrentFrameAnimation() {
-		return currentFrameAnimation;
-	}
-
-	@Override
-	public void lookat(float x, float y, Vector2 pf) {
-		lookat(FrameAnimation.getFrameDirection(x, y, pf));
-	}
-
-	@Override
-	public void lookat(String direction) {
-		StringBuilder sb = new StringBuilder();
-		sb.append(FrameAnimation.STAND_ANIM);
-		sb.append('.');
-		sb.append(direction);
-
-		startFrameAnimation(sb.toString(), Tween.FROM_FA, 1, null);
-	}
-
-	@Override
-	public void stand() {
-		String standFA = FrameAnimation.STAND_ANIM;
-		int idx = getCurrentFrameAnimationId().indexOf('.');
-
-		if (idx != -1) {
-			standFA += getCurrentFrameAnimationId().substring(idx);
-		}
-
-		startFrameAnimation(standFA, Tween.FROM_FA, 1, null);
-	}
-
-	@Override
-	public void startWalkFA(Vector2 p0, Vector2 pf) {
-		String currentDirection = FrameAnimation.getFrameDirection(p0.x, p0.y,
-				pf);
-		StringBuilder sb = new StringBuilder();
-		sb.append(FrameAnimation.WALK_ANIM).append('.')
-				.append(currentDirection);
-		startFrameAnimation(sb.toString(), Tween.FROM_FA, 1, null);
-	}
-
-	@Override
-	public void startFrameAnimation(String id, int repeatType, int count,
-			ActionCallback cb) {
-		FrameAnimation fa = getFrameAnimation(id);
-
-		if (fa == null) {
-			EngineLogger.error("FrameAnimation not found: " + id);
-
-			return;
-		}
-
-		if (currentFrameAnimation != null
-				&& currentFrameAnimation.disposeWhenPlayed)
-			disposeSource(currentFrameAnimation.source);
-
-		currentFrameAnimation = fa;
-		currentSource = sourceCache.get(fa.source);
-
-		animationCb = cb;
-
-		// If the source is not loaded. Load it.
-		if (currentSource == null || currentSource.refCounter < 1) {
-			loadSource(fa.source);
-			EngineAssetManager.getInstance().finishLoading();
-
-			retrieveSource(fa.source);
-
-			currentSource = sourceCache.get(fa.source);
-
-			if (currentSource == null) {
-				EngineLogger.error("Could not load FrameAnimation: " + id);
-				currentFrameAnimation = null;
-
-				return;
-			}
-		}
-
-		if (repeatType == Tween.FROM_FA) {
-			currentAnimationType = currentFrameAnimation.animationType;
-			currentCount = currentFrameAnimation.count;
-		} else {
-			currentCount = count;
-			currentAnimationType = repeatType;
-		}
-
-		lastAnimationTime = 0f;
-		setCurrentFA();
-	}
-
-	private void setCurrentFA() {
-		try {
-//			currentSource.skeleton.setToSetupPose();
-			currentSource.skeleton.setFlipX(flipX);
-			currentSource.animation
-					.setTimeScale(currentFrameAnimation.duration);
-			currentSource.animation.setAnimation(0, currentFrameAnimation.id,
-					currentAnimationType == Tween.REPEAT);
-			update(lastAnimationTime);
-			bounds.update(currentSource.skeleton, true);
-		} catch (Exception e) {
-			EngineLogger.error("SpineRenderer:setCurrentFA " + e.getMessage());
-		}
-	}
-
-	private FrameAnimation getFrameAnimation(String id) {
-		FrameAnimation fa = fanims.get(id);
-		flipX = false;
-
-		if (fa == null && id.indexOf('.') != -1) {
-			// Search for flipped
-			String flipId = FrameAnimation.getFlipId(id);
-
-			fa = fanims.get(flipId);
-
-			if (fa != null)
-				flipX = true;
-			else {
-				// search for .left if .frontleft not found and viceversa
-				StringBuilder sb = new StringBuilder();
-
-				if (id.endsWith(FrameAnimation.FRONTLEFT)
-						|| id.endsWith(FrameAnimation.FRONTRIGHT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.FRONT);
-				} else if (id.endsWith(FrameAnimation.BACKLEFT)
-						|| id.endsWith(FrameAnimation.BACKRIGHT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.BACK);
-				} else if (id.endsWith(FrameAnimation.LEFT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.FRONTLEFT);
-				} else if (id.endsWith(FrameAnimation.RIGHT)) {
-					sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-					sb.append(FrameAnimation.FRONTRIGHT);
-				}
-
-				String s = sb.toString();
-
-				fa = fanims.get(s);
-
-				if (fa == null) {
-					// Search for flipped
-					flipId = FrameAnimation.getFlipId(s);
-
-					fa = fanims.get(flipId);
-
-					if (fa != null) {
-						flipX = true;
-					} else if (s.endsWith(FrameAnimation.FRONT)
-							|| s.endsWith(FrameAnimation.BACK)) { // search for
-																	// only
-																	// right or
-																	// left
-																	// animations
-						if (id.endsWith(FrameAnimation.LEFT)) {
-							sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-							sb.append(FrameAnimation.LEFT);
-						} else {
-							sb.append(id.substring(0, id.lastIndexOf('.') + 1));
-							sb.append(FrameAnimation.RIGHT);
-						}
-
-						s = sb.toString();
-						fa = fanims.get(s);
-
-						if (fa == null) {
-							// Search for flipped
-							flipId = FrameAnimation.getFlipId(s);
-
-							fa = fanims.get(flipId);
-
-							if (fa != null) {
-								flipX = true;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return fa;
-	}
-
-	private void loadSource(String source) {
-		SkeletonCacheEntry entry = sourceCache.get(source);
-
-		if (entry == null) {
-			entry = new SkeletonCacheEntry();
-			sourceCache.put(source, entry);
-		}
-
-		if (entry.refCounter == 0)
-			EngineAssetManager.getInstance().loadAtlas(source);
-
-		entry.refCounter++;
-	}
-
-	private void retrieveSource(String source) {
-		SkeletonCacheEntry entry = sourceCache.get(source);
-
-		if (entry == null || entry.refCounter < 1) {
-			loadSource(source);
-			EngineAssetManager.getInstance().finishLoading();
-			entry = sourceCache.get(source);
-		}
-
-		if (entry.skeleton == null) {
-			TextureAtlas atlas = EngineAssetManager.getInstance()
-					.getTextureAtlas(source);
-
-			SkeletonBinary skel = new SkeletonBinary(atlas);
-			skel.setScale(EngineAssetManager.getInstance().getScale());
-			SkeletonData skeletonData = skel
-					.readSkeletonData(EngineAssetManager.getInstance()
-							.getSpine(source));
-
-			entry.skeleton = new Skeleton(skeletonData);
-
-			AnimationStateData stateData = new AnimationStateData(skeletonData); // Defines
-																					// mixing
-																					// between
-																					// animations.
-			stateData.setDefaultMix(0f);
-
-			entry.animation = new AnimationState(stateData);
-			entry.animation.addListener(animationListener);
-		}
-	}
-
-	private void disposeSource(String source) {
-		SkeletonCacheEntry entry = sourceCache.get(source);
-
-		if (entry.refCounter == 1) {
-			EngineAssetManager.getInstance().disposeAtlas(source);
-			entry.animation = null;
-			entry.skeleton = null;
-		}
-
-		entry.refCounter--;
-	}
-
-	@Override
-	public void loadAssets() {
-		for (FrameAnimation fa : fanims.values()) {
-			if (fa.preload)
-				loadSource(fa.source);
-		}
-
-		if (currentFrameAnimation != null && !currentFrameAnimation.preload) {
-			loadSource(currentFrameAnimation.source);
-		} else if (currentFrameAnimation == null && initFrameAnimation != null) {
-			FrameAnimation fa = fanims.get(initFrameAnimation);
-
-			if (!fa.preload)
-				loadSource(fa.source);
-		}
-	}
-
-	@Override
-	public void retrieveAssets() {
-		renderer = new SkeletonRenderer();
-		renderer.setPremultipliedAlpha(false);
-		bounds = new SkeletonBounds();
-
-		for (String key : sourceCache.keySet()) {
-			if (sourceCache.get(key).refCounter > 0)
-				retrieveSource(key);
-		}
-
-		if (currentFrameAnimation != null) {
-			SkeletonCacheEntry entry = sourceCache
-					.get(currentFrameAnimation.source);
-			currentSource = entry;
-
-			setCurrentFA();
-
-		} else if (initFrameAnimation != null) {
-			startFrameAnimation(initFrameAnimation, Tween.FROM_FA, 1, null);
-		}
-	}
-
-	@Override
-	public void dispose() {
-		for (String key : sourceCache.keySet()) {
-			EngineAssetManager.getInstance().disposeAtlas(key);
-		}
-
-		sourceCache.clear();
-		currentSource = null;
-		renderer = null;
-		bounds = null;
-	}
-
-	@Override
-	public void write(Json json) {
-
-		json.writeValue("fanims", fanims, HashMap.class, FrameAnimation.class);
-
-		String currentFrameAnimationId = null;
-
-		if (currentFrameAnimation != null)
-			currentFrameAnimationId = currentFrameAnimation.id;
-
-		json.writeValue("currentFrameAnimation", currentFrameAnimationId,
-				currentFrameAnimationId == null ? null : String.class);
-
-		json.writeValue("initFrameAnimation", initFrameAnimation);
-
-		json.writeValue("flipX", flipX);
-
-		if (animationCbSer != null)
-			json.writeValue("cb", animationCbSer);
-		else
-			json.writeValue("cb",
-					ActionCallbackSerialization.find(animationCb),
-					animationCb == null ? null : String.class);
-
-		json.writeValue("currentCount", currentCount);
-		json.writeValue("currentAnimationType", currentAnimationType);
-		json.writeValue("lastAnimationTime", lastAnimationTime);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-
-		fanims = json.readValue("fanims", HashMap.class, FrameAnimation.class,
-				jsonData);
-
-		String currentFrameAnimationId = json.readValue(
-				"currentFrameAnimation", String.class, jsonData);
-
-		if (currentFrameAnimationId != null)
-			currentFrameAnimation = (AtlasFrameAnimation) fanims
-					.get(currentFrameAnimationId);
-
-		initFrameAnimation = json.readValue("initFrameAnimation", String.class,
-				jsonData);
-
-		flipX = json.readValue("flipX", Boolean.class, jsonData);
-		animationCbSer = json.readValue("cb", String.class, jsonData);
-		currentCount = json.readValue("currentCount", Integer.class, jsonData);
-		currentAnimationType = json.readValue("currentAnimationType",
-				Integer.class, jsonData);
-		lastAnimationTime = json.readValue("lastAnimationTime", Float.class,
-				jsonData);
-	}
-}
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/model/Sprite3DRenderer.java b/blade-engine/src/com/bladecoder/engine/model/Sprite3DRenderer.java
deleted file mode 100644
index d40c49c4d..000000000
--- a/blade-engine/src/com/bladecoder/engine/model/Sprite3DRenderer.java
+++ /dev/null
@@ -1,848 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.model;
-
-import java.nio.IntBuffer;
-import java.util.HashMap;
-
-import com.bladecoder.engine.model.SpriteRenderer;
-
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.graphics.PerspectiveCamera;
-import com.badlogic.gdx.graphics.Pixmap.Format;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.Texture.TextureFilter;
-import com.badlogic.gdx.graphics.Texture.TextureWrap;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.graphics.g3d.Environment;
-import com.badlogic.gdx.graphics.g3d.Model;
-import com.badlogic.gdx.graphics.g3d.ModelBatch;
-import com.badlogic.gdx.graphics.g3d.ModelInstance;
-import com.badlogic.gdx.graphics.g3d.environment.DirectionalShadowLight;
-import com.badlogic.gdx.graphics.g3d.environment.PointLight;
-import com.badlogic.gdx.graphics.g3d.model.Animation;
-import com.badlogic.gdx.graphics.g3d.model.Node;
-import com.badlogic.gdx.graphics.g3d.shaders.DefaultShader.Config;
-import com.badlogic.gdx.graphics.g3d.utils.AnimationController;
-import com.badlogic.gdx.graphics.g3d.utils.AnimationController.AnimationDesc;
-import com.badlogic.gdx.graphics.g3d.utils.AnimationController.AnimationListener;
-import com.badlogic.gdx.graphics.g3d.utils.DefaultShaderProvider;
-import com.badlogic.gdx.graphics.g3d.utils.DepthShaderProvider;
-import com.badlogic.gdx.graphics.glutils.FrameBuffer;
-import com.badlogic.gdx.math.MathUtils;
-import com.badlogic.gdx.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.math.Vector3;
-import com.badlogic.gdx.utils.Array;
-import com.badlogic.gdx.utils.BufferUtils;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.JsonValue;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.anim.AtlasFrameAnimation;
-import com.bladecoder.engine.anim.FrameAnimation;
-import com.bladecoder.engine.anim.Tween;
-import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.util.ActionCallbackSerialization;
-import com.bladecoder.engine.util.EngineLogger;
-import com.bladecoder.engine.util.Utils3D;
-
-public class Sprite3DRenderer implements SpriteRenderer {
-
-	private final static boolean USE_FBO = false;
-	private final static int MAX_BONES = 40;
-	private final static Format FRAMEBUFFER_FORMAT = Format.RGBA4444;
-
-	private static final Rectangle VIEWPORT = new Rectangle();
-	private final static IntBuffer VIEWPORT_RESULTS = BufferUtils
-			.newIntBuffer(16);
-
-	private HashMap<String, FrameAnimation> fanims = new HashMap<String, FrameAnimation>();
-
-	/** Starts this anim the first time that the scene is loaded */
-	private String initFrameAnimation;
-
-	private FrameAnimation currentFrameAnimation;
-	private int currentCount;
-	private int currentAnimationType;
-
-	private TextureRegion tex;
-
-	private Environment environment;
-	private Environment shadowEnvironment;
-
-	private FrameBuffer fb = null;
-
-	private int width = 200, height = 200;
-
-	private Vector3 cameraPos;
-	private Vector3 cameraRot;
-	private String cameraName = "Camera";
-	private float cameraFOV = 49.3f;
-
-	// Rotation of the model in the Y axis
-	private float modelRotation = 0;
-
-	// CREATE STATIC BATCHS FOR EFICIENCY
-	private static ModelBatch modelBatch;
-	private static ModelBatch shadowBatch;
-	private static ModelBatch floorBatch;
-
-	// TODO Move shadowLight to static for memory eficiency.
-	// This implies that the shadow must be calculated in the draw method and
-	// not in the update
-	private final DirectionalShadowLight shadowLight = (DirectionalShadowLight) new DirectionalShadowLight(
-			1024, 1024, 30f, 30f, 1f, 100f).set(1f, 1f, 1f, 0.01f, -1f, 0.01f);
-
-	PointLight celLight;
-
-	String celLightName = "Light";
-
-	private ActionCallback animationCb = null;
-	private String animationCbSer = null;
-
-	private ModelCacheEntry currentSource;
-	private HashMap<String, ModelCacheEntry> sourceCache = new HashMap<String, ModelCacheEntry>();
-	private float lastAnimationTime = 0;
-
-	private boolean renderShadow = true;
-
-	class ModelCacheEntry {
-		int refCounter;
-		ModelInstance modelInstance;
-		AnimationController controller;
-		PerspectiveCamera camera3d;
-	}
-
-	public Sprite3DRenderer() {
-
-	}
-
-	@Override
-	public void addFrameAnimation(FrameAnimation fa) {
-		if (initFrameAnimation == null)
-			initFrameAnimation = fa.id;
-
-		fanims.put(fa.id, fa);
-	}
-
-	@Override
-	public HashMap<String, FrameAnimation> getFrameAnimations() {
-		return fanims;
-	}
-
-	@Override
-	public void setInitFrameAnimation(String fa) {
-		initFrameAnimation = fa;
-	}
-
-	@Override
-	public String getInitFrameAnimation() {
-		return initFrameAnimation;
-	}
-
-	@Override
-	public FrameAnimation getCurrentFrameAnimation() {
-		return currentFrameAnimation;
-	}
-
-	@Override
-	public String getCurrentFrameAnimationId() {
-		return currentFrameAnimation.id;
-	}
-
-	@Override
-	public String[] getInternalAnimations(String source) {
-		retrieveSource(source);
-
-		Array<Animation> animations = sourceCache.get(source).modelInstance.animations;
-		String[] result = new String[animations.size];
-
-		for (int i = 0; i < animations.size; i++) {
-			Animation a = animations.get(i);
-			result[i] = a.id;
-		}
-
-		return result;
-	}
-
-	/**
-	 * Render the 3D model into the texture
-	 */
-	private void renderTex() {
-		updateViewport();
-
-		fb.begin();
-
-		Gdx.gl.glClearColor(0, 0, 0, 0);
-		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT | GL20.GL_DEPTH_BUFFER_BIT);
-
-		drawModel();
-
-		fb.end((int) VIEWPORT.x, (int) VIEWPORT.y, (int) VIEWPORT.width,
-				(int) VIEWPORT.height);
-	}
-
-	/**
-	 * Generates the Shadow Map
-	 */
-	private void genShadowMap() {
-		updateViewport();
-
-		shadowLight.begin(Vector3.Zero, currentSource.camera3d.direction);
-		shadowBatch.begin(shadowLight.getCamera());
-		shadowBatch.render(currentSource.modelInstance);
-		shadowBatch.end();
-		shadowLight.end();
-
-		Gdx.graphics.getGL20().glViewport((int) VIEWPORT.x, (int) VIEWPORT.y,
-				(int) VIEWPORT.width, (int) VIEWPORT.height);
-	}
-
-	private void drawModel() {
-		if (currentSource != null) {
-
-			// DRAW SHADOW
-			if (renderShadow) {
-				floorBatch.begin(currentSource.camera3d);
-				floorBatch.render(Utils3D.getFloor(), shadowEnvironment);
-				floorBatch.end();
-			}
-
-			// DRAW MODEL
-			modelBatch.begin(currentSource.camera3d);
-
-			if (EngineLogger.debugMode()
-					&& EngineLogger.debugLevel == EngineLogger.DEBUG1)
-				modelBatch.render(Utils3D.getAxes(), environment);
-
-			modelBatch.render(currentSource.modelInstance, environment);
-
-			modelBatch.end();
-		}
-	}
-
-	public void setCameraPos(float x, float y, float z) {
-		if (cameraPos == null)
-			cameraPos = new Vector3(x, y, z);
-		else
-			cameraPos.set(x, y, z);
-	}
-
-	public void setCameraRot(float x, float y, float z) {
-		if (cameraRot == null)
-			cameraRot = new Vector3(x, y, z);
-		else
-			cameraRot.set(x, y, z);
-	}
-
-	public void setCameraFOV(float fov) {
-		this.cameraFOV = fov;
-	}
-
-	public void setCameraName(String name) {
-		this.cameraName = name;
-	}
-
-	public void setCelLightName(String name) {
-		this.celLightName = name;
-	}
-
-	private PerspectiveCamera getCamera(ModelInstance modelInstance) {
-		PerspectiveCamera camera3d = new PerspectiveCamera(cameraFOV, width,
-				height);
-
-		if (cameraPos == null) {
-			Node n = null;
-
-			// SET CAMERA POS FROM MODEL IF EXISTS
-			n = modelInstance.getNode(cameraName);
-
-			if (n != null) {
-				cameraPos = n.translation;
-			} else {
-				cameraPos = new Vector3(0, 0, 5);
-			}
-		}
-
-		if (cameraRot == null) {
-			Node n = null;
-
-			// SET CAMERA POS FROM MODEL IF EXISTS
-			n = modelInstance.getNode(cameraName);
-
-			if (n != null) {
-				float rx = (float) (MathUtils.radiansToDegrees * Math.asin(2
-						* n.rotation.x * n.rotation.y + 2 * n.rotation.z
-						* n.rotation.w));
-				float ry = (float) (MathUtils.radiansToDegrees * Math.atan2(2
-						* n.rotation.x * n.rotation.w - 2 * n.rotation.y
-						* n.rotation.z, 1 - 2 * n.rotation.x * n.rotation.x - 2
-						* n.rotation.z * n.rotation.z));
-				float rz = (float) (Math.atan2(2 * n.rotation.y * n.rotation.w
-						- 2 * n.rotation.x * n.rotation.z, 1 - 2 * n.rotation.y
-						* n.rotation.y - 2 * n.rotation.z * n.rotation.z));
-
-				setCameraRot(rx, ry, rz);
-			} else {
-				cameraRot = new Vector3();
-			}
-		}
-
-		camera3d.position.set(cameraPos);
-
-		camera3d.rotate(cameraRot.x, 1, 0, 0);
-		camera3d.rotate(cameraRot.y, 0, 1, 0);
-		camera3d.rotate(cameraRot.z, 0, 0, 1);
-
-		camera3d.near = 0.1f;
-		camera3d.far = 30;
-		camera3d.update();
-
-		return camera3d;
-	}
-
-	private final AnimationListener animationListener = new AnimationListener() {
-
-		@Override
-		public void onLoop(AnimationDesc animation) {
-		}
-
-		@Override
-		public void onEnd(AnimationDesc animation) {
-			if (animationCb != null || animationCbSer != null) {
-				if (animationCb == null) {
-					animationCb = ActionCallbackSerialization
-							.find(animationCbSer);
-					animationCbSer = null;
-				}
-
-				ActionCallbackQueue.add(animationCb);
-			}
-		}
-	};
-
-	// public Array<Animation> getAnimations() {
-	// return modelInstance.animations;
-	// }
-
-	@Override
-	public void startFrameAnimation(String id, int repeatType, int count,
-			ActionCallback cb) {
-		FrameAnimation fa = fanims.get(id);
-
-		if (fa == null) {
-			EngineLogger.error("FrameAnimation not found: " + id);
-
-			return;
-		}
-
-		if (currentFrameAnimation != null
-				&& currentFrameAnimation.disposeWhenPlayed)
-			disposeSource(currentFrameAnimation.source);
-
-		currentFrameAnimation = fa;
-		currentSource = sourceCache.get(fa.source);
-		animationCb = cb;
-
-		if (currentSource == null || currentSource.refCounter < 1) {
-			// If the source is not loaded. Load it.
-			loadSource(fa.source);
-			EngineAssetManager.getInstance().finishLoading();
-
-			retrieveSource(fa.source);
-
-			currentSource = sourceCache.get(fa.source);
-
-			if (currentSource == null) {
-				EngineLogger.error("Could not load FrameAnimation: " + id);
-				currentFrameAnimation = null;
-
-				return;
-			}
-		}
-
-		if (repeatType == Tween.FROM_FA) {
-			currentAnimationType = currentFrameAnimation.animationType;
-			currentCount = currentFrameAnimation.count;
-		} else {
-			currentCount = count;
-			currentAnimationType = repeatType;
-		}
-
-		lastAnimationTime = 0;
-		float speed = currentFrameAnimation.duration;
-
-		if (currentAnimationType == Tween.REVERSE
-				|| currentAnimationType == Tween.REVERSE_REPEAT)
-			speed *= -1;
-
-		if (currentSource.modelInstance.getAnimation(id) != null) {
-			animationCb = cb;
-			currentSource.controller.setAnimation(id, currentCount, speed, animationListener);
-			return;
-		}
-
-		int idx = id.indexOf('.');
-
-		if (idx != -1) {
-			String s = id.substring(0, idx);
-			String dir = id.substring(idx + 1);
-
-			lookat(dir);
-
-			if (currentSource.modelInstance.getAnimation(s) != null) {
-				currentSource.controller.setAnimation(s, count,
-						speed, animationListener);
-
-				return;
-			}
-		}
-
-		// ERROR CASE
-		EngineLogger.error("Animation NOT FOUND: " + id);
-
-		for (Animation a : currentSource.modelInstance.animations) {
-			EngineLogger.debug(a.id);
-		}
-
-		if (cb != null) {
-			ActionCallbackQueue.add(cb);
-		}
-	}
-
-	@Override
-	public void lookat(String dir) {
-		EngineLogger.debug("LOOKAT DIRECTION - " + dir);
-
-		if (dir.equals(FrameAnimation.BACK))
-			lookat(180);
-		else if (dir.equals(FrameAnimation.FRONT))
-			lookat(0);
-		else if (dir.equals(FrameAnimation.LEFT))
-			lookat(270);
-		else if (dir.equals(FrameAnimation.RIGHT))
-			lookat(90);
-		else if (dir.equals(FrameAnimation.BACKLEFT))
-			lookat(225);
-		else if (dir.equals(FrameAnimation.BACKRIGHT))
-			lookat(135);
-		else if (dir.equals(FrameAnimation.FRONTLEFT))
-			lookat(-45);
-		else if (dir.equals(FrameAnimation.FRONTRIGHT))
-			lookat(45);
-		else
-			EngineLogger.error("LOOKAT: Direction not found - " + dir);
-
-	}
-
-	@Override
-	public void lookat(float x, float y, Vector2 pf) {
-		Vector2 tmp = new Vector2(pf);
-		float angle = tmp.sub(x, y).angle() + 90;
-		lookat(angle);
-	}
-
-	private void lookat(float angle) {
-		currentSource.modelInstance.transform.setToRotation(Vector3.Y, angle);
-		modelRotation = angle;
-	}
-
-	@Override
-	public void stand() {
-		startFrameAnimation(FrameAnimation.STAND_ANIM, Tween.NO_REPEAT, 1, null);
-	}
-
-	@Override
-	public void startWalkFA(Vector2 p0, Vector2 pf) {
-		lookat(p0.x, p0.y, pf);
-		startFrameAnimation(FrameAnimation.WALK_ANIM, Tween.REPEAT, -1, null);
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer(super.toString());
-
-		sb.append("\n  Anims:");
-
-		for (Animation a : currentSource.modelInstance.animations) {
-			sb.append(" ").append(a.id);
-		}
-
-		if (currentSource.controller.current != null)
-			sb.append("\n  Current Anim: ").append(
-					currentSource.controller.current.animation.id);
-
-		sb.append("\n");
-
-		return sb.toString();
-	}
-
-	public void setSpriteSize(Vector2 size) {
-		this.width = (int) size.x;
-		this.height = (int) size.y;
-	}
-
-	@Override
-	public void update(float delta) {
-
-		if (currentSource != null && currentSource.controller.current != null
-				&& currentSource.controller.current.loopCount != 0) {
-			currentSource.controller.update(delta);
-			lastAnimationTime += delta;
-
-			// GENERATE SHADOW MAP
-			if(renderShadow)
-				genShadowMap();
-
-			if (USE_FBO)
-				renderTex();
-		}
-	}
-
-	@Override
-	public float getWidth() {
-		return width;
-	}
-
-	@Override
-	public float getHeight() {
-		return height;
-	}
-
-	@Override
-	public void draw(SpriteBatch batch, float x, float y, float scale) {
-
-		x = x - getWidth() / 2 * scale;
-
-		if (USE_FBO) {
-			batch.draw(tex, x, y, 0, 0, width, height, scale, scale, 0);
-		} else {
-			float p0x, p0y, pfx, pfy;
-
-			Vector3 tmp = new Vector3(); // TODO Make static for performance?
-			updateViewport();
-
-			// get screen coords for x and y
-			tmp.set(x, y, 0);
-
-			tmp.mul(batch.getTransformMatrix());
-			tmp.prj(batch.getProjectionMatrix());
-			p0x = VIEWPORT.width * (tmp.x + 1) / 2;
-			p0y = VIEWPORT.height * (tmp.y + 1) / 2;
-
-			tmp.set(x + width * scale, y + height * scale, 0);
-			tmp.mul(batch.getTransformMatrix());
-			tmp.prj(batch.getProjectionMatrix());
-			pfx = VIEWPORT.width * (tmp.x + 1) / 2;
-			pfy = VIEWPORT.height * (tmp.y + 1) / 2;
-
-			batch.end();
-
-			Gdx.gl20.glViewport((int) (p0x + VIEWPORT.x),
-					(int) (p0y + VIEWPORT.y), (int) (pfx - p0x),
-					(int) (pfy - p0y));
-
-			Gdx.gl.glClear(GL20.GL_DEPTH_BUFFER_BIT
-					| (Gdx.graphics.getBufferFormat().coverageSampling ? GL20.GL_COVERAGE_BUFFER_BIT_NV
-							: 0));
-
-			drawModel();
-
-			Gdx.gl20.glViewport((int) VIEWPORT.x, (int) VIEWPORT.y,
-					(int) VIEWPORT.width, (int) VIEWPORT.height);
-			batch.begin();
-		}
-	}
-
-	private void createEnvirontment() {
-		environment = new Environment();
-		
-		// environment.set(new ColorAttribute(ColorAttribute.AmbientLight, 0.8f,
-		// 0.8f, 0.8f, 1f));
-
-		// environment.add(new DirectionalLight().set(1f, 1f, 1f, 1f, -1f,
-		// -1f));
-
-		if (celLight == null) {
-			Node n = null;
-
-			if (currentSource != null)
-				n = currentSource.modelInstance.getNode(celLightName);
-
-			if (n != null) {
-				celLight = new PointLight().set(1f, 1f, 1f, n.translation, 1f);
-			} else {
-				celLight = new PointLight().set(1f, 1f, 1f, 0.5f, 1f, 1f, 1f);
-			}
-		}
-
-		environment.add(celLight);
-
-		if(renderShadow) {
-			shadowEnvironment = new Environment();
-			shadowEnvironment.add(shadowLight);
-			shadowEnvironment.shadowMap = shadowLight;
-		}
-	}
-
-	private static void updateViewport() {
-		// GET CURRENT VIEWPORT SIZE
-		Gdx.gl20.glGetIntegerv(GL20.GL_VIEWPORT, VIEWPORT_RESULTS);
-		VIEWPORT.x = VIEWPORT_RESULTS.get(0);
-		VIEWPORT.y = VIEWPORT_RESULTS.get(1);
-		VIEWPORT.width = VIEWPORT_RESULTS.get(2);
-		VIEWPORT.height = VIEWPORT_RESULTS.get(3);
-	}
-
-	public static void createBatchs() {
-		Config modelConfigShader = new Config(Gdx.files.classpath(
-				"org/bladecoder/engine/shading/cel.vertex.glsl").readString(),
-				Gdx.files.classpath(
-						"org/bladecoder/engine/shading/cel.fragment.glsl")
-						.readString());
-
-		modelConfigShader.numBones = MAX_BONES;
-		modelConfigShader.numDirectionalLights = 0;
-		modelConfigShader.numPointLights = 0;
-		modelConfigShader.numSpotLights = 0;
-
-		modelBatch = new ModelBatch(
-				new DefaultShaderProvider(modelConfigShader));
-
-		shadowBatch = new ModelBatch(new DepthShaderProvider());
-		floorBatch = new ModelBatch(
-				new DefaultShaderProvider(
-						Gdx.files
-								.classpath("org/bladecoder/engine/shading/cel.vertex.glsl"),
-						Gdx.files
-								.classpath("org/bladecoder/engine/shading/floor.fragment.glsl")));
-	}
-
-	private void loadSource(String source) {
-		ModelCacheEntry entry = sourceCache.get(source);
-
-		if (entry == null) {
-			entry = new ModelCacheEntry();
-			sourceCache.put(source, entry);
-		}
-
-		if (entry.refCounter == 0) {
-			EngineAssetManager.getInstance().loadModel3D(source);
-		}
-
-		entry.refCounter++;
-	}
-
-	private void retrieveSource(String source) {
-		ModelCacheEntry entry = sourceCache.get(source);
-
-		if (entry == null || entry.refCounter < 1) {
-			loadSource(source);
-			EngineAssetManager.getInstance().finishLoading();
-			entry = sourceCache.get(source);
-		}
-
-		if (entry.modelInstance == null) {
-			Model model3d = EngineAssetManager.getInstance().getModel3D(source);
-			entry.modelInstance = new ModelInstance(model3d);
-			entry.controller = new AnimationController(entry.modelInstance);
-			entry.camera3d = getCamera(entry.modelInstance);
-		}
-	}
-
-	private void disposeSource(String source) {
-		ModelCacheEntry entry = sourceCache.get(source);
-
-		if (entry.refCounter == 1) {
-			EngineAssetManager.getInstance().disposeModel3D(source);
-			entry.modelInstance = null;
-		}
-
-		entry.refCounter--;
-	}
-
-	@Override
-	public void loadAssets() {
-		for (FrameAnimation fa : fanims.values()) {
-			if (fa.preload)
-				loadSource(fa.source);
-		}
-
-		if (currentFrameAnimation != null && !currentFrameAnimation.preload) {
-			loadSource(currentFrameAnimation.source);
-		} else if (currentFrameAnimation == null && initFrameAnimation != null) {
-			FrameAnimation fa = fanims.get(initFrameAnimation);
-
-			if (!fa.preload)
-				loadSource(fa.source);
-		}
-	}
-
-	@Override
-	public void retrieveAssets() {
-		for (String key : sourceCache.keySet()) {
-			if (sourceCache.get(key).refCounter > 0)
-				retrieveSource(key);
-		}
-
-		if (currentFrameAnimation != null) { // RESTORE FA
-			ModelCacheEntry entry = sourceCache
-					.get(currentFrameAnimation.source);
-			currentSource = entry;
-
-			float speed = currentFrameAnimation.duration;
-
-			if (currentAnimationType == Tween.REVERSE
-					|| currentAnimationType == Tween.REVERSE_REPEAT)
-				speed *= -1;
-			
-			currentSource.controller.setAnimation(currentFrameAnimation.id, currentCount, speed, animationListener);
-			
-			update(lastAnimationTime);
-
-		} else if (initFrameAnimation != null) {
-			startFrameAnimation(initFrameAnimation, Tween.FROM_FA, 1, null);
-
-			if (currentFrameAnimation != null)
-				lookat(modelRotation);
-		}
-
-		// create STATIC BATCHS if not created yet
-		if (modelBatch == null)
-			createBatchs();
-
-		createEnvirontment();
-
-		if (currentSource != null && renderShadow)
-			genShadowMap();
-
-		if (USE_FBO) {
-			fb = new FrameBuffer(FRAMEBUFFER_FORMAT, width, height, true) {
-				@Override
-				protected void setupTexture() {
-					colorTexture = new Texture(width, height, format);
-					colorTexture.setFilter(TextureFilter.Linear,
-							TextureFilter.Linear);
-					colorTexture.setWrap(TextureWrap.ClampToEdge,
-							TextureWrap.ClampToEdge);
-				}
-			};
-
-			tex = new TextureRegion(fb.getColorBufferTexture());
-			tex.flip(false, true);
-
-			renderTex();
-		}
-	}
-
-	@Override
-	public void dispose() {
-		for (String key : sourceCache.keySet()) {
-			EngineAssetManager.getInstance().disposeModel3D(key);
-		}
-
-		sourceCache.clear();
-		currentSource = null;
-		environment = null;
-		shadowEnvironment = null;
-
-		if (USE_FBO)
-			fb.dispose();
-	}
-
-	public static void disposeBatchs() {
-		modelBatch.dispose();
-		shadowBatch.dispose();
-		floorBatch.dispose();
-
-		modelBatch = shadowBatch = floorBatch = null;
-	}
-
-	@Override
-	public void write(Json json) {
-		json.writeValue("fanims", fanims, HashMap.class, FrameAnimation.class);
-
-		String currentFrameAnimationId = null;
-
-		if (currentFrameAnimation != null)
-			currentFrameAnimationId = currentFrameAnimation.id;
-
-		json.writeValue("currentFrameAnimation", currentFrameAnimationId);
-
-		json.writeValue("initFrameAnimation", initFrameAnimation);
-
-		json.writeValue("width", width);
-		json.writeValue("height", height);
-		json.writeValue("cameraPos", cameraPos, cameraPos == null ? null
-				: Vector3.class);
-		json.writeValue("cameraRot", cameraRot, cameraRot == null ? null
-				: Vector3.class);
-		json.writeValue("cameraName", cameraName, cameraName == null ? null
-				: String.class);
-		json.writeValue("cameraFOV", cameraFOV);
-		json.writeValue("modelRotation", modelRotation);
-
-		if (animationCbSer != null)
-			json.writeValue("cb", animationCbSer);
-		else
-			json.writeValue("animationCb",
-					ActionCallbackSerialization.find(animationCb),
-					animationCb == null ? null : String.class);
-
-		json.writeValue("currentCount", currentCount);
-		json.writeValue("currentAnimationType", currentAnimationType);
-		json.writeValue("renderShadow", renderShadow);
-		json.writeValue("lastAnimationTime", lastAnimationTime);
-
-		// TODO: SAVE AND RESTORE CURRENT DIRECTION
-		// TODO: shadowlight, cel light
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		fanims = json.readValue("fanims", HashMap.class,
-				FrameAnimation.class, jsonData);
-
-		String currentFrameAnimationId = json.readValue(
-				"currentFrameAnimation", String.class, jsonData);
-
-		if (currentFrameAnimationId != null)
-			currentFrameAnimation = (AtlasFrameAnimation) fanims
-					.get(currentFrameAnimationId);
-
-		initFrameAnimation = json.readValue("initFrameAnimation", String.class,
-				jsonData);
-
-		width = json.readValue("width", Integer.class, jsonData);
-		height = json.readValue("height", Integer.class, jsonData);
-		cameraPos = json.readValue("cameraPos", Vector3.class, jsonData);
-		cameraRot = json.readValue("cameraRot", Vector3.class, jsonData);
-		cameraName = json.readValue("cameraName", String.class, jsonData);
-		cameraFOV = json.readValue("cameraFOV", Float.class, jsonData);
-		modelRotation = json.readValue("modelRotation", Float.class, jsonData);
-		animationCbSer = json.readValue("animationCb", String.class, jsonData);
-
-		currentCount = json.readValue("currentCount", Integer.class, jsonData);
-		currentAnimationType = json.readValue("currentAnimationType",
-				Integer.class, jsonData);
-		renderShadow = json.readValue("renderShadow", Boolean.class, jsonData);
-		lastAnimationTime = json.readValue("lastAnimationTime", Float.class, jsonData);
-	}
-}
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/model/SpriteActor.java b/blade-engine/src/com/bladecoder/engine/model/SpriteActor.java
index 174a2080e..f4b28f895 100644
--- a/blade-engine/src/com/bladecoder/engine/model/SpriteActor.java
+++ b/blade-engine/src/com/bladecoder/engine/model/SpriteActor.java
@@ -15,351 +15,404 @@
  ******************************************************************************/
 package com.bladecoder.engine.model;
 
-import java.text.MessageFormat;
 import java.util.ArrayList;
 
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.SpriteRenderer;
-
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.anim.FrameAnimation;
-import com.bladecoder.engine.anim.SpritePosTween;
+import com.bladecoder.engine.anim.AnimationDesc;
 import com.bladecoder.engine.anim.Tween;
+import com.bladecoder.engine.anim.Tween.Type;
 import com.bladecoder.engine.anim.WalkTween;
+import com.bladecoder.engine.assets.AssetConsumer;
 import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
 import com.bladecoder.engine.util.EngineLogger;
 
-public class SpriteActor extends BaseActor {
-	private final static float DEFAULT_WALKING_SPEED = 700f; // Speed units:
-																// pix/sec.
+public class SpriteActor extends InteractiveActor implements AssetConsumer {
+
+	protected ActorRenderer renderer;
 
-	public static enum DepthType {
-		NONE, VECTOR
-	};	
-	
-	private SpriteRenderer renderer;
-	private SpritePosTween posTween;
-	private float scale = 1.0f;
+	protected ArrayList<Tween<SpriteActor>> tweens = new ArrayList<>(0);
 
-	/** Scale sprite acording to the scene depth map */
-	private DepthType depthType = DepthType.NONE;
+	private float rot = 0.0f;
+	private float scaleX = 1.0f;
+	private float scaleY = 1.0f;
+	private Color tint;
+
+	private boolean fakeDepth = false;
 
-	private float walkingSpeed = DEFAULT_WALKING_SPEED;
 	private boolean bboxFromRenderer = false;
 
-	public void setRenderer(SpriteRenderer r) {
+	private String playingSound;
+
+	public void setRenderer(ActorRenderer r) {
 		renderer = r;
 	}
 
-	public SpriteRenderer getRenderer() {
+	public ActorRenderer getRenderer() {
 		return renderer;
 	}
 
-	public void setWalkingSpeed(float s) {
-		walkingSpeed = s;
+	public boolean getFakeDepth() {
+		return fakeDepth;
 	}
 
-	public DepthType getDepthType() {
-		return depthType;
-	}
-
-	public void setDepthType(DepthType v) {
-		depthType = v;
+	public void setFakeDepth(boolean fd) {
+		fakeDepth = fd;
+		setDirtyProp(DirtyProps.FAKE_DEPTH);
 	}
 
+	@Override
 	public void setPosition(float x, float y) {
-		
-		if(isWalkObstacle() && scene.getPolygonalNavGraph() != null) {
-			scene.getPolygonalNavGraph().removeDinamicObstacle(bbox);
-		}
-		
-		bbox.setPosition(x, y);
-		
-		if(isWalkObstacle() && scene.getPolygonalNavGraph() != null) {
-			scene.getPolygonalNavGraph().addDinamicObstacle(bbox);
-		}
-		
+		super.setPosition(x, y);
+
 		if (scene != null) {
-			if (depthType == DepthType.VECTOR) {
+			if (fakeDepth) {
 				// interpolation equation
 				float s = scene.getFakeDepthScale(y);
 
-				if (s != 0)
-					setScale(s);
+				setScale(s);
 			}
-
-			if (scene.getCameraFollowActor() == this)
-				scene.getCamera().updatePos(this);
-
 		}
 
 	}
-	
+
 	public boolean isBboxFromRenderer() {
 		return bboxFromRenderer;
 	}
 
 	public void setBboxFromRenderer(boolean v) {
 		this.bboxFromRenderer = v;
-		
-		if(v)
-			updateBBox();
+
+		if (v)
+			renderer.updateBboxFromRenderer(getBBox());
+		else
+			renderer.updateBboxFromRenderer(null);
+
+		setDirtyProp(DirtyProps.BBOX_FROM_RENDERER);
 	}
 
 	public float getWidth() {
-		return renderer.getWidth() * scale;
+		return renderer.getWidth() * scaleX;
 	}
 
 	public float getHeight() {
-		return renderer.getHeight() * scale;
+		return renderer.getHeight() * scaleY;
 	}
 
 	public float getScale() {
-		return scale;
+		return scaleX;
+	}
+
+	public float getScaleX() {
+		return scaleX;
+	}
+
+	public float getScaleY() {
+		return scaleY;
+	}
+
+	public Color getTint() {
+		return tint;
+	}
+
+	public void setTint(Color tint) {
+		this.tint = tint;
+		setDirtyProp(DirtyProps.TINT);
 	}
 
 	public void setScale(float scale) {
-		this.scale = scale;
-		bbox.setScale(scale, scale);
+		setScale(scale, scale);
+	}
+
+	public void setScale(float scaleX, float scaleY) {
+		this.scaleX = scaleX;
+		this.scaleY = scaleY;
+
+		if (bboxFromRenderer)
+			getBBox().setScale(scaleX, scaleY);
+		else {
+			float worldScale = EngineAssetManager.getInstance().getScale();
+			getBBox().setScale(scaleX * worldScale, scaleY * worldScale);
+		}
+
+		setDirtyProp(DirtyProps.SCALEX);
+		setDirtyProp(DirtyProps.SCALEY);
+	}
+
+	public void setRot(float rot) {
+		this.rot = rot;
+		getBBox().setRotation(rot);
+		setDirtyProp(DirtyProps.ROT);
+	}
+
+	public float getRot() {
+		return rot;
 	}
 
 	@Override
 	public void update(float delta) {
 		super.update(delta);
-		renderer.update(delta);
-		if(posTween != null) {
-			posTween.update(this, delta);
-			if(posTween.isComplete()) {
-				posTween = null;
+
+		if (isVisible()) {
+			renderer.update(delta);
+
+			for (int i = 0; i < tweens.size(); i++) {
+				Tween<SpriteActor> t = tweens.get(i);
+
+				t.update(delta);
+
+				// Needs extra checks before remove because the update can remove the tween
+				if (t.isComplete() && i < tweens.size() && tweens.get(i) == t) {
+					tweens.remove(i);
+					i--;
+				}
 			}
 		}
 	}
 
 	public void draw(SpriteBatch batch) {
 		if (isVisible()) {
-			renderer.draw(batch, getX(), getY(), scale);
+			if (scaleX != 0 && scaleY != 0) {
+				renderer.draw(batch, getX(), getY(), scaleX, scaleY, rot, tint);
+			}
 		}
 	}
 
-	public void startFrameAnimation(String id, ActionCallback cb) {
-		startFrameAnimation(id, Tween.FROM_FA, 1, cb);
+	public void startAnimation(String id, ActionCallback cb) {
+		startAnimation(id, Tween.Type.SPRITE_DEFINED, 1, cb);
 	}
 
-	public void startFrameAnimation(String id, int repeatType, int count,
-			ActionCallback cb) {
+	public void startAnimation(String id, Tween.Type repeatType, int count, ActionCallback cb) {
+
+		if (!(renderer instanceof AnimationRenderer))
+			return;
+
+		inAnim();
+
+		// resets posTween when walking
+		removeTween(WalkTween.class);
+
+		EngineLogger.debug("ANIMATION: " + this.id + "." + id);
 
-		FrameAnimation fa = renderer.getCurrentFrameAnimation();
+		((AnimationRenderer) renderer).startAnimation(id, repeatType, count, cb);
+
+		outAnim(repeatType);
+	}
+
+	public void removeTween(Class<?> clazz) {
+		for (int i = 0; i < tweens.size(); i++) {
+			Tween<SpriteActor> t = tweens.get(i);
+			if (clazz.isInstance(t)) {
+				tweens.remove(i);
+				i--;
+			}
+		}
+	}
+
+	/**
+	 * Actions to do when setting an animation: - stop previous animation sound -
+	 * add 'out' distance from previous animation
+	 */
+	protected void inAnim() {
+		AnimationDesc fa = ((AnimationRenderer) renderer).getCurrentAnimation();
 
 		if (fa != null) {
 
 			if (fa.sound != null) {
-				stopSound(fa.sound);
+				// Backwards compatibility
+				String sid = fa.sound;
+				if (scene != null && scene.getWorld().getSounds().get(sid) == null)
+					sid = id + "_" + fa.sound;
+
+				// it will not play the sound in inventory
+				if (scene != null)
+					scene.getSoundManager().stopSound(sid);
 			}
 
 			Vector2 outD = fa.outD;
 
 			if (outD != null) {
 				float s = EngineAssetManager.getInstance().getScale();
-				
+
 				setPosition(getX() + outD.x * s, getY() + outD.y * s);
 			}
 		}
+	}
 
-		renderer.startFrameAnimation(id, repeatType, count, cb);
-
-		fa = renderer.getCurrentFrameAnimation();
+	/**
+	 * Actions to do when setting an animation: - play animation sound - add 'in'
+	 * distance
+	 */
+	protected void outAnim(Type repeatType) {
+		AnimationDesc fa = ((AnimationRenderer) renderer).getCurrentAnimation();
 
 		if (fa != null) {
-			if(bboxFromRenderer) {
-				if(isWalkObstacle() && scene.getPolygonalNavGraph() != null) {
-					scene.getPolygonalNavGraph().removeDinamicObstacle(bbox);
-				}
-				
-				updateBBox();
-				
-				if(isWalkObstacle() && scene.getPolygonalNavGraph() != null) {
-					scene.getPolygonalNavGraph().addDinamicObstacle(bbox);
-				}
-			}
-			
-			if (fa.sound != null) {
-				playSound(fa.sound);
+
+			if (fa.sound != null && repeatType != Tween.Type.REVERSE) {
+				// Backwards compatibility
+				String sid = fa.sound;
+				if (scene != null && scene.getWorld().getSounds().get(sid) == null)
+					sid = id + "_" + fa.sound;
+
+				// it will not play the sound in inventory
+				if (scene != null)
+					scene.getSoundManager().playSound(sid);
 			}
 
 			Vector2 inD = fa.inD;
 
 			if (inD != null) {
 				float s = EngineAssetManager.getInstance().getScale();
-				
+
 				setPosition(getX() + inD.x * s, getY() + inD.y * s);
 			}
 		}
 	}
 
-	/**
-	 * Create position animation.
-	 * 
-	 * @param manager
-	 * @param type
-	 * @param duration
-	 *            is in pixels/seg
-	 * @param destX
-	 * @param destY
-	 */
-	public void startPosAnimation(int repeatType, int count, float duration,
-			float destX, float destY, ActionCallback cb) {
-
-		posTween = new SpritePosTween();
+	public void addTween(Tween<SpriteActor> tween) {
+		removeTween(tween.getClass());
 
-		posTween.start(this, repeatType, count, destX, destY, duration,
-				cb);
+		tweens.add(tween);
 	}
 
-	public void lookat(Vector2 p) {
-		renderer.lookat(bbox.getX(), bbox.getY(), p);
-		if(bboxFromRenderer)
-			updateBBox();
+	@Override
+	public String toString() {
+		return super.toString() + "  Sprite Bbox: " + getBBox().toString() +
+				renderer;
 	}
 
-	public void lookat(String direction) {
-		renderer.lookat(direction);
-		if(bboxFromRenderer)
-			updateBBox();
+	@Override
+	public void loadAssets() {
+
+		renderer.loadAssets();
 	}
 
-	public void stand() {
-		renderer.stand();
-		if(bboxFromRenderer)
-			updateBBox();
+	@Override
+	public void retrieveAssets() {
+
+		renderer.retrieveAssets();
+
+		// Call setPosition to recalc fake depth and camera follow
+		setPosition(getBBox().getX(), getBBox().getY());
 	}
 
-	public void startWalkFA(Vector2 p0, Vector2 pf) {
-		renderer.startWalkFA(p0, pf);
-		if(bboxFromRenderer)
-			updateBBox();
+	@Override
+	public void dispose() {
+		// EngineLogger.debug("DISPOSE: " + id);
+
+		renderer.dispose();
 	}
 
-	/**
-	 * Walking Support
-	 * 
-	 * @param pf
-	 * @param cb
-	 */
-	public void goTo(Vector2 pf, ActionCallback cb) {
-		EngineLogger.debug(MessageFormat.format("GOTO {0},{1}", pf.x, pf.y));
+	@Override
+	public void write(Json json) {
+		BladeJson bjson = (BladeJson) json;
 
-		Vector2 p0 = new Vector2(bbox.getX(), bbox.getY());
+		// Reset vertices if bboxFromRenderer to save always with 0.0 value
+		if (bboxFromRenderer && bjson.getMode() == Mode.MODEL) {
+			float[] verts = getBBox().getVertices();
+			getBBox().setVertices(new float[8]);
 
-		ArrayList<Vector2> walkingPath = null;
+			super.write(json);
 
-		if(scene.getPolygonalNavGraph() != null) {
-			walkingPath = scene.getPolygonalNavGraph().findPath(p0.x, p0.y, pf.x, pf.y);
+			getBBox().setVertices(verts);
+		} else {
+			super.write(json);
 		}
 
-		if (walkingPath == null || walkingPath.size() == 0) {
-			// llamamos al callback aunque el camino esté vacío
-			if (cb != null)
-				ActionCallbackQueue.add(cb);
+		if (bjson.getMode() == Mode.MODEL) {
+			json.writeValue("renderer", renderer, null);
 
-			return;
-		}
+			if (tint != null)
+				json.writeValue("tint", tint);
+		} else {
+			json.writeValue("renderer", renderer);
+			json.writeValue("tweens", tweens, ArrayList.class, Tween.class);
 
-		posTween = new WalkTween();
+			if (playingSound != null)
+				json.writeValue("playingSound", playingSound);
 
-		((WalkTween)posTween).start(this, walkingPath, walkingSpeed, cb);
-	}
-	
-	/**
-	 * Updates de bbox with the renderer width and height information
-	 * 
-	 * @param p
-	 */
-	private void updateBBox() {
-		if(bbox.getVertices() == null || bbox.getVertices().length != 4) {
-			bbox.setVertices(new float[8]);
+			if (isDirty(DirtyProps.TINT))
+				json.writeValue("tint", tint);
 		}
-		
-		float[] verts = bbox.getVertices();
-		
-		verts[0] = -renderer.getWidth()/2;
-		verts[1] = 0f;
-		verts[2] = -renderer.getWidth()/2;
-		verts[3] = renderer.getHeight();
-		verts[4] = renderer.getWidth()/2;
-		verts[5] = renderer.getHeight();
-		verts[6] = renderer.getWidth()/2;
-		verts[7] = 0f;		
-	}	
 
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer(super.toString());
+		if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.SCALEX))
+			json.writeValue("scaleX", scaleX);
 
-		sb.append("  Sprite Bbox: ").append(getBBox().toString());
+		if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.SCALEY))
+			json.writeValue("scaleY", scaleY);
 
-		sb.append(renderer);
+		if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.ROT))
+			json.writeValue("rot", rot);
 
-		return sb.toString();
+		if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.FAKE_DEPTH))
+			json.writeValue("fakeDepth", fakeDepth);
+
+		if (bjson.getMode() == Mode.MODEL || isDirty(DirtyProps.BBOX_FROM_RENDERER))
+			json.writeValue("bboxFromRenderer", bboxFromRenderer);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
-	public void loadAssets() {
-		super.loadAssets();
+	public void read(Json json, JsonValue jsonData) {
+		super.read(json, jsonData);
 
-		renderer.loadAssets();
-	}
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			renderer = json.readValue("renderer", ActorRenderer.class, jsonData);
+		} else {
+			tweens = json.readValue("tweens", ArrayList.class, Tween.class, jsonData);
 
-	@Override
-	public void retrieveAssets() {
-		renderer.retrieveAssets();
-		
-		if(bboxFromRenderer) {
-			updateBBox();
+			if (tweens == null) {
+				EngineLogger.debug("Couldn't load state of actor: " + id);
+				return;
+			}
+
+			for (Tween<SpriteActor> t : tweens)
+				t.setTarget(this);
+
+			renderer.read(json, jsonData.get("renderer"));
+
+			playingSound = json.readValue("playingSound", String.class, jsonData);
 		}
-		
-		// Call setPosition to recalc fake depth and camera follow
-		setPosition(bbox.getX(), bbox.getY());
-		
-		super.retrieveAssets();
-	}
 
-	@Override
-	public void dispose() {
-		renderer.dispose();
-	}
+		renderer.setWorld(bjson.getWorld());
 
-	@Override
-	public void write(Json json) {
-		super.write(json);
+		if (jsonData.get("scale") != null) {
+			scaleX = json.readValue("scale", float.class, jsonData);
+			scaleY = scaleX;
+		} else {
+			scaleX = json.readValue("scaleX", float.class, scaleX, jsonData);
+			scaleY = json.readValue("scaleY", float.class, scaleY, jsonData);
+		}
 
-		json.writeValue("scale", scale);
-		json.writeValue("walkingSpeed", walkingSpeed);
-		json.writeValue("posTween", posTween, null);
-		json.writeValue("depthType", depthType);
-		json.writeValue("renderer", renderer, null);
-		json.writeValue("bboxFromRenderer", bboxFromRenderer);
-	}
+		rot = json.readValue("rot", float.class, rot, jsonData);
+		tint = json.readValue("tint", Color.class, tint, jsonData);
 
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		super.read(json, jsonData);
+		// backwards compatibility fakeDepth
+		if (jsonData.get("depthType") != null) {
+			String depthType = json.readValue("depthType", String.class, (String) null, jsonData);
+
+			fakeDepth = "VECTOR".equals(depthType);
+		} else {
+			fakeDepth = json.readValue("fakeDepth", boolean.class, fakeDepth, jsonData);
+		}
+
+		bboxFromRenderer = json.readValue("bboxFromRenderer", boolean.class, bboxFromRenderer, jsonData);
+
+		if (bboxFromRenderer)
+			renderer.updateBboxFromRenderer(getBBox());
+
+		setScale(scaleX, scaleY);
+		setRot(rot);
 
-		scale = json.readValue("scale", Float.class, jsonData);
-		walkingSpeed = json.readValue("walkingSpeed", Float.class, jsonData);
-		posTween = json.readValue("posTween", SpritePosTween.class, jsonData);
-		depthType = json.readValue("depthType", DepthType.class, jsonData);
-		
-		renderer = json.readValue("renderer", SpriteRenderer.class, jsonData);
-		
-		bboxFromRenderer = json.readValue("bboxFromRenderer", Boolean.class, jsonData);
-		
-		if(bboxFromRenderer)
-			bbox.setScale(1, 1);
+		// restore dirtyProps after rotation and scale
+		dirtyProps = json.readValue("dirtyProps", long.class, 0L, jsonData);
 	}
 
 }
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/model/Text.java b/blade-engine/src/com/bladecoder/engine/model/Text.java
index d5a7733ce..d76f5ed4e 100644
--- a/blade-engine/src/com/bladecoder/engine/model/Text.java
+++ b/blade-engine/src/com/bladecoder/engine/model/Text.java
@@ -20,70 +20,104 @@
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.util.ActionCallbackSerialization;
+import com.bladecoder.engine.serialization.ActionCallbackSerializer;
+import com.bladecoder.engine.serialization.BladeJson;
 
 public class Text implements Serializable {
 	private static final float DEFAULT_TIME = 1f;
-	
+
+	public static float TIME_MULTIPLIER = 1f;
+
 	public enum Type {
-		PLAIN, RECTANGLE, TALK
+		PLAIN, SUBTITLE, TALK, UI
 	};
-	
+
 	public String str;
 	public float x;
 	public float y;
 	public float time;
 	public Type type;
 	public Color color;
+	public String style;
 	private ActionCallback cb;
+	public String actorId;
+	public String voiceId;
+	public String animation;
 
 	public Text() {
 	}
 
-	public Text(String str, float x, float y, float time, Type type, Color color, ActionCallback cb) {
+	public Text(String str, float x, float y, float time, Type type, Color color, String style, String actorId,
+			String voiceId, String talkAnimation, ActionCallback cb) {
 		this.str = str;
 		this.x = x;
 		this.y = y;
-		this.time = time;
+		this.time = time * TIME_MULTIPLIER;
 		this.type = type;
 		this.color = color;
+		this.style = style;
 		this.cb = cb;
+		this.actorId = actorId;
+		this.voiceId = voiceId;
+		this.animation = talkAnimation;
+
+		// 0s -> Auto duration
+		// <0 -> Infinity
 
-		if (this.time <= 0) {
-			this.time = DEFAULT_TIME + DEFAULT_TIME * str.length() / 20f;
+		if (this.time < 0 || voiceId != null) {
+			this.time = Float.MAX_VALUE;
+		} else if (this.time == 0) {
+			setAutoTime();
 		}
 	}
-	
+
+	public void setAutoTime() {
+		time = (DEFAULT_TIME + DEFAULT_TIME * str.length() / 20f) * TIME_MULTIPLIER;
+	}
+
 	public void callCb() {
 		if (cb != null) {
-			ActionCallbackQueue.add(cb);
+			ActionCallback tmpcb = cb;
+			cb = null;
+			tmpcb.resume();
 		}
 	}
-	
+
 	@Override
-	public void write(Json json) {	
-		
+	public void write(Json json) {
+
 		json.writeValue("str", str);
 		json.writeValue("x", x);
 		json.writeValue("y", y);
-		json.writeValue("time",time);
+		json.writeValue("time", time);
 		json.writeValue("type", type);
 		json.writeValue("color", color);
-		json.writeValue("cb", ActionCallbackSerialization.find(cb), cb == null ? null
-				: String.class);
+		json.writeValue("style", style);
+		json.writeValue("actorId", actorId);
+		json.writeValue("voiceId", voiceId);
+		json.writeValue("animation", animation);
+
+		if (cb != null) {
+			World w = ((BladeJson) json).getWorld();
+			Scene s = ((BladeJson) json).getScene();
+			json.writeValue("cb", ActionCallbackSerializer.serialize(w, s, cb));
+		}
 	}
 
 	@Override
-	public void read (Json json, JsonValue jsonData) {
+	public void read(Json json, JsonValue jsonData) {
 		str = json.readValue("str", String.class, jsonData);
 		x = json.readValue("x", Float.class, jsonData);
 		y = json.readValue("y", Float.class, jsonData);
 		time = json.readValue("time", Float.class, jsonData);
 		type = json.readValue("type", Type.class, jsonData);
 		color = json.readValue("color", Color.class, jsonData);
-		String cbSer = json.readValue("cb", String.class, jsonData);
-		if(cbSer != null)
-			cb = ActionCallbackSerialization.find(cbSer);
-	}	
+		style = json.readValue("style", String.class, jsonData);
+		actorId = json.readValue("actorId", String.class, jsonData);
+		voiceId = json.readValue("voiceId", String.class, jsonData);
+		animation = json.readValue("animation", String.class, jsonData);
+		BladeJson bjson = (BladeJson) json;
+		cb = ActionCallbackSerializer.find(bjson.getWorld(), bjson.getScene(),
+				json.readValue("cb", String.class, jsonData));
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/TextManager.java b/blade-engine/src/com/bladecoder/engine/model/TextManager.java
index e8572b54c..c1299b125 100644
--- a/blade-engine/src/com/bladecoder/engine/model/TextManager.java
+++ b/blade-engine/src/com/bladecoder/engine/model/TextManager.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,29 +15,28 @@
  ******************************************************************************/
 package com.bladecoder.engine.model;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Queue;
-
-import com.bladecoder.engine.model.Text;
-
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.anim.Tween;
 import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.Text.Type;
+import com.bladecoder.engine.util.Config;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Queue;
 
 /**
- * TextManager mantains a fifo for the character subtitles.
- * 
+ * TextManager maintains a fifo for the character subtitles.
+ * <p>
  * For now, only one subtitle is displayed in the screen.
- * 
+ * <p>
  * A subtitle is cut in pieces and quee. Each piece has is own time in screen.
- * 
- * 
+ *
  * @author rgarcia
- * 
  */
 public class TextManager implements Serializable {
 	public static final float POS_CENTER = -1f;
@@ -45,26 +44,53 @@ public class TextManager implements Serializable {
 	public static final float RECT_MARGIN = 18f;
 	public static final float RECT_BORDER = 2f;
 
+	public static final boolean AUTO_HIDE_TEXTS = Config.getInstance().getProperty(Config.AUTO_HIDE_TEXTS, true);
+
 	private float inScreenTime;
-	private Text currentSubtitle = null;
+	private Text currentText = null;
+	private final VoiceManager voiceManager = new VoiceManager(this);
 
 	private Queue<Text> fifo;
+	private Scene scene;
 
-	public TextManager() {
-		fifo = new LinkedList<Text>();
+	/**
+	 * Stores the previous animation to restore it when the character ends his talk.
+	 */
+	private String previousCharacterAnim = null;
+
+	public TextManager(Scene s) {
+		fifo = new LinkedList<>();
+		this.scene = s;
 	}
 
-	public void addSubtitle(String str, float x, float y, boolean quee, Text.Type type,
-			Color color, ActionCallback cb) {
-		
-		if(str.charAt(0) == '@')
-			str = I18N.getString(str.substring(1));
-		
+	public void addText(String str, float x, float y, boolean queue, Text.Type type, Color color, String font,
+						String actorId, String voiceId, String talkAnimation, ActionCallback cb) {
+
+		if (str.charAt(0) == I18N.PREFIX)
+			str = scene.getWorld().getI18N().getString(str.substring(1));
+
 		String s = str.replace("\\n", "\n");
+
+		if (type == Text.Type.UI && scene.getWorld().getListener() != null) {
+
+			Text t = new Text(s, x, y, 0, type, color, font, actorId, voiceId, talkAnimation, null);
+
+			scene.getWorld().getListener().text(t);
+
+			if (cb != null) {
+				ActionCallback tmpcb = cb;
+				cb = null;
+				tmpcb.resume();
+			}
+
+			return;
+		}
+
 		String[] text = s.split("\n\n");
 
-		if (!quee)
-			clear();
+		int nQueued = fifo.size();
+
+		String lineVoiceId = voiceId;
 
 		for (int i = 0; i < text.length; i++) {
 			String cutStr = text[i];
@@ -76,94 +102,156 @@ public void addSubtitle(String str, float x, float y, boolean quee, Text.Type ty
 
 			int idx = cutStr.indexOf('#');
 			if (idx != -1) {
-				duration = Float.parseFloat(cutStr.substring(0, idx));
+				String prefix = cutStr.substring(0, idx);
+
+				if (prefix.charAt(0) == 'v') {
+					lineVoiceId = prefix.substring(1).trim();
+				} else {
+					duration = Float.parseFloat(prefix);
+				}
+
 				finalStr = cutStr.substring(idx + 1);
 			}
 
 			Text sub;
 
-			if (i != text.length - 1) {
-				sub = new Text(finalStr, x, y, duration, type, color, null);
-			} else {
-				sub = new Text(finalStr, x, y, duration, type, color, cb);
-			}
+			sub = new Text(finalStr, x, y, duration, type, color, font, actorId, lineVoiceId, talkAnimation,
+					i == text.length - 1 ? cb : null);
+
+			// resets voice id for the next line
+			lineVoiceId = null;
 
 			fifo.add(sub);
 		}
 
-		if (!quee || currentSubtitle == null) {
-			if (currentSubtitle != null) {
+		if (!queue)
+			clear(nQueued);
+
+		if (!queue || currentText == null) {
+			if (currentText != null) {
 				next();
 			} else {
-				setCurrentSubtitle(fifo.poll());
+				setCurrentText(fifo.poll());
 			}
 		}
 
 	}
-	
-	public Text getCurrentSubtitle() {
-		return currentSubtitle;
+
+	public VoiceManager getVoiceManager() {
+		return voiceManager;
+	}
+
+	public Text getCurrentText() {
+		return currentText;
+	}
+
+	public float getInScreenTime() {
+		return inScreenTime;
 	}
 
-	private void setCurrentSubtitle(Text sub) {
+	private void setCurrentText(Text t) {
+		if (currentText != null && (currentText.type == Type.TALK || currentText.animation != null)
+				&& currentText.actorId != null) {
+			CharacterActor a = (CharacterActor) scene.getActor(currentText.actorId, false);
+
+			// restore previous stand animation
+			if (a != null && previousCharacterAnim != null)
+				a.startAnimation(previousCharacterAnim, Tween.Type.SPRITE_DEFINED, 0, null);
+
+			previousCharacterAnim = null;
+		}
+
 		inScreenTime = 0f;
-		currentSubtitle = sub;
+		currentText = t;
+
+		if (t != null) {
+			voiceManager.play(t.voiceId);
+
+			// Start talk animation
+			if ((t.type == Type.TALK || t.animation != null) && t.actorId != null) {
+				CharacterActor a = (CharacterActor) scene.getActor(t.actorId, false);
+
+				previousCharacterAnim = ((AnimationRenderer) a.getRenderer()).getCurrentAnimationId();
+
+				if (t.animation != null)
+					a.startAnimation(t.animation, Tween.Type.SPRITE_DEFINED, 0, null);
+				else
+					a.talk();
+			}
+		} else {
+			voiceManager.stop();
+		}
+
+		if (scene.getWorld().getListener() != null)
+			scene.getWorld().getListener().text(t);
 	}
 
 	public void update(float delta) {
 
-		if (currentSubtitle == null) {
+		if (currentText == null) {
 			return;
 		}
 
 		inScreenTime += delta;
 
-		if (inScreenTime > currentSubtitle.time) {
+		if (inScreenTime > currentText.time && AUTO_HIDE_TEXTS) {
 			next();
 		}
 	}
 
 	public void next() {
-		if (currentSubtitle != null) {
+		if (currentText != null) {
+			Text t = currentText;
 
-			Text prev = currentSubtitle;
+			setCurrentText(fifo.poll());
 
-			setCurrentSubtitle(fifo.poll());
-
-			// call cb after putting next subtitle because 'cb' can put new
-			// subtitles too
-			prev.callCb();
+			t.callCb();
 		}
 	}
 
-	public void clear() {
-		fifo.clear();
-		inScreenTime = 0;
+	private void clear(int n) {
+		// CLEAR
+		for (int i = 0; i < n; i++)
+			next();
 
-		if (currentSubtitle != null) {
-			currentSubtitle = null;
-		}
+		inScreenTime = 0;
+		voiceManager.stop();
 	}
 
 	/**
-	 * Put manager in the init state. Use it when changing current scene
+	 * Put manager in the init state. Used when changing current scene
 	 */
 	public void reset() {
-		clear();
+		fifo.clear();
+
+		setCurrentText(null);
 	}
 
 	@Override
 	public void write(Json json) {
 		json.writeValue("inScreenTime", inScreenTime);
-		json.writeValue("currentSubtitle", currentSubtitle);
-		json.writeValue("fifo", new ArrayList<Text>(fifo), ArrayList.class, Text.class);
+
+		if (currentText != null)
+			json.writeValue("currentText", currentText);
+
+		json.writeValue("fifo", new ArrayList<>(fifo), ArrayList.class, Text.class);
+		json.writeValue("voiceManager", voiceManager);
+
+		if (previousCharacterAnim != null)
+			json.writeValue("previousAnim", previousCharacterAnim);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public void read (Json json, JsonValue jsonData) {
+	public void read(Json json, JsonValue jsonData) {
 		inScreenTime = json.readValue("inScreenTime", Float.class, jsonData);
-		currentSubtitle = json.readValue("currentSubtitle", Text.class, jsonData);
-		fifo = new LinkedList<Text>(json.readValue("fifo", ArrayList.class, Text.class, jsonData));
+		currentText = json.readValue("currentText", Text.class, jsonData);
+		fifo = new LinkedList<>(json.readValue("fifo", ArrayList.class, Text.class, jsonData));
+		previousCharacterAnim = json.readValue("previousAnim", String.class, jsonData);
+
+		JsonValue jsonValue = jsonData.get("voiceManager");
+
+		if (jsonValue != null)
+			voiceManager.read(json, jsonValue);
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/TextRenderer.java b/blade-engine/src/com/bladecoder/engine/model/TextRenderer.java
new file mode 100644
index 000000000..37e3d1ac4
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/TextRenderer.java
@@ -0,0 +1,403 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.model;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.Texture.TextureFilter;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.g2d.freetype.FreetypeFontLoader.FreeTypeFontLoaderParameter;
+import com.badlogic.gdx.math.Matrix4;
+import com.badlogic.gdx.math.Polygon;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+import com.bladecoder.engine.util.RectangleRenderer;
+
+public class TextRenderer implements ActorRenderer {
+
+	private final static float DEFAULT_DIM = 200;
+
+	private Polygon bbox;
+
+	private BitmapFont font;
+	private final GlyphLayout layout = new GlyphLayout();
+
+	private int fontSize = 10;
+	private String text;
+	private String fontName;
+	private int borderWidth = 0;
+	private Color borderColor = Color.BLACK;
+	private boolean borderStraight = false;
+	private int shadowOffsetX = 0;
+	private int shadowOffsetY = 0;
+	private Color shadowColor = Color.BLACK;
+	private int textAlign = Align.left;
+	private int orgAlign = Align.bottom;
+
+	private int maxWidth = 0;
+
+	private final Color color = new Color(Color.WHITE);
+
+	// Translated Text shown in the editor. When editing the text, the .properties
+	// with the translation is not ready.
+	private transient String editorTranslatedText;
+
+	private World world;
+
+	public TextRenderer() {
+
+	}
+
+	@Override
+	public int getOrgAlign() {
+		return orgAlign;
+	}
+
+	@Override
+	public void setOrgAlign(int align) {
+		orgAlign = align;
+	}
+
+	@Override
+	public void update(float delta) {
+	}
+
+	private static final Matrix4 tmp = new Matrix4();
+
+	@Override
+	public void draw(SpriteBatch batch, float x, float y, float scaleX, float scaleY, float rotation, Color tint) {
+
+		float dx = getAlignDx(getWidth(), orgAlign);
+		float dy = getAlignDy(getHeight(), orgAlign);
+
+		if (font != null && text != null) {
+
+			if (tint != null && !tint.equals(color)) {
+				color.set(tint);
+
+				String tt = text;
+
+				if (tt.charAt(0) == I18N.PREFIX)
+					tt = world.getI18N().getString(tt.substring(1));
+
+				if (editorTranslatedText != null)
+					tt = editorTranslatedText;
+
+				layout.setText(font, tt, color, maxWidth, textAlign, maxWidth > 0);
+			}
+
+			Matrix4 tm = batch.getTransformMatrix();
+			tmp.set(tm);
+
+			float originX = dx;
+			float originY = layout.height + dy;
+
+			if (textAlign == Align.right)
+				originX += getWidth();
+			else if (textAlign == Align.center)
+				originX += getWidth() / 2;
+
+			tm.translate(x, y, 0).rotate(0, 0, 1, rotation).scale(scaleX, scaleY, 1).translate(originX, originY, 0);
+
+			batch.setTransformMatrix(tm);
+
+			font.draw(batch, layout, 0, 0);
+
+			batch.setTransformMatrix(tmp);
+		} else {
+			RectangleRenderer.draw(batch, x + dx * scaleX, y + dy * scaleY, getWidth() * scaleX, getHeight() * scaleY,
+					Color.RED);
+		}
+	}
+
+	@Override
+	public float getWidth() {
+		if (font == null)
+			return DEFAULT_DIM;
+
+		return layout.width;
+	}
+
+	@Override
+	public float getHeight() {
+		if (font == null)
+			return DEFAULT_DIM;
+
+		return layout.height;
+	}
+
+	@Override
+	public void updateBboxFromRenderer(Polygon bbox) {
+		this.bbox = bbox;
+
+		computeBbox();
+	}
+
+	private void computeBbox() {
+		if (bbox == null)
+			return;
+
+		if (bbox.getVertices() == null || bbox.getVertices().length != 8) {
+			bbox.setVertices(new float[8]);
+		}
+
+		float dx = getAlignDx(getWidth(), orgAlign);
+		float dy = getAlignDy(getHeight(), orgAlign);
+
+		float[] verts = bbox.getVertices();
+
+		verts[0] = dx;
+		verts[1] = dy;
+
+		verts[2] = dx;
+		verts[3] = getHeight() + dy;
+
+		verts[4] = getWidth() + dx;
+		verts[5] = getHeight() + dy;
+
+		verts[6] = getWidth() + dx;
+		verts[7] = dy;
+		bbox.dirty();
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public void setText(String text) {
+		setText(text, text);
+	}
+
+	public void setText(String text, String translatedText) {
+		this.text = text;
+		this.editorTranslatedText = translatedText;
+
+		updateLayout();
+	}
+
+	public String getFontName() {
+		return fontName;
+	}
+
+	public void setFontName(String fontName) {
+		this.fontName = fontName;
+	}
+
+	public int getBorderWidth() {
+		return borderWidth;
+	}
+
+	public void setBorderWidth(int borderWidth) {
+		this.borderWidth = borderWidth;
+	}
+
+	public Color getBorderColor() {
+		return borderColor;
+	}
+
+	public void setBorderColor(Color borderColor) {
+		this.borderColor = borderColor;
+	}
+
+	public int getFontSize() {
+		return fontSize;
+	}
+
+	public void setFontSize(int fontSize) {
+		this.fontSize = fontSize;
+	}
+
+	public boolean isBorderStraight() {
+		return borderStraight;
+	}
+
+	public void setBorderStraight(boolean borderStraight) {
+		this.borderStraight = borderStraight;
+	}
+
+	public int getShadowOffsetX() {
+		return shadowOffsetX;
+	}
+
+	public void setShadowOffsetX(int shadowOffsetX) {
+		this.shadowOffsetX = shadowOffsetX;
+	}
+
+	public int getShadowOffsetY() {
+		return shadowOffsetY;
+	}
+
+	public void setShadowOffsetY(int shadowOffsetY) {
+		this.shadowOffsetY = shadowOffsetY;
+	}
+
+	public Color getShadowColor() {
+		return shadowColor;
+	}
+
+	public void setShadowColor(Color shadowColor) {
+		this.shadowColor = shadowColor;
+	}
+
+	public int getAlign() {
+		return textAlign;
+	}
+
+	public void setAlign(int align) {
+		this.textAlign = align;
+	}
+
+	public int getMaxWidth() {
+		return maxWidth;
+	}
+
+	public void setMaxWidth(int maxWidth) {
+		this.maxWidth = maxWidth;
+	}
+
+	public static float getAlignDx(float width, int align) {
+		if ((align & Align.left) != 0)
+			return 0;
+		else if ((align & Align.right) != 0)
+			return -width;
+		else if ((align & Align.center) != 0)
+			return -width / 2.0f;
+
+		return -width / 2.0f;
+	}
+
+	public static float getAlignDy(float height, int align) {
+		if ((align & Align.bottom) != 0)
+			return 0;
+		else if ((align & Align.top) != 0)
+			return -height;
+		else if ((align & Align.center) != 0)
+			return -height / 2.0f;
+
+		return 0;
+	}
+
+	@Override
+	public void loadAssets() {
+		FreeTypeFontLoaderParameter params = new FreeTypeFontLoaderParameter();
+
+		float scale = EngineAssetManager.getInstance().getScale();
+
+		params.fontFileName = EngineAssetManager.FONT_DIR + fontName + EngineAssetManager.FONT_EXT;
+		params.fontParameters.size = (int) (fontSize * scale);
+		params.fontParameters.borderWidth = (int) (borderWidth * scale);
+		params.fontParameters.borderColor = borderColor;
+		params.fontParameters.borderStraight = borderStraight;
+		params.fontParameters.shadowOffsetX = (int) (shadowOffsetX * scale);
+		params.fontParameters.shadowOffsetY = (int) (shadowOffsetY * scale);
+		params.fontParameters.shadowColor = shadowColor;
+		params.fontParameters.characters = "";
+		params.fontParameters.incremental = true;
+		params.fontParameters.magFilter = TextureFilter.Linear;
+		params.fontParameters.minFilter = TextureFilter.Linear;
+
+		EngineAssetManager.getInstance().load(fontName + getFontSize() + EngineAssetManager.FONT_EXT, BitmapFont.class,
+				params);
+	}
+
+	private void updateLayout() {
+		if (font == null)
+			return;
+
+		String tt = editorTranslatedText;
+
+		if (tt == null)
+			tt = text;
+
+		if (tt.charAt(0) == I18N.PREFIX)
+			tt = world.getI18N().getString(tt.substring(1));
+
+		layout.setText(font, tt, color, maxWidth, textAlign, maxWidth > 0);
+
+		computeBbox();
+	}
+
+	@Override
+	public void retrieveAssets() {
+
+		if (!EngineAssetManager.getInstance().isLoaded(fontName + getFontSize() + ".ttf")) {
+			loadAssets();
+			EngineAssetManager.getInstance().finishLoading();
+		}
+
+		font = EngineAssetManager.getInstance().get(fontName + getFontSize() + ".ttf", BitmapFont.class);
+
+		updateLayout();
+	}
+
+	@Override
+	public void dispose() {
+		if (EngineAssetManager.getInstance().isLoaded(fontName + getFontSize() + ".ttf"))
+			EngineAssetManager.getInstance().unload(fontName + getFontSize() + ".ttf");
+
+		font = null;
+	}
+
+	@Override
+	public void write(Json json) {
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			json.writeValue("text", text);
+			json.writeValue("fontName", fontName);
+			json.writeValue("fontSize", fontSize);
+			json.writeValue("borderWidth", borderWidth);
+			json.writeValue("borderColor", borderColor);
+			json.writeValue("borderStraight", borderStraight);
+			json.writeValue("shadowOffsetX", shadowOffsetX);
+			json.writeValue("shadowOffsetY", shadowOffsetY);
+			json.writeValue("shadowColor", shadowColor);
+			json.writeValue("align", textAlign);
+			json.writeValue("orgAlign", orgAlign);
+			json.writeValue("maxWidth", maxWidth);
+		}
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			text = json.readValue("text", String.class, jsonData);
+			fontName = json.readValue("fontName", String.class, jsonData);
+			fontSize = json.readValue("fontSize", int.class, jsonData);
+			borderWidth = json.readValue("borderWidth", int.class, jsonData);
+			borderColor = json.readValue("borderColor", Color.class, jsonData);
+			borderStraight = json.readValue("borderStraight", boolean.class, jsonData);
+			shadowOffsetX = json.readValue("shadowOffsetX", int.class, jsonData);
+			shadowOffsetY = json.readValue("shadowOffsetY", int.class, jsonData);
+			shadowColor = json.readValue("shadowColor", Color.class, jsonData);
+			textAlign = json.readValue("align", int.class, Align.left, jsonData);
+			orgAlign = json.readValue("orgAlign", int.class, Align.bottom, jsonData);
+			maxWidth = json.readValue("maxWidth", int.class, 0, jsonData);
+		}
+	}
+
+	@Override
+	public void setWorld(World world) {
+		this.world = world;
+	}
+}
\ No newline at end of file
diff --git a/blade-engine/src/com/bladecoder/engine/model/Transition.java b/blade-engine/src/com/bladecoder/engine/model/Transition.java
index d2ae5e5c5..dfe32a19d 100644
--- a/blade-engine/src/com/bladecoder/engine/model/Transition.java
+++ b/blade-engine/src/com/bladecoder/engine/model/Transition.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,83 +17,109 @@
 
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.math.Interpolation;
+import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
 import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.util.ActionCallbackSerialization;
+import com.bladecoder.engine.serialization.ActionCallbackSerializer;
+import com.bladecoder.engine.serialization.BladeJson;
 import com.bladecoder.engine.util.RectangleRenderer;
 
-/** 
+/**
  * A transition is used to fadein/fadeout the screen.
- * 
+ *
  * @author rgarcia
  */
 public class Transition implements Serializable {
-	public static enum Type {FADE_IN, FADE_OUT};
-	
-	private float time;
-	private float currentTime;
-	private ActionCallback cb;
-	private Color c;
-	private Type type;
-	
-	public void update(float delta) {
-		currentTime += delta;
-		
-		if(isFinish() && cb != null) {
-			ActionCallbackQueue.add(cb);
-			cb = null;
-		}
-	}
-	
-	public void draw(SpriteBatch batch, float width, float height) {
-		
-		if(isFinish()) return;
-		
-		switch(type) {
-		case FADE_IN:
-			c.a = 1 - currentTime / time;
-			break;
-		case FADE_OUT:
-			c.a = currentTime / time;
-			break;
-		default:
-			break;
-		}
-		
-		RectangleRenderer.draw(batch, 0, 0, width, height, c);
-	}
-	
-	public void create(float time, Color color, Type type, ActionCallback cb) {
-		this.c = color;
-		this.type = type;
-		this.time = time;
-		this.cb = cb;
-	}
-	
-	public boolean isFinish() {
-		return (currentTime > time);
-	}	
-	
-	@Override
-	public void write(Json json) {	
-		json.writeValue("currentTime", currentTime);
-		json.writeValue("time", time);
-		json.writeValue("color", c);
-		json.writeValue("type", type);
-		json.writeValue("cb", ActionCallbackSerialization.find(cb), cb == null ? null : String.class);	
-	}
-
-	@Override
-	public void read (Json json, JsonValue jsonData) {
-		currentTime = json.readValue("currentTime", Float.class, jsonData);
-		time = json.readValue("time", Float.class, jsonData);
-		c = json.readValue("color", Color.class, jsonData);
-		type = json.readValue("type", Type.class, jsonData);
-		String cbSer = json.readValue("cb", String.class, jsonData);
-		if(cbSer != null)
-			cb = ActionCallbackSerialization.find(cbSer);
-	}
+    public enum Type {
+        NONE, FADE_IN, FADE_OUT
+    }
+
+    private float time;
+    private float currentTime;
+    private ActionCallback cb;
+    private Color c;
+    private Type type = Type.NONE;
+
+    public void update(float delta) {
+
+        if (isFinish()) {
+            ActionCallback tmpcb = cb;
+
+            // reset the transition when finish. Only in 'fade in' case, 'fade out'
+            // must stay in screen even when finished
+            if (type == Type.FADE_IN)
+                reset();
+
+            if (tmpcb != null) {
+                cb = null;
+                tmpcb.resume();
+            }
+        } else {
+            currentTime += delta;
+        }
+    }
+
+    public void reset() {
+        type = Type.NONE;
+        cb = null;
+    }
+
+    public void draw(SpriteBatch batch, float width, float height) {
+
+        if (type == Type.NONE)
+            return;
+
+        switch (type) {
+            case FADE_IN:
+                c.a = MathUtils.clamp(Interpolation.fade.apply(1 - currentTime / time), 0, 1);
+                break;
+            case FADE_OUT:
+                c.a = MathUtils.clamp(Interpolation.fade.apply(currentTime / time), 0, 1);
+                break;
+            default:
+                break;
+        }
+
+        RectangleRenderer.draw(batch, 0, 0, width, height, c);
+    }
+
+    public void create(float time, Color color, Type type, ActionCallback cb) {
+        this.currentTime = 0f;
+        this.c = color.cpy();
+        this.type = type;
+        this.time = time;
+        this.cb = cb;
+    }
+
+    public boolean isFinish() {
+        return (currentTime > time || type == Type.NONE);
+    }
+
+    @Override
+    public void write(Json json) {
+        json.writeValue("currentTime", currentTime);
+        json.writeValue("time", time);
+        json.writeValue("color", c);
+        json.writeValue("type", type);
+
+        if (cb != null) {
+            World w = ((BladeJson) json).getWorld();
+            Scene s = ((BladeJson) json).getScene();
+            json.writeValue("cb", ActionCallbackSerializer.serialize(w, s, cb));
+        }
+    }
+
+    @Override
+    public void read(Json json, JsonValue jsonData) {
+        currentTime = json.readValue("currentTime", Float.class, jsonData);
+        time = json.readValue("time", Float.class, jsonData);
+        c = json.readValue("color", Color.class, jsonData);
+        type = json.readValue("type", Type.class, jsonData);
+        BladeJson bjson = (BladeJson) json;
+        cb = ActionCallbackSerializer.find(bjson.getWorld(), bjson.getScene(),
+                json.readValue("cb", String.class, jsonData));
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/UIActors.java b/blade-engine/src/com/bladecoder/engine/model/UIActors.java
new file mode 100644
index 000000000..6bc9e6234
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/UIActors.java
@@ -0,0 +1,186 @@
+package com.bladecoder.engine.model;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.badlogic.gdx.graphics.Camera;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.utils.Disposable;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.bladecoder.engine.actions.SceneActorRef;
+import com.bladecoder.engine.assets.AssetConsumer;
+
+public class UIActors implements AssetConsumer, Serializable {
+	private ArrayList<InteractiveActor> actors = new ArrayList<>(0);
+
+	transient private boolean disposed = true;
+	private final SceneCamera cam = new SceneCamera();
+	private World w;
+
+	public UIActors(World w) {
+		this.w = w;
+	}
+
+	public Camera getCamera() {
+		return cam;
+	}
+
+	public void addActor(InteractiveActor a) {
+		actors.add(a);
+	}
+
+	public InteractiveActor removeActor(String id) {
+		for (int i = 0; i < actors.size(); i++) {
+			InteractiveActor a = actors.get(i);
+
+			if (a.getId().equals(id)) {
+				actors.remove(i);
+				return a;
+			}
+		}
+
+		return null;
+	}
+
+	public InteractiveActor get(String actorId) {
+		for (InteractiveActor a : actors) {
+			if (a.getId().equals(actorId))
+				return a;
+		}
+
+		return null;
+	}
+
+	public List<InteractiveActor> getActors() {
+		return actors;
+	}
+
+	public void update(float delta) {
+		// we use iterator because the actor can be deleted in the update.
+		Iterator<InteractiveActor> i = actors.iterator();
+
+		while (i.hasNext()) {
+			InteractiveActor a = i.next();
+			a.update(delta);
+		}
+	}
+
+	public void resize(float viewportWidth, float viewportHeight) {
+		cam.create(viewportWidth, viewportHeight);
+	}
+
+	public void draw(SpriteBatch batch) {
+
+		batch.setProjectionMatrix(cam.combined);
+		batch.begin();
+
+		for (InteractiveActor a : actors) {
+			if (a instanceof SpriteActor) {
+				if (a.isVisible()) {
+					if (((SpriteActor) a).getScale() != 0) {
+						((SpriteActor) a).getRenderer().draw(batch, a.getX(), a.getY(), ((SpriteActor) a).getScaleX(),
+								((SpriteActor) a).getScaleY(), ((SpriteActor) a).getRot(), ((SpriteActor) a).getTint());
+					}
+				}
+			}
+		}
+		batch.end();
+	}
+
+	// tmp vector to use in getActorAtInput()
+	private final Vector3 unprojectTmp = new Vector3();
+
+	public InteractiveActor getActorAtInput(Viewport v) {
+
+		cam.getInputUnProject(v, unprojectTmp);
+
+		return getActorAt(unprojectTmp.x, unprojectTmp.y);
+	}
+
+	public InteractiveActor getActorAt(float x, float y) {
+		for (InteractiveActor uia : actors) {
+			if (uia.canInteract() && uia.hit(x, y)) {
+				return uia;
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	public void loadAssets() {
+		for (InteractiveActor a : actors)
+			if (a instanceof SpriteActor)
+				((AssetConsumer) a).loadAssets();
+	}
+
+	@Override
+	public void retrieveAssets() {
+		for (InteractiveActor a : actors) {
+			if (a instanceof SpriteActor)
+				((AssetConsumer) a).retrieveAssets();
+		}
+
+		disposed = false;
+	}
+
+	@Override
+	public void dispose() {
+		for (InteractiveActor a : actors)
+			if (a instanceof SpriteActor)
+				((Disposable) a).dispose();
+
+		disposed = true;
+	}
+
+	public boolean isDisposed() {
+		return disposed;
+	}
+
+	@Override
+	public void write(Json json) {
+		SceneActorRef actorRef;
+
+		json.writeObjectStart("actors");
+		for (InteractiveActor a : actors) {
+			actorRef = new SceneActorRef(a.getInitScene(), a.getId());
+			json.writeValue(actorRef.toString(), a);
+		}
+		json.writeObjectEnd();
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+
+		actors.clear();
+
+		JsonValue jsonValueActors = jsonData.get("actors");
+		SceneActorRef actorRef;
+
+		// GET ACTORS FROM HIS INIT SCENE.
+		for (int i = 0; i < jsonValueActors.size; i++) {
+			JsonValue jsonValueAct = jsonValueActors.get(i);
+			actorRef = new SceneActorRef(jsonValueAct.name);
+			Scene sourceScn = w.getScene(actorRef.getSceneId());
+
+			BaseActor actor = sourceScn.getActor(actorRef.getActorId(), false);
+			sourceScn.removeActor(actor);
+			addActor((InteractiveActor) actor);
+		}
+
+		// READ ACTOR STATE.
+		// The state must be retrieved after getting actors from his init scene
+		// to restore verb cb properly.
+		for (int i = 0; i < jsonValueActors.size; i++) {
+			JsonValue jsonValueAct = jsonValueActors.get(i);
+
+			InteractiveActor actor = actors.get(i);
+			actor.read(json, jsonValueAct);
+		}
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/Verb.java b/blade-engine/src/com/bladecoder/engine/model/Verb.java
index 69bfa78b8..6497beebd 100644
--- a/blade-engine/src/com/bladecoder/engine/model/Verb.java
+++ b/blade-engine/src/com/bladecoder/engine/model/Verb.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,23 +17,48 @@
 
 import java.util.ArrayList;
 
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.SerializationException;
 import com.bladecoder.engine.actions.Action;
 import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.RunVerbAction;
+import com.bladecoder.engine.serialization.ActionCallbackSerializer;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+import com.bladecoder.engine.util.ActionUtils;
 import com.bladecoder.engine.util.EngineLogger;
 
-public class Verb implements ActionCallback {
+public class Verb implements VerbRunner, Serializable {
+	public static final String LOOKAT_VERB = "lookat";
+	public static final String PICKUP_VERB = "pickup";
+	public static final String ACTION_VERB = "action";
+	public static final String LEAVE_VERB = "leave";
+	public static final String TALKTO_VERB = "talkto";
+	public static final String USE_VERB = "use";
+	public static final String GOTO_VERB = "goto";
+	public static final String TEST_VERB = "test";
+	public static final String INIT_VERB = "init";
+	public static final String INIT_NEW_GAME_VERB = "initNewGame";
+	public static final String INIT_SAVED_GAME_VERB = "initSavedGame";
+
 	private String id;
-	
-	private ArrayList<Action> actions = new ArrayList <Action>();
-	
+	private String state;
+	private String target;
+	private String icon;
+
+	private final ArrayList<Action> actions = new ArrayList<>();
+
 	private int ip = -1;
-	
+	private String currentTarget;
+
+	private ActionCallback cb;
+
 	public Verb() {
 	}
-	
+
 	public Verb(String id) {
-		this.id=id;
+		this.id = id;
 	}
 
 	public String getId() {
@@ -43,55 +68,236 @@ public String getId() {
 	public void setId(String id) {
 		this.id = id;
 	}
-	
+
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	public String getIcon() {
+		return icon;
+	}
+
+	public void setIcon(String icon) {
+		this.icon = icon;
+	}
+
+	public String getTarget() {
+		return target;
+	}
+
+	public void setTarget(String target) {
+		this.target = target;
+	}
+
+	public String getHashKey() {
+		String key = id;
+
+		if (target != null)
+			key = key + "." + target;
+
+		if (state != null)
+			key = key + "." + state;
+
+		return key;
+	}
+
 	public void add(Action a) {
 		actions.add(a);
 	}
-	
+
+	@Override
 	public ArrayList<Action> getActions() {
 		return actions;
 	}
-	
-	public void run() {
+
+	@Override
+	public String getCurrentTarget() {
+		return currentTarget;
+	}
+
+	@Override
+	public void run(String currentTarget, ActionCallback cb) {
+		this.currentTarget = currentTarget;
+		this.cb = cb;
+
+		if (EngineLogger.debugMode()) {
+			StringBuilder sb = new StringBuilder(">>> Running verb: ").append(id);
+
+			if (currentTarget != null) {
+				sb.append(" currentTarget: " + currentTarget);
+			}
+
+			EngineLogger.debug(sb.toString());
+		}
+
 		ip = 0;
 		nextStep();
 	}
-	
+
 	public void nextStep() {
-		
+
 		boolean stop = false;
-		
-		while( !isFinished() && !stop) {
+
+		while (!isFinished() && !stop) {
 			Action a = actions.get(ip);
-			
+
+			if (EngineLogger.debugMode())
+				EngineLogger.debug(ip + ". " + a.getClass().getSimpleName());
+
 			try {
-				if(a.run(this))
+				if (a.run(this))
 					stop = true;
 				else
 					ip++;
 			} catch (Exception e) {
-				EngineLogger.error("EXCEPTION EXECUTING ACTION: " + a.getClass().getSimpleName(), e);
-			}		
+				EngineLogger.error("EXCEPTION EXECUTING ACTION: " + id + " - " + ip + " - "
+						+ a.getClass().getSimpleName() + " - " + e.getMessage(), e);
+				ip++;
+			}
+		}
+
+		if (ip == actions.size()) {
+			EngineLogger.debug(">>> Verb FINISHED: " + id);
+			ip++; // to avoid print the finished message again
+
+			if (cb != null) {
+				ActionCallback cb2 = cb;
+				cb = null;
+
+				cb2.resume();
+			}
 		}
 	}
-	
-	private boolean isFinished() {
-		return ip >= actions.size();
+
+	public boolean isFinished() {
+		return ip >= actions.size() || ip < 0;
 	}
 
 	@Override
 	public void resume() {
 		ip++;
-		nextStep();	
+		nextStep();
 	}
 
+	@Override
+	public int getIP() {
+		return ip;
+	}
+
+	@Override
+	public void setIP(int ip) {
+		this.ip = ip;
+	}
 
+	@Override
 	public void cancel() {
-		for(Action c:actions) {
-			if(c instanceof RunVerbAction)
-				((RunVerbAction)c).cancel();
-		}		
-		
-		ip = actions.size();
-	}	
+		ip = actions.size() + 1;
+
+		for (Action c : actions) {
+			if (c instanceof VerbRunner)
+				((VerbRunner) c).cancel();
+		}
+
+		if (cb != null) {
+			ActionCallback cb2 = cb;
+			cb = null;
+
+			cb2.resume();
+		}
+
+		EngineLogger.debug(">>> Verb CANCELLED: " + id);
+	}
+
+	@Override
+	public void write(Json json) {
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			json.writeValue("id", id);
+
+			if (target != null)
+				json.writeValue("target", target);
+
+			if (state != null)
+				json.writeValue("state", state);
+
+			if (icon != null)
+				json.writeValue("icon", icon);
+
+			json.writeArrayStart("actions");
+			for (Action a : actions) {
+				ActionUtils.writeJson(a, json);
+			}
+			json.writeArrayEnd();
+		} else {
+			json.writeValue("ip", ip);
+
+			if (cb != null)
+				json.writeValue("cb", ActionCallbackSerializer.serialize(bjson.getWorld(), bjson.getScene(), cb));
+
+			if (currentTarget != null)
+				json.writeValue("currentTarget", currentTarget);
+
+			json.writeArrayStart("actions");
+			for (Action a : actions) {
+				if (a instanceof Serializable) {
+					json.writeObjectStart();
+					((Serializable) a).write(json);
+					json.writeObjectEnd();
+				}
+			}
+			json.writeArrayEnd();
+		}
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			id = json.readValue("id", String.class, jsonData);
+			target = json.readValue("target", String.class, (String) null, jsonData);
+			state = json.readValue("state", String.class, (String) null, jsonData);
+			icon = json.readValue("icon", String.class, (String) null, jsonData);
+
+			actions.clear();
+			JsonValue actionsValue = jsonData.get("actions");
+			for (int i = 0; i < actionsValue.size; i++) {
+				JsonValue aValue = actionsValue.get(i);
+				String clazz = aValue.getString("class");
+
+				try {
+					Action a = ActionUtils.readJson(bjson.getWorld(), json, aValue);
+					actions.add(a);
+				} catch (SerializationException e) {
+					EngineLogger.error("Error loading action: " + clazz + " " + aValue.toString());
+					throw e;
+				}
+			}
+		} else {
+			// MUTABLE
+			currentTarget = json.readValue("currentTarget", String.class, (String) null, jsonData);
+			ip = json.readValue("ip", Integer.class, jsonData);
+			cb = ActionCallbackSerializer.find(bjson.getWorld(), bjson.getScene(),
+					json.readValue("cb", String.class, jsonData));
+
+			JsonValue actionsValue = jsonData.get("actions");
+
+			int i = 0;
+
+			for (Action a : actions) {
+				if (a instanceof Serializable && i < actionsValue.size) {
+					if (actionsValue.get(i) == null)
+						break;
+
+					((Serializable) a).read(json, actionsValue.get(i));
+					i++;
+				}
+			}
+		}
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/VerbManager.java b/blade-engine/src/com/bladecoder/engine/model/VerbManager.java
index c90903d38..2c72bd12e 100644
--- a/blade-engine/src/com/bladecoder/engine/model/VerbManager.java
+++ b/blade-engine/src/com/bladecoder/engine/model/VerbManager.java
@@ -18,47 +18,42 @@
 import java.text.MessageFormat;
 import java.util.HashMap;
 
-import com.bladecoder.engine.model.Verb;
-
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.Serializable;
 import com.badlogic.gdx.utils.JsonValue;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
 import com.bladecoder.engine.util.EngineLogger;
 
 public class VerbManager implements Serializable {
-	protected static HashMap<String, Verb> defaultVerbs = new HashMap<String, Verb>();
 	protected HashMap<String, Verb> verbs = new HashMap<String, Verb>();
 
-	public void addVerb(String id, Verb v) {
-		verbs.put(id, v);
-	}
+	private World w;
 
-	public static void addDefaultVerb(String id, Verb v) {
-		defaultVerbs.put(id, v);
+	public void addVerb(Verb v) {
+		verbs.put(v.getHashKey(), v);
 	}
-	
+
 	// Used only in getVerb(). It is a class variable to avoid allocations
 	private StringBuilder tmpsb = new StringBuilder();
 
 	/**
 	 * Returns an actor Verb.
 	 * 
-	 * Search order:
-	 *   - id.target.state
-	 *   - id.target
-	 *   - id.state
-	 *   - id
+	 * Search order: - id.target.state - id.target - id.state - id
 	 * 
-	 * @param id Verb id
-	 * @param target When an object is used by other object.
-	 * @return
+	 * @param id
+	 *            Verb id
+	 * @param target
+	 *            When an object is used by other object.
 	 */
 	public Verb getVerb(String id, String state, String target) {
 		Verb v = null;
-		
-		if(target != null) {
+
+		if (target != null) {
 			tmpsb.setLength(0);
-			if(state != null) {
+			if (state != null) {
 				tmpsb.append(id).append(".").append(target).append(".").append(state);
 				v = verbs.get(tmpsb.toString()); // id.target.state
 			}
@@ -69,11 +64,11 @@ public Verb getVerb(String id, String state, String target) {
 				v = verbs.get(tmpsb.toString()); // id.target
 			}
 		}
-		
+
 		if (v == null && state != null) {
 			tmpsb.setLength(0);
 			tmpsb.append(id).append(".").append(state);
-			
+
 			v = verbs.get(tmpsb.toString()); // id.state
 		}
 
@@ -82,10 +77,6 @@ public Verb getVerb(String id, String state, String target) {
 
 		return v;
 	}
-	
-	public static HashMap<String, Verb> getDefaultVerbs() {
-		return defaultVerbs;
-	}
 
 	public HashMap<String, Verb> getVerbs() {
 		return verbs;
@@ -94,27 +85,30 @@ public HashMap<String, Verb> getVerbs() {
 	/**
 	 * Run Verb
 	 * 
-	 * @param verb Verb
-	 * @param target When one object is used with another object.
+	 * @param verb
+	 *            Verb
+	 * @param target
+	 *            When one object is used with another object.
 	 */
-	public void runVerb(String verb, String state, String target) {
+	public void runVerb(String verb, String state, String target, ActionCallback cb) {
 
 		Verb v = null;
-			
+
+		EngineLogger.debug(MessageFormat.format("Run Verb:{0} State: {1} Target: {2}", verb, state, target));
+
 		v = getVerb(verb, state, target);
 
 		if (v == null) {
-			v = defaultVerbs.get(verb);
+			v = w.getVerbManager().getVerb(verb, null, null);
 		}
 
 		if (v != null) {
-			v.run();
+			v.run(target, cb);
 		} else {
-			EngineLogger.error(MessageFormat.format("Verb ''{0}'' not found for target ''{1}''",
-					verb, target) );
+			EngineLogger.error(MessageFormat.format("Verb ''{0}'' not found for target ''{1}''", verb, target));
 		}
 	}
-	
+
 	/**
 	 * Cancels the execution of a running verb
 	 * 
@@ -123,31 +117,46 @@ public void runVerb(String verb, String state, String target) {
 	 */
 	public void cancelVerb(String verb, String state, String target) {
 		Verb v = null;
-		
+
 		v = getVerb(verb, state, target);
 
 		if (v == null) {
-			v = defaultVerbs.get(verb);
+			v = w.getVerbManager().getVerb(verb, null, null);
 		}
 
 		if (v != null)
 			v.cancel();
 		else {
-			EngineLogger.error(MessageFormat.format("Verb ''{0}'' not found for target ''{1}''",
-					verb, target) );
-		}	
-	}	
+			EngineLogger.error(MessageFormat.format("Verb ''{0}'' not found for target ''{1}''", verb, target));
+		}
+	}
 
 	@Override
 	public void write(Json json) {
-		json.writeValue("verbs", verbs, verbs == null ? null : verbs.getClass(), Verb.class);
+		json.writeValue("verbs", verbs, verbs.getClass(), Verb.class);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public void read (Json json, JsonValue jsonData) {
-		verbs = json.readValue("verbs", HashMap.class, Verb.class, jsonData);
-	}
+	public void read(Json json, JsonValue jsonData) {
 
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			this.w = bjson.getWorld();
+			
+			verbs = json.readValue("verbs", HashMap.class, Verb.class, jsonData);
+		} else {
+			for (String v : verbs.keySet()) {
+				Verb verb = verbs.get(v);
+
+				JsonValue jsonValue = jsonData.get("verbs").get(v);
+
+				if (jsonValue != null)
+					verb.read(json, jsonValue);
+				else
+					EngineLogger.debug("LOAD WARNING: Verb not found in saved game: " + jsonData.name + "." + v);
+			}
+		}
+	}
 
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/VerbRunner.java b/blade-engine/src/com/bladecoder/engine/model/VerbRunner.java
new file mode 100644
index 000000000..732f89c6d
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/VerbRunner.java
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.model;
+
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.ActionCallback;
+
+import java.util.ArrayList;
+
+/**
+ * Interface to define the methods needed to handle and execute verbs.
+ *
+ * @author rgarcia
+ */
+public interface VerbRunner extends ActionCallback {
+
+    /**
+     * Method to retrieve the action list
+     *
+     * @return the action list
+     */
+    ArrayList<Action> getActions();
+
+    /**
+     * Run the verb
+     *
+     * @param currentTarget the target for the 'use' verb.
+     */
+    void run(String currentTarget, ActionCallback cb);
+
+    /**
+     * Return the current action pointer
+     */
+    int getIP();
+
+    /**
+     * Sets the action pointer
+     *
+     * @param ip the pointer (the action index to execute)
+     */
+    void setIP(int ip);
+
+    /**
+     * Sets the IP to the end of the queue finishing the verb execution
+     */
+    void cancel();
+
+
+    /**
+     * The target in 'use' verb.
+     *
+     * @return The target actor 'id'
+     */
+    String getCurrentTarget();
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/VoiceManager.java b/blade-engine/src/com/bladecoder/engine/model/VoiceManager.java
new file mode 100644
index 000000000..3f9b50aec
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/VoiceManager.java
@@ -0,0 +1,183 @@
+package com.bladecoder.engine.model;
+
+import com.badlogic.gdx.audio.Music;
+import com.badlogic.gdx.audio.Music.OnCompletionListener;
+import com.badlogic.gdx.utils.GdxRuntimeException;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+import com.bladecoder.engine.assets.AssetConsumer;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.util.EngineLogger;
+
+/**
+ * Manager to play/load/dispose voices.
+ *
+ * Plays a voice file, if another voice is playing, stops it before playing the
+ * new voice.
+ *
+ * @author rgarcia
+ */
+public class VoiceManager implements Serializable, AssetConsumer {
+	transient private Music voice = null;
+
+	String fileName = null;
+
+	private boolean isPlayingSer = false;
+	private float voicePosSer = 0;
+
+	// the music volume
+	private float volume = 1.0f;
+
+	// the global configurable by user volume
+	public static float VOLUME_MULTIPLIER = 1f;
+
+	transient private boolean isPaused = false;
+	transient private TextManager textManager = null;
+
+	private final Task backgroundLoadingTask = new Task() {
+		@Override
+		public void run() {
+			try {
+				if (!EngineAssetManager.getInstance().isLoading()) {
+					cancel();
+					retrieveAssets();
+
+					if (voice != null)
+						voice.play();
+				}
+
+			} catch (GdxRuntimeException e) {
+				EngineLogger.error(e.getMessage());
+				voice = null;
+				fileName = null;
+				textManager.next();
+			}
+		}
+	};
+
+	public VoiceManager(TextManager textManager) {
+		this.textManager = textManager;
+	}
+
+	public void pause() {
+		if (voice != null && voice.isPlaying()) {
+			voice.pause();
+			isPaused = true;
+		}
+	}
+
+	public void resume() {
+		if (voice != null && isPaused) {
+			voice.play();
+			isPaused = false;
+		}
+	}
+
+	public void stop() {
+		if (voice != null) {
+			voice.stop();
+
+			dispose();
+		}
+	}
+
+	public void play(String fileName) {
+		stop();
+
+		this.fileName = fileName;
+
+		if (fileName != null) {
+			// Load and play the voice file in background to avoid
+			// blocking the UI
+			loadAssets();
+
+			backgroundLoadingTask.cancel();
+			Timer.schedule(backgroundLoadingTask, 0, 0);
+		}
+	}
+
+	public void setVolume(float volume) {
+		this.volume = volume;
+
+		if (voice != null)
+			voice.setVolume(volume * VOLUME_MULTIPLIER);
+	}
+
+	public float getVolume() {
+		return volume;
+	}
+
+	@Override
+	public void dispose() {
+		if (voice != null) {
+
+			if (voice.isPlaying())
+				voice.stop();
+
+			EngineLogger.debug("DISPOSING VOICE: " + fileName);
+			EngineAssetManager.getInstance().unload(EngineAssetManager.VOICE_DIR + fileName);
+
+			voice = null;
+			fileName = null;
+			isPlayingSer = false;
+			voicePosSer = 0;
+		}
+	}
+
+	@Override
+	public void loadAssets() {
+		if (voice == null && fileName != null) {
+			EngineLogger.debug("LOADING VOICE: " + fileName);
+			EngineAssetManager.getInstance().load(EngineAssetManager.VOICE_DIR + fileName, Music.class);
+		}
+	}
+
+	@Override
+	public void retrieveAssets() {
+		if (voice == null && fileName != null) {
+
+			EngineLogger.debug("RETRIEVING VOICE: " + fileName);
+
+			voice = EngineAssetManager.getInstance().get(EngineAssetManager.VOICE_DIR + fileName, Music.class);
+
+			voice.setOnCompletionListener(new OnCompletionListener() {
+				@Override
+				public void onCompletion(Music music) {
+					if (textManager.getCurrentText() != null)
+						textManager.getCurrentText().setAutoTime();
+				}
+			});
+
+			if (voice != null)
+				voice.setVolume(volume * VOLUME_MULTIPLIER);
+
+			if (isPlayingSer) {
+				voice.play();
+
+				if (voice != null) {
+					voice.setPosition(voicePosSer);
+				}
+
+				isPlayingSer = false;
+				voicePosSer = 0f;
+			}
+		}
+	}
+
+	@Override
+	public void write(Json json) {
+		json.writeValue("fileName", fileName);
+		json.writeValue("isPlaying", voice != null && (voice.isPlaying() || isPaused));
+		json.writeValue("musicPos", voice != null && (voice.isPlaying() || isPaused) ? voice.getPosition() : 0f);
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+		fileName = json.readValue("fileName", String.class, jsonData);
+		isPlayingSer = json.readValue("isPlaying", boolean.class, false, jsonData);
+		voicePosSer = json.readValue("musicPos", float.class, 0f, jsonData);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/WalkZoneActor.java b/blade-engine/src/com/bladecoder/engine/model/WalkZoneActor.java
new file mode 100644
index 000000000..4e69f45a3
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/WalkZoneActor.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.model;
+
+import com.badlogic.gdx.utils.Json;
+import com.bladecoder.engine.serialization.BladeJson;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+import com.bladecoder.engine.util.PolygonUtils;
+
+/**
+ * An Obstacle actor is used to restrict the walk zone in the scene
+ * 
+ * @author rgarcia
+ */
+public class WalkZoneActor extends BaseActor {
+
+	@Override
+	public void update(float delta) {
+	}
+
+	@Override
+	public void setPosition(float x, float y) {
+		getBBox().setPosition(x, y);
+
+		if (scene != null && id.equals(scene.getWalkZone())) {
+			scene.getPolygonalNavGraph().createInitialGraph(this, scene.getActors().values());
+		}
+	}
+
+	@Override
+	public void write(Json json) {
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			PolygonUtils.ensureClockWise(getBBox().getVertices(), 0, getBBox().getVertices().length);
+			getBBox().dirty();
+		}
+
+		super.write(json);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/model/World.java b/blade-engine/src/com/bladecoder/engine/model/World.java
index 7d2207c23..a675bfa2b 100644
--- a/blade-engine/src/com/bladecoder/engine/model/World.java
+++ b/blade-engine/src/com/bladecoder/engine/model/World.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,578 +15,823 @@
  ******************************************************************************/
 package com.bladecoder.engine.model;
 
-import java.io.IOException;
-import java.io.Writer;
-import java.util.HashMap;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import com.bladecoder.engine.model.Dialog;
-import com.bladecoder.engine.model.Inventory;
-import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.model.SceneCamera;
-import com.bladecoder.engine.model.Sprite3DRenderer;
-import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.TextManager;
-import com.bladecoder.engine.model.World;
-import org.xml.sax.SAXException;
-
+import com.badlogic.gdx.Application.ApplicationType;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.Pixmap;
+import com.badlogic.gdx.graphics.Pixmap.Format;
+import com.badlogic.gdx.graphics.PixmapIO;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.Json.Serializable;
-import com.badlogic.gdx.utils.JsonValue;
-import com.badlogic.gdx.utils.JsonWriter.OutputType;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.actions.ActionCallbackQueue;
-import com.bladecoder.engine.anim.Timers;
+import com.badlogic.gdx.graphics.glutils.FrameBuffer;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.BufferUtils;
+import com.badlogic.gdx.utils.ScreenUtils;
+import com.badlogic.gdx.utils.viewport.Viewport;
 import com.bladecoder.engine.assets.AssetConsumer;
 import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.i18n.I18N;
-import com.bladecoder.engine.loader.WorldXMLLoader;
+import com.bladecoder.engine.ink.InkManager;
+import com.bladecoder.engine.serialization.WorldSerialization;
 import com.bladecoder.engine.util.EngineLogger;
 import com.bladecoder.engine.util.FileUtils;
 
-public class World implements Serializable, AssetConsumer {
+import java.io.IOException;
+import java.nio.IntBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.Deflater;
+
+public class World implements AssetConsumer {
+
+    private static final String GAMESTATE_FILENAME = "default" + WorldSerialization.GAMESTATE_EXT;
+    private static final String DEFAULT_INVENTORY = "DEFAULT";
+
+    public enum AssetState {
+        LOADED, LOADING, LOADING_AND_INIT_SCENE, LOAD_ASSETS, LOAD_ASSETS_AND_INIT_SCENE
+    }
+
+    public enum WorldProperties {
+        SAVED_GAME_VERSION, PREVIOUS_SCENE, CURRENT_CHAPTER, PLATFORM
+    }
+
+    private static final boolean CACHE_ENABLED = true;
+
+    // ------------ WORLD PROPERTIES ------------
+    private int width;
+    private int height;
+
+    private String initScene;
+    private final HashMap<String, SoundDesc> sounds = new HashMap<>();
+    private final HashMap<String, Scene> scenes = new HashMap<>();
+    private final VerbManager verbs = new VerbManager();
+    private final I18N i18n = new I18N();
+
+    private Scene currentScene;
+    private Dialog currentDialog;
+
+    private final Map<String, Inventory> inventories = new HashMap<>();
+    private String currentInventory;
+
+    private UIActors uiActors;
+
+    private boolean paused;
+    private boolean cutMode;
+
+    // Keep track of the time of game in ms.
+    private long timeOfGame;
+
+    // Add support for the use of global custom properties/variables in the game
+    // logic
+    private final HashMap<String, String> customProperties = new HashMap<>();
+
+    private String initChapter;
+    private String currentChapter;
+
+    // For FADEIN/FADEOUT
+    private Transition transition;
+
+    private MusicManager musicManager;
+
+    private WorldListener listener;
+
+    // ------------ LAZY CREATED OBJECTS ------------
+    private InkManager inkManager;
+
+    // ------------ TRANSIENT OBJECTS ------------
+    private AssetState assetState;
+    transient private SpriteBatch spriteBatch;
+
+    // for debug purposes, keep track of loading time
+    private long initLoadingTime;
+
+    // We not dispose the last loaded scene.
+    // Instead, we cache it to improve performance when returning
+    transient private Scene cachedScene;
+
+    // If not null, this scene is set as the currentScene and the test Verb is
+    // executed
+    private String testScene;
+
+    // If true call 'initNewGame' or 'initSavedGame' verbs.
+    private boolean initGame;
+
+    // The verb to call after loading a scene. If null, the "init" verb will be
+    // called
+    private String initVerb;
+
+    private final WorldSerialization serialization = new WorldSerialization(this);
+
+    public World() {
+        init();
+    }
+
+    private void init() {
+
+        inventories.clear();
+        inventories.put(DEFAULT_INVENTORY, new Inventory());
+        setCurrentInventory(DEFAULT_INVENTORY);
+
+        scenes.clear();
+        sounds.clear();
+
+        uiActors = new UIActors(this);
+
+        cutMode = false;
+        currentChapter = null;
+        cachedScene = null;
+
+        customProperties.clear();
+
+        spriteBatch = new SpriteBatch();
+
+        transition = new Transition();
+
+        musicManager = new MusicManager();
+
+        paused = false;
+
+        initGame = true;
+    }
+
+    public void setListener(WorldListener l) {
+        listener = l;
+    }
+
+    public WorldListener getListener() {
+        return listener;
+    }
+
+    public WorldSerialization getSerializer() {
+        return serialization;
+    }
+
+    public InkManager getInkManager() {
+        // Lazy creation
+        if (inkManager == null) {
+            // Allow not link the Blade Ink Engine library if you don't use Ink
+            try {
+                Class.forName("com.bladecoder.ink.runtime.Story");
+                inkManager = new InkManager(this);
+            } catch (ClassNotFoundException e) {
+                EngineLogger.debug("WARNING: Blade Ink Library not found.");
+            }
+        }
+
+        return inkManager;
+    }
+
+    /**
+     * Returns a scene from the cache. null if the scene is not cached.
+     * <p>
+     * Note that by now, the cache has only one Scene. In the future, the cache will
+     * be a Hastable.
+     */
+    public Scene getCachedScene(String id) {
+
+        if (cachedScene != null && cachedScene.getId().equals(id))
+            return cachedScene;
+
+        return null;
+    }
+
+    public String getCustomProperty(String name) {
+        return customProperties.get(name);
+    }
+
+    public void setCustomProperty(String name, String value) {
+        if (value == null)
+            customProperties.remove(name);
+        else
+            customProperties.put(name, value);
+    }
+
+    public VerbManager getVerbManager() {
+        return verbs;
+    }
+
+    public MusicManager getMusicManager() {
+        return musicManager;
+    }
+
+    public HashMap<String, SoundDesc> getSounds() {
+        return sounds;
+    }
+
+    public void draw() {
+        if (assetState == AssetState.LOADED) {
+            getCurrentScene().draw(spriteBatch);
+            uiActors.draw(spriteBatch);
+        }
+    }
+
+    public void update(float delta) {
+        if (assetState == AssetState.LOAD_ASSETS || assetState == AssetState.LOAD_ASSETS_AND_INIT_SCENE) {
+            loadAssets();
+
+            if (assetState == AssetState.LOAD_ASSETS)
+                assetState = AssetState.LOADING;
+            else
+                assetState = AssetState.LOADING_AND_INIT_SCENE;
+
+            // initLoadingTime = System.currentTimeMillis();
+        }
+
+        if ((assetState == AssetState.LOADING || assetState == AssetState.LOADING_AND_INIT_SCENE)
+                && !EngineAssetManager.getInstance().isLoading()) {
+
+            retrieveAssets();
+
+            paused = false;
+
+            boolean init = (assetState == AssetState.LOADING_AND_INIT_SCENE);
+
+            assetState = AssetState.LOADED;
+
+            EngineLogger.debug("ASSETS LOADING TIME (ms): " + (System.currentTimeMillis() - initLoadingTime));
+
+            if (initGame) {
+                initGame = false;
+
+                // Call world init verbs. Check for SAVED_GAME_VERSION property
+                // to know if new or loaded game.
+                if (customProperties.get(WorldProperties.SAVED_GAME_VERSION.toString()) == null
+                        && verbs.getVerb(Verb.INIT_NEW_GAME_VERB, null, null) != null)
+                    verbs.runVerb(Verb.INIT_NEW_GAME_VERB, null, null, null);
+                else if (customProperties.get(WorldProperties.SAVED_GAME_VERSION.toString()) != null
+                        && verbs.getVerb(Verb.INIT_SAVED_GAME_VERB, null, null) != null)
+                    verbs.runVerb(Verb.INIT_SAVED_GAME_VERB, null, null, null);
+            }
+
+            startScene(init);
+
+        }
+
+        if (paused || assetState != AssetState.LOADED)
+            return;
+
+        timeOfGame += delta * 1000f;
+
+        getCurrentScene().update(delta);
+
+        uiActors.update(delta);
+        getInventory().update(delta);
+
+        transition.update(delta);
+
+        musicManager.update(delta);
+    }
+
+    private void startScene(boolean initScene) {
+        // call 'init' verb only when arrives from setCurrentScene and not
+        // from load or restoring
+        if (initScene) {
+            currentScene.init();
+
+            if (inkManager != null)
+                inkManager.init();
+
+            setCutMode(false);
+
+            // If in test mode run 'test' verb (only the first time)
+            if (testScene != null && testScene.equals(currentScene.getId())
+                    && currentScene.getVerb(Verb.TEST_VERB) != null) {
+
+                initVerb = Verb.TEST_VERB;
+
+                testScene = null;
+            }
+
+            if (initVerb == null)
+                initVerb = "init";
+        }
+
+        // Run INIT verb
+        if (initVerb != null
+                && (currentScene.getVerb(initVerb) != null || getVerbManager().getVerb(initVerb, null, null) != null)) {
+            currentScene.runVerb(initVerb);
+        }
+
+        initVerb = null;
+    }
+
+    @Override
+    public void loadAssets() {
+        currentScene.loadAssets();
+
+        if (getInventory().isDisposed())
+            getInventory().loadAssets();
+
+        if (uiActors.isDisposed())
+            uiActors.loadAssets();
+
+        musicManager.loadAssets();
+    }
+
+    @Override
+    public void retrieveAssets() {
+        if (getInventory().isDisposed())
+            getInventory().retrieveAssets();
+
+        if (uiActors.isDisposed())
+            uiActors.retrieveAssets();
+
+        getCurrentScene().retrieveAssets();
+
+        // Print loaded assets for scene
+        if (EngineLogger.debugMode()) {
+            Array<String> assetNames = EngineAssetManager.getInstance().getAssetNames();
+
+            assetNames.sort();
+
+            EngineLogger.debug("Assets loaded for SCENE: " + currentScene.getId());
+
+            for (String n : assetNames) {
+                EngineLogger.debug("\t" + n);
+            }
+        }
+
+        musicManager.retrieveAssets();
+    }
+
+    public Transition getTransition() {
+        return transition;
+    }
+
+    public long getTimeOfGame() {
+        return timeOfGame;
+    }
+
+    public void setTimeOfGame(long t) {
+        timeOfGame = t;
+    }
+
+    public AssetState getAssetState() {
+        return assetState;
+    }
+
+    public I18N getI18N() {
+        return i18n;
+    }
+
+    public Dialog getCurrentDialog() {
+        return currentDialog;
+    }
+
+    public Scene getCurrentScene() {
+        return currentScene;
+    }
+
+    public String getInitScene() {
+        return initScene;
+    }
+
+    public String getCurrentChapter() {
+        return currentChapter;
+    }
+
+    public void setInitScene(String initScene) {
+        this.initScene = initScene;
+    }
+
+    public void setCurrentScene(Scene scene, boolean init, String initVerb) {
+
+        initLoadingTime = System.currentTimeMillis();
+
+        if (cachedScene == scene || currentScene == scene) {
+            if (init)
+                assetState = AssetState.LOADING_AND_INIT_SCENE;
+            else
+                assetState = AssetState.LOADING;
+        } else {
+            if (cachedScene != null) {
+                cachedScene.dispose();
+                cachedScene = null;
+            }
+
+            if (init)
+                assetState = AssetState.LOAD_ASSETS_AND_INIT_SCENE;
+            else
+                assetState = AssetState.LOAD_ASSETS;
+        }
+
+        if (currentScene != null) {
+            currentDialog = null;
+
+            // Stop Sounds
+            currentScene.getSoundManager().stop();
+
+            customProperties.put(WorldProperties.PREVIOUS_SCENE.toString(), currentScene.getId());
+
+            if (CACHE_ENABLED) {
+                if (currentScene != scene) { // Don't cache the scene if it is the same scene.
+                    cachedScene = currentScene; // CACHE ENABLED
+                }
+            } else {
+                currentScene.dispose(); // CACHE DISABLED
+            }
+
+            transition.reset();
+        }
+
+        currentScene = scene;
+        this.initVerb = initVerb;
+
+        musicManager.leaveScene(currentScene.getMusicDesc());
+    }
+
+    public Inventory getInventory() {
+        return inventories.get(currentInventory);
+    }
+
+    public HashMap<String, String> getCustomProperties() {
+        return customProperties;
+    }
+
+    public Map<String, Inventory> getInventories() {
+        return inventories;
+    }
+
+    public UIActors getUIActors() {
+        return uiActors;
+    }
+
+    public void addScene(Scene scene) {
+        scenes.put(scene.getId(), scene);
+    }
+
+    public Scene getScene(String id) {
+        return scenes.get(id);
+    }
 
-	private static final String GAMESTATE_FILENAME = "gamestate.v7";
+    public Map<String, Scene> getScenes() {
+        return scenes;
+    }
 
-	public static enum AssetState {
-		LOADED, LOADING, LOADING_AND_INIT_SCENE, LOAD_ASSETS, LOAD_ASSETS_AND_INIT_SCENE
-	};
+    public void setCutMode(boolean v) {
+        cutMode = v;
 
-	private static final World instance = new World();
+        if (listener != null)
+            listener.cutMode(cutMode);
+    }
 
-	private AssetState assetState;
+    public void setCurrentScene(String id, boolean init, String initVerb) {
+        if (id.equals("$" + WorldProperties.PREVIOUS_SCENE))
+            id = getCustomProperty(WorldProperties.PREVIOUS_SCENE.toString());
 
-	private int width;
-	private int height;
+        Scene s = scenes.get(id);
 
-	private HashMap<String, Scene> scenes;
+        if (s != null) {
+            setCurrentScene(s, init, initVerb);
+        } else {
+            EngineLogger.error("SetCurrentScene - COULD NOT FIND SCENE: " + id);
+        }
+    }
 
-	private Scene currentScene;
-	private Dialog currentDialog;
+    public void setCurrentDialog(Dialog dialog) {
+        this.currentDialog = dialog;
+        if (dialog != null) {
+            dialog.reset();
 
-	private Inventory inventory;
-	private TextManager textManager;
+            int visibleOptions = dialog.getNumVisibleOptions();
 
-	private boolean paused;
-	private boolean cutMode;
+            if (visibleOptions == 0)
+                currentDialog = null;
+        }
 
-	/** keep track of the time of game */
-	private float timeOfGame;
+        if (listener != null)
+            listener.dialogOptions();
+    }
 
-	/** for debug purposes, keep track of loading time */
-	private long initLoadingTime;
+    public void setInventory(String inventory) {
+        Inventory i = inventories.get(inventory);
 
-	private Timers timers;
-	private boolean disposed;
+        if (i == null) {
+            i = new Inventory();
+            inventories.put(inventory, i);
+        }
 
-	/**
-	 * If not null, this scene is set as the currentScene and the test Verb is
-	 * executed
-	 */
-	private String testScene;
+        setCurrentInventory(inventory);
+    }
 
-	/**
-	 * Add support for the use of global custom properties/variables in the game
-	 * logic
-	 */
-	private HashMap<String, String> customProperties;
+    public boolean hasDialogOptions() {
+        return currentDialog != null || (inkManager != null && inkManager.hasChoices());
+    }
 
-	private String initChapter;
-	private String currentChapter;
+    public void selectDialogOption(int i) {
+        if (currentDialog != null)
+            setCurrentDialog(currentDialog.selectOption(i));
+        else if (inkManager != null)
+            getInkManager().selectChoice(i);
+    }
 
-	transient private SpriteBatch spriteBatch;
+    public List<String> getDialogOptions() {
+        List<String> choices;
 
-	public static World getInstance() {
-		return instance;
-	}
+        if (getCurrentDialog() != null) {
+            choices = getCurrentDialog().getChoices();
+        } else {
+            choices = getInkManager().getChoices();
+        }
 
-	private World() {
-		disposed = true;
-	}
+        return choices;
+    }
 
-	private void init() {
-		scenes = new HashMap<String, Scene>();
-		inventory = new Inventory();
-		textManager = new TextManager();
+    // tmp vector to use in getInteractiveActorAtInput()
+    private final Vector3 unprojectTmp = new Vector3();
 
-		timers = new Timers();
+    /**
+     * Obtains the actor at (x,y) with TOLERANCE. Search the current scene and the
+     * UIActors list.
+     */
+    public InteractiveActor getInteractiveActorAtInput(Viewport v, float tolerance) {
 
-		cutMode = false;
-		timeOfGame = 0;
-		currentChapter = null;
+        getSceneCamera().getInputUnProject(v, unprojectTmp);
 
-		customProperties = new HashMap<String, String>();
+        // search first in ui actors
+        InteractiveActor a = uiActors.getActorAtInput(v);
 
-		spriteBatch = new SpriteBatch();
+        if (a != null)
+            return a;
 
-		disposed = false;
-	}
+        return currentScene.getInteractiveActorAt(unprojectTmp.x, unprojectTmp.y, tolerance);
+    }
 
-	public void addTimer(float time, ActionCallback cb) {
-		timers.addTimer(time, cb);
-	}
+    public int getWidth() {
+        return width;
+    }
 
-	public String getCustomProperty(String name) {
-		return customProperties.get(name);
-	}
+    public void setWidth(int width) {
+        this.width = width;
+    }
 
-	public void setCustomProperty(String name, String value) {
-		if (value == null)
-			customProperties.remove(name);
-		else
-			customProperties.put(name, value);
-	}
+    public int getHeight() {
+        return height;
+    }
 
-	public void draw() {
-		if (assetState == AssetState.LOADED) {
-
-			spriteBatch.setProjectionMatrix(currentScene.getCamera().combined);
-			spriteBatch.begin();
-			getCurrentScene().draw(spriteBatch);
-			spriteBatch.end();
-		}
-	}
-
-	public void update(float delta) {
-		if (assetState == AssetState.LOAD_ASSETS
-				|| assetState == AssetState.LOAD_ASSETS_AND_INIT_SCENE) {
-			loadAssets();
+    public void setHeight(int height) {
+        this.height = height;
+    }
 
-			if (assetState == AssetState.LOAD_ASSETS)
-				assetState = AssetState.LOADING;
-			else
-				assetState = AssetState.LOADING_AND_INIT_SCENE;
-
-			initLoadingTime = System.currentTimeMillis();
-
-		} else if ((assetState == AssetState.LOADING || assetState == AssetState.LOADING_AND_INIT_SCENE)
-				&& !EngineAssetManager.getInstance().isLoading()) {
-			retrieveAssets();
-
-			boolean initScene = (assetState == AssetState.LOADING_AND_INIT_SCENE);
-
-			assetState = AssetState.LOADED;
-
-			EngineLogger.debug("ASSETS LOADING TIME (ms): "
-					+ (System.currentTimeMillis() - initLoadingTime));
-
-			// call 'init' verb only when arrives from setCurrentScene and not
-			// from load or restoring
-			if (initScene) {
-				initCurrentScene();
-			}
-
-		}
-
-		if (paused || assetState != AssetState.LOADED)
-			return;
-
-		timeOfGame += delta;
-
-		getCurrentScene().update(delta);
-		textManager.update(delta);
-		timers.update(delta);
-		ActionCallbackQueue.run();
-	}
-
-	@Override
-	public void loadAssets() {
-		currentScene.loadAssets();
-		inventory.loadAssets();
-	}
-
-	@Override
-	public void retrieveAssets() {
-		inventory.retrieveAssets();
-		getCurrentScene().retrieveAssets();
-	}
-
-	public float getTimeOfGame() {
-		return timeOfGame;
-	}
-
-	public AssetState getAssetState() {
-		return assetState;
-	}
-
-	/**
-	 * Try to load the save game if exists. In other case, load the game from
-	 * XML.
-	 * 
-	 * @throws IOException
-	 * @throws SAXException
-	 * @throws ParserConfigurationException
-	 */
-	public void load() {
-		if (FileUtils.exists(EngineAssetManager.getInstance().getUserFile(GAMESTATE_FILENAME))) {
-			// 2.- SAVEGAME EXISTS
-			try {
-				instance.loadGameState();
-			} catch (Exception e) {
-				EngineLogger.error("ERROR LOADING SAVED GAME", e);
-				instance.loadXMLChapter(null);
-			}
-		} else {
-			// 3.- XML LOADING
-			instance.loadXMLChapter(null);
-		}
-	}
-
-	public void loadXMLWorld() {
-		try {
-			WorldXMLLoader.loadWorld(this);
-		} catch (Exception e) {
-			EngineLogger.error("ERROR LOADING WORLD XML", e);
-			instance.dispose();
-			Gdx.app.exit();
-		}
-	}
-
-	public void loadXMLChapter(String chapterName) {
-		if (!disposed)
-			dispose();
-
-		init();
-
-		assetState = AssetState.LOAD_ASSETS;
-
-		long initTime = System.currentTimeMillis();
-
-		try {
-			WorldXMLLoader.loadChapter(chapterName, this);
-		} catch (Exception e) {
-			EngineLogger.error("ERROR LOADING GAME", e);
-			instance.dispose();
-			Gdx.app.exit();
-		}
-
-		EngineLogger.debug("XML LOADING TIME (ms): "
-				+ (System.currentTimeMillis() - initTime));
-	}
-
-	public void loadXMLChapter(String chapter, String scene) {
-		this.testScene = scene;
-
-		instance.loadXMLChapter(chapter);
-
-		if (testScene != null) {
-			currentScene = null;
-			setCurrentScene(testScene);
-		}
-	}
-
-	public Dialog getCurrentDialog() {
-		return currentDialog;
-	}
-
-	public Scene getCurrentScene() {
-		return currentScene;
-	}
-
-	public void setCurrentScene(Scene scene) {
-
-		if (currentScene != null) {
-			textManager.reset();
-			timers.clear();
-			currentScene.stopMusic();
-			currentDialog = null;
-
-			currentScene.dispose();
-		}
-
-		currentScene = scene;
-
-		assetState = AssetState.LOAD_ASSETS_AND_INIT_SCENE;
-	}
-
-	public void initCurrentScene() {
-		// If in test mode run 'test' verb
-		if (testScene != null && testScene.equals(currentScene.getId())
-				&& currentScene.getVerb("test") != null)
-			currentScene.runVerb("test");
-
-		// Run INIT action
-		if (currentScene.getVerb("init") != null)
-			currentScene.runVerb("init");
-	}
-
-	public Inventory getInventory() {
-		return inventory;
-	}
-
-	public TextManager getTextManager() {
-		return textManager;
-	}
-
-	public void addScene(Scene scene) {
-		scenes.put(scene.getId(), scene);
-	}
-
-	public Scene getScene(String id) {
-		return scenes.get(id);
-	}
-	
-	public HashMap<String, Scene> getScenes() {
-		return scenes;
-	}
+    public void showInventory(boolean b) {
+        getInventory().setVisible(b);
 
-	public void setCutMode(boolean v) {
-		cutMode = v;
-	}
+        if (listener != null)
+            listener.inventoryEnabled(b);
+    }
 
-	public void setCurrentScene(String id) {
-		Scene s = scenes.get(id);
+    public String getCurrentInventory() {
+        return currentInventory;
+    }
 
-		if (s != null) {
-			setCurrentScene(s);
-		} else {
-			EngineLogger.error("SetCurrentScene - COULD NOT FIND SCENE: " + id);
-			Gdx.app.exit();
-		}
-	}
+    public void setCurrentInventory(String currentInventory) {
+        this.currentInventory = currentInventory;
+    }
 
-	public void setCurrentDialog(Dialog dialog) {
-		this.currentDialog = dialog;
-		if (dialog != null)
-			dialog.reset();
-	}
+    public boolean isDisposed() {
+        return currentScene == null;
+    }
 
-	public int getWidth() {
-		return width;
-	}
+    @Override
+    public void dispose() {
 
-	public void setWidth(int width) {
-		this.width = width;
-	}
+        if (isDisposed())
+            return;
 
-	public int getHeight() {
-		return height;
-	}
+        try {
 
-	public void setHeight(int height) {
-		this.height = height;
-	}
+            currentDialog = null;
 
-	public void showInventory(boolean b) {
-		inventory.setVisible(b);
-	}
-
-	public boolean isDisposed() {
-		return disposed;
-	}
+            transition.reset();
 
-	@Override
-	public void dispose() {
+            // ONLY dispose currentscene because other scenes are already
+            // disposed
+            if (currentScene != null) {
+                musicManager.stopMusic();
+                currentScene.getTextManager().reset();
+                currentScene.dispose();
+                currentScene = null;
+            }
 
-		try {
+            if (cachedScene != null) {
+                cachedScene.dispose();
+                cachedScene = null;
+            }
 
-			// ONLY dispose currentscene because other scenes are already
-			// disposed
-			currentScene.dispose();
-			currentScene = null;
+            getInventory().dispose();
+            uiActors.dispose();
 
-			inventory.dispose();
+            spriteBatch.dispose();
 
-			spriteBatch.dispose();
+            assetState = null;
 
-			Sprite3DRenderer.disposeBatchs();
+            musicManager.dispose();
 
-		} catch (Exception e) {
-			EngineLogger.error(e.getMessage());
-		}
+            inkManager = null;
 
-		disposed = true;
-	}
+        } catch (Exception e) {
+            EngineLogger.error(e.getMessage());
+        }
 
-	public SceneCamera getSceneCamera() {
-		return currentScene.getCamera();
-	}
+        init();
+    }
 
-	public void resize(float viewportWidth, float viewportHeight) {
-		currentScene.getCamera().viewportWidth = viewportWidth;
-		currentScene.getCamera().viewportHeight = viewportHeight;
+    public SceneCamera getSceneCamera() {
+        return currentScene.getCamera();
+    }
 
-		if (currentScene.getCameraFollowActor() != null)
-			currentScene.getCamera().updatePos(
-					currentScene.getCameraFollowActor());
+    public void resize(float viewportWidth, float viewportHeight) {
+        if (currentScene != null) {
+            currentScene.getCamera().viewportWidth = viewportWidth;
+            currentScene.getCamera().viewportHeight = viewportHeight;
 
-		currentScene.getCamera().update();
-	}
+            if (currentScene.getCameraFollowActor() != null)
+                currentScene.getCamera().updatePos(currentScene.getCameraFollowActor());
 
-	public void setChapter(String chapter) {
-		this.currentChapter = chapter;
-	}
+            currentScene.getCamera().update();
 
-	public String getInitChapter() {
-		return initChapter;
-	}
+            uiActors.resize(viewportWidth, viewportHeight);
+        }
+    }
 
-	public void setInitChapter(String initChapter) {
-		this.initChapter = initChapter;
-	}
+    public void setChapter(String chapter) {
+        this.currentChapter = chapter;
+    }
 
-	public boolean isPaused() {
-		return paused;
-	}
+    public String getInitChapter() {
+        return initChapter;
+    }
 
-	public boolean inCutMode() {
-		return cutMode;
-	}
+    public void setInitChapter(String initChapter) {
+        this.initChapter = initChapter;
+    }
 
-	public void pause() {
-		paused = true;
+    public boolean isPaused() {
+        return paused;
+    }
 
-		if (currentScene != null)
-			currentScene.pauseMusic();
+    public boolean inCutMode() {
+        return cutMode;
+    }
 
-		// TODO Pause all sounds
-	}
+    public void pause() {
+        paused = true;
+
+        if (currentScene != null) {
 
-	public void resume() {
-		if (assetState == AssetState.LOADED) {
-			paused = false;
+            // do not pause the music when going to the loading screen.
+            if (assetState == AssetState.LOADED) {
+                musicManager.pauseMusic();
+                currentScene.getTextManager().getVoiceManager().pause();
+            }
+
+            // Pause all sounds
+            currentScene.getSoundManager().pause();
+        }
+
+        if (listener != null)
+            listener.pause(true);
+    }
+
+    public void resume() {
+        paused = false;
+
+        if (assetState == AssetState.LOADED) {
+            if (currentScene != null) {
+                musicManager.resumeMusic();
+                currentScene.getTextManager().getVoiceManager().resume();
+
+                // Resume all sounds
+                currentScene.getSoundManager().resume();
+            }
+        }
+
+        if (listener != null)
+            listener.pause(false);
+    }
+
+    public void newGame() throws Exception {
+        timeOfGame = 0;
+        serialization.loadChapter();
+    }
 
-			if (currentScene != null)
-				currentScene.resumeMusic();
+    public void endGame() {
+        dispose();
 
-			// TODO Resume all sounds
-		}
-	}
+        // DELETE SAVEGAME
+        if (EngineAssetManager.getInstance().getUserFile(GAMESTATE_FILENAME).exists()) {
+            EngineAssetManager.getInstance().getUserFile(GAMESTATE_FILENAME).delete();
+        }
+    }
 
-	public void newGame() {
-		loadXMLChapter(null);
-	}
-	
-	public boolean savedGameExists() {
-		return FileUtils.exists(EngineAssetManager.getInstance().getUserFile(GAMESTATE_FILENAME));
-	}
-
-	// ********** JSON SERIALIZATION FOR GAME SAVING **********
-	public void saveGameState() {
-		saveGameState(GAMESTATE_FILENAME);
-	}
-
-	public void loadGameState() {
-		long initTime = System.currentTimeMillis();
-		loadGameState(GAMESTATE_FILENAME);
-		EngineLogger.debug("JSON LOADING TIME (ms): "
-				+ (System.currentTimeMillis() - initTime));
-	}
-
-	public void loadGameState(String filename) {
-		FileHandle savedFile = EngineAssetManager.getInstance().getUserFile(
-				filename);
-
-		loadGameState(savedFile);
-	}
-
-	public void loadGameState(FileHandle savedFile) {
-		EngineLogger.debug("LOADING GAME STATE");
-
-		if (!disposed)
-			dispose();
-
-		init();
-
-		if (FileUtils.exists(savedFile)) {
-			assetState = AssetState.LOAD_ASSETS;
-
-			new Json().fromJson(World.class, savedFile.reader("UTF-8"));
-
-		} else {
-			EngineLogger.error("LOADGAMESTATE: no saved game exists");
-		}
-	}
-
-	public void saveGameState(String filename) {
-		EngineLogger.debug("SAVING GAME STATE");
-
-		if (disposed)
-			return;
-
-		Json json = new Json();
-		json.setOutputType(OutputType.javascript);
-
-		String s = null;
-
-		if (EngineLogger.debugMode())
-			s = json.prettyPrint(instance);
-		else
-			s = json.toJson(instance);
-
-		Writer w = EngineAssetManager.getInstance().getUserFile(filename)
-				.writer(false, "UTF-8");
-
-		try {
-			w.write(s);
-			w.close();
-		} catch (IOException e) {
-			EngineLogger.error("ERROR SAVING GAME", e);
-		}
-	}
-
-	@Override
-	public void write(Json json) {
-		json.writeValue("scenes", scenes, scenes.getClass(), Scene.class);
-		json.writeValue("currentScene", currentScene.getId());
-		json.writeValue("inventory", inventory);
-		json.writeValue("timeOfGame", timeOfGame);
-		json.writeValue("cutmode", cutMode);
-//		json.writeValue("defaultVerbs", VerbManager.defaultVerbs,
-//				HashMap.class, Verb.class);
-		json.writeValue("timers", timers);
-		json.writeValue("textmanager", textManager);
-		json.writeValue("customProperties", customProperties);
-
-		if (currentDialog == null) {
-			json.writeValue("dialogActor", (String) null, null);
-			json.writeValue("currentDialog", (String) null, null);
-		} else {
-			json.writeValue("dialogActor", currentDialog.getActor());
-			json.writeValue("currentDialog", currentDialog.getId());
-		}
-
-		json.writeValue("chapter", currentChapter);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		instance.scenes = json.readValue("scenes", HashMap.class, Scene.class,
-				jsonData);
-		instance.currentScene = instance.scenes.get(json.readValue(
-				"currentScene", String.class, jsonData));
-		instance.inventory = json.readValue("inventory", Inventory.class,
-				jsonData);
-
-		instance.timeOfGame = json.readValue("timeOfGame", Float.class,
-				jsonData);
-		instance.cutMode = json.readValue("cutmode", Boolean.class, jsonData);
-//		VerbManager.defaultVerbs = json.readValue("defaultVerbs",
-//				HashMap.class, Verb.class, jsonData);
-		instance.timers = json.readValue("timers", Timers.class, jsonData);
-
-		instance.textManager = json.readValue("textmanager", TextManager.class,
-				jsonData);
-		instance.customProperties = json.readValue("customProperties",
-				HashMap.class, String.class, jsonData);
-
-		String actorId = json.readValue("dialogActor", String.class, jsonData);
-		String dialogId = json.readValue("currentDialog", String.class,
-				jsonData);
-
-		if (dialogId != null) {
-			SpriteActor actor = (SpriteActor) instance.getCurrentScene()
-					.getActor(actorId, false);
-			instance.currentDialog = actor.getDialog(dialogId);
-		}
-
-		instance.currentChapter = json.readValue("chapter", String.class,
-				jsonData);
-		I18N.loadChapter(EngineAssetManager.MODEL_DIR + instance.currentChapter);
-	}
+    // ********** SERIALIZATION **********
+
+    public void saveGameState() throws IOException {
+        // Only take screenshot for desktop. For iOs or Android is slow.
+        boolean takeScreenshot = Gdx.app.getType() == ApplicationType.Desktop;
+
+        serialization.saveGameState(GAMESTATE_FILENAME, takeScreenshot);
+    }
+
+    public void removeGameState(String filename) throws IOException {
+        EngineAssetManager.getInstance().getUserFile(filename).delete();
+        EngineAssetManager.getInstance().getUserFile(filename + ".png").delete();
+    }
+
+    /**
+     * Try to load the saved game if exists. In other case, load the model.
+     */
+    public void load() throws Exception {
+        if (EngineAssetManager.getInstance().getUserFile(GAMESTATE_FILENAME).exists()) {
+            // SAVEGAME EXISTS
+            try {
+                loadGameState();
+            } catch (Exception e) {
+                EngineLogger.error("ERROR LOADING SAVED GAME", e);
+                // Load the model if fails loading the saved game
+                serialization.loadChapter();
+            }
+        } else {
+            serialization.loadChapter();
+        }
+    }
+
+    public void loadChapter(String chapter, String scene, boolean test) throws Exception {
+        if (test)
+            this.testScene = scene;
+
+        serialization.loadChapter(chapter, scene, true);
+    }
+
+    public void setTestScene(String s) {
+        testScene = s;
+    }
+
+    /**
+     * Load the world description in 'world.json'.
+     */
+    public void loadWorldDesc() throws IOException {
+        serialization.loadWorldDesc();
+    }
+
+    public void saveWorldDesc(FileHandle file) throws IOException {
+        serialization.saveWorldDesc(file);
+    }
+
+    public boolean savedGameExists() {
+        return savedGameExists(GAMESTATE_FILENAME);
+    }
+
+    public boolean savedGameExists(String filename) {
+        return EngineAssetManager.getInstance().getUserFile(filename).exists()
+                || FileUtils.exists(EngineAssetManager.getInstance().getAsset("tests/" + filename));
+    }
+
+    public void loadGameState() throws IOException {
+        long initTime = System.currentTimeMillis();
+        loadGameState(GAMESTATE_FILENAME);
+        EngineLogger.debug("GAME STATE LOADING TIME (ms): " + (System.currentTimeMillis() - initTime));
+    }
+
+    public void loadGameState(String filename) throws IOException {
+        FileHandle savedFile;
+
+        if (EngineAssetManager.getInstance().getUserFile(filename).exists())
+            savedFile = EngineAssetManager.getInstance().getUserFile(filename);
+        else
+            savedFile = EngineAssetManager.getInstance().getAsset("tests/" + filename);
+
+        serialization.loadGameState(savedFile);
+
+        assetState = AssetState.LOAD_ASSETS;
+    }
+
+    public void takeScreenshot(String filename, int w) {
+
+        // get viewport
+        IntBuffer results = BufferUtils.newIntBuffer(16);
+        Gdx.gl20.glGetIntegerv(GL20.GL_VIEWPORT, results);
+
+        int h = (int) (w * getSceneCamera().viewportHeight / getSceneCamera().viewportWidth);
+
+        FrameBuffer fbo = new FrameBuffer(Format.RGB565, w, h, false);
+
+        fbo.begin();
+        Gdx.gl.glClearColor(0, 0, 0, 1);
+        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+        draw();
+
+        // TODO: Next line is deprecated, use Pixmap.createFromFrameBuffer();
+        Pixmap pixmap = ScreenUtils.getFrameBufferPixmap(0, 0, w, h);
+
+        // restore viewport
+        fbo.end(results.get(0), results.get(1), results.get(2), results.get(3));
+
+        PixmapIO.writePNG(EngineAssetManager.getInstance().getUserFile(filename), pixmap, Deflater.DEFAULT_COMPRESSION,
+                true);
+
+        fbo.dispose();
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/model/WorldListener.java b/blade-engine/src/com/bladecoder/engine/model/WorldListener.java
new file mode 100644
index 000000000..eb3c4b3df
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/model/WorldListener.java
@@ -0,0 +1,13 @@
+package com.bladecoder.engine.model;
+
+public interface WorldListener {
+    void cutMode(boolean value);
+
+    void text(Text t);
+
+    void dialogOptions();
+
+    void inventoryEnabled(boolean value);
+
+    void pause(boolean value);
+}
diff --git a/blade-engine/src/com/bladecoder/engine/pathfinder/AStarPathFinder.java b/blade-engine/src/com/bladecoder/engine/pathfinder/AStarPathFinder.java
index 54f5f8c37..d4e1466fb 100644
--- a/blade-engine/src/com/bladecoder/engine/pathfinder/AStarPathFinder.java
+++ b/blade-engine/src/com/bladecoder/engine/pathfinder/AStarPathFinder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
+ * Copyright 2011 See AUTHORS file.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-
 package com.bladecoder.engine.pathfinder;
 
 import com.badlogic.gdx.utils.BinaryHeap;
@@ -23,15 +22,15 @@
  * Original implementation by Kevin Glass from Slick2D.
  * </p>
  * @author hneuer */
-public class AStarPathFinder implements NavContext, PathFinder {
+public class AStarPathFinder<N extends NavNode<N>> implements NavContext<N>, PathFinder<N> {
 	/** The set of nodes that we do not yet consider fully searched */
 	private final BinaryHeap<AStarAlgoData> openList = new BinaryHeap<AStarAlgoData>();
 	/** The graph being searched */
-	private final NavGraph graph;
+	private final NavGraph<N> graph;
 	/** The maximum depth of search we're willing to accept before giving up */
 	private final int maxSearchDistance;
 	/** The heuristic we're applying to determine which nodes to search first */
-	private final AStarHeuristicCalculator heuristicCalculator;
+	private final AStarHeuristicCalculator<N> heuristicCalculator;
 
 	/** The mover going through the path */
 	private Object mover;
@@ -40,17 +39,17 @@ public class AStarPathFinder implements NavContext, PathFinder {
 	/** Unique ID for each search run. Used to mark nodes. */
 	private int checkedID;
 	/** The current source node in the context (part of the NavContext implementation) */
-	private NavNode sourceNodeInContext;
+	private N sourceNodeInContext;
 
 	/** Create a path finder with a specific heuristic. */
-	public AStarPathFinder (NavGraph graph, int maxSearchDistance, AStarHeuristicCalculator heuristic) {
+	public AStarPathFinder (NavGraph<N> graph, int maxSearchDistance, AStarHeuristicCalculator<N> heuristic) {
 		this.heuristicCalculator = heuristic;
 		this.graph = graph;
 		this.maxSearchDistance = maxSearchDistance;
 	}
 
 	@Override
-	public boolean findPath (Object mover, NavNode startNode, NavNode targetNode, NavPath out) {
+	public boolean findPath (Object mover, N startNode, N targetNode, NavPath<N> out) {
 		this.mover = mover;
 		distance = 0;
 
@@ -60,7 +59,7 @@ public boolean findPath (Object mover, NavNode startNode, NavNode targetNode, Na
 		if (checkedID < 0) checkedID = 1;
 
 		BinaryHeap<AStarAlgoData> openList = this.openList;
-		AStarHeuristicCalculator heuristicCalculator = this.heuristicCalculator;
+		AStarHeuristicCalculator<N> heuristicCalculator = this.heuristicCalculator;
 		int maxSearchDistance = this.maxSearchDistance;
 
 		openList.clear();
@@ -79,7 +78,7 @@ public boolean findPath (Object mover, NavNode startNode, NavNode targetNode, Na
 			if (currentData.node == targetNode && lastData != null && !isBlocked(lastData.node, targetNode)) break;
 
 			float currentCost = currentData.cost;
-			for (NavNode neighborNode : currentData.node.neighbors) {
+			for (N neighborNode : currentData.node.neighbors) {
 				AStarAlgoData neighborData = getAlgoData(neighborNode);
 				if (!isBlocked(currentData.node, neighborNode)) {
 					sourceNodeInContext = startNode;
@@ -110,7 +109,8 @@ public boolean findPath (Object mover, NavNode startNode, NavNode targetNode, Na
 
 	/** Get the AStar data from the given node and reset it if it has not been used in this run. If it does not exist at all (node
 	 * is reached the first time in the very first run) create a new one. */
-	private AStarAlgoData getAlgoData (NavNode node) {
+	private AStarAlgoData getAlgoData (N node) {
+		@SuppressWarnings("unchecked")
 		AStarAlgoData ad = (AStarAlgoData)node.algoData;
 		if (node.algoData == null) {
 			ad = new AStarAlgoData(node);
@@ -125,7 +125,7 @@ private AStarAlgoData getAlgoData (NavNode node) {
 	}
 
 	/** Ask the graph if the way from start to target node is blocked. */
-	private boolean isBlocked (NavNode startNode, NavNode targetNode) {
+	private boolean isBlocked (N startNode, N targetNode) {
 		sourceNodeInContext = startNode;
 		return graph.blocked(this, targetNode);
 	}
@@ -146,19 +146,19 @@ public float getSearchDistance () {
 	}
 
 	@Override
-	public NavNode getSourceNode () {
+	public N getSourceNode () {
 		return sourceNodeInContext;
 	}
 
 	/** The description of a class providing a cost for a given tile based on a target location and entity being moved. This
 	 * heuristic controls what priority is placed on different tiles during the search for a path */
-	public interface AStarHeuristicCalculator<N extends NavNode> {
+	public interface AStarHeuristicCalculator<N extends NavNode<N>> {
 		public float getCost (NavContext<N> map, Object mover, N startNode, N targetNode);
 	}
 
 	class AStarAlgoData extends BinaryHeap.Node {
 		/** Backlink to the node. */
-		final NavNode node;
+		final N node;
 		/** Heuristic from this node to the target. */
 		float heuristic;
 		/** Search depth to reach this node. */
@@ -172,7 +172,7 @@ class AStarAlgoData extends BinaryHeap.Node {
 		/** In the closed list */
 		boolean closed;
 
-		public AStarAlgoData (NavNode node) {
+		public AStarAlgoData (N node) {
 			super(0);
 			this.node = node;
 		}
diff --git a/blade-engine/src/com/bladecoder/engine/pathfinder/NavContext.java b/blade-engine/src/com/bladecoder/engine/pathfinder/NavContext.java
index 37d5c82a5..ba116bec0 100644
--- a/blade-engine/src/com/bladecoder/engine/pathfinder/NavContext.java
+++ b/blade-engine/src/com/bladecoder/engine/pathfinder/NavContext.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
+ * Copyright 2011 See AUTHORS file.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
  * Original implementation by Kevin Glass from Slick2D.
  * </p>
  * @author hneuer */
-public interface NavContext<N extends NavNode> {
+public interface NavContext<N extends NavNode<N>> {
 	/** Get the object being moved along the path if any */
 	public Object getMover ();
 
diff --git a/blade-engine/src/com/bladecoder/engine/pathfinder/NavGraph.java b/blade-engine/src/com/bladecoder/engine/pathfinder/NavGraph.java
index 29bfba52a..59cabdf35 100644
--- a/blade-engine/src/com/bladecoder/engine/pathfinder/NavGraph.java
+++ b/blade-engine/src/com/bladecoder/engine/pathfinder/NavGraph.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
+ * Copyright 2011 See AUTHORS file.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
  * Original implementation by Kevin Glass from Slick2D.
  * </p>
  * @author hneuer */
-public interface NavGraph<N extends NavNode> {
+public interface NavGraph<N extends NavNode<N>> {
 	/** Check if the given location is blocked, i.e. blocks movement of the supplied mover. */
 	public boolean blocked (NavContext<N> context, N targetNode);
 
diff --git a/blade-engine/src/com/bladecoder/engine/pathfinder/NavNode.java b/blade-engine/src/com/bladecoder/engine/pathfinder/NavNode.java
index cd1951be6..52b79e90a 100644
--- a/blade-engine/src/com/bladecoder/engine/pathfinder/NavNode.java
+++ b/blade-engine/src/com/bladecoder/engine/pathfinder/NavNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
+ * Copyright 2011 See AUTHORS file.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,14 @@
 
 import com.badlogic.gdx.utils.Array;
 
-/** A single node in the navigation graph.
+/** A single node in the navigation graph. It contains an array of neighbor nodes, that way it is possible to build up arbitrary
+ * navigation graphs, e.g. a tiled map with no diagonal movement may contain up to 4 neighbors for each node.
  * @author hneuer */
-public class NavNode {
+public class NavNode<N extends NavNode<?>> {
 	/** The parent of this node, how we reached it in the search */
-	public NavNode parent;
+	public N parent;
 	/** The list of all adjacent neighbor nodes. */
-	public final Array<NavNode> neighbors = new Array<NavNode>();
+	public final Array<N> neighbors = new Array<N>();
 	/** Algorithm specific data. */
 	protected Object algoData;
 }
diff --git a/blade-engine/src/com/bladecoder/engine/pathfinder/NavPath.java b/blade-engine/src/com/bladecoder/engine/pathfinder/NavPath.java
index 416b2097f..d6e111c45 100644
--- a/blade-engine/src/com/bladecoder/engine/pathfinder/NavPath.java
+++ b/blade-engine/src/com/bladecoder/engine/pathfinder/NavPath.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
+ * Copyright 2011 See AUTHORS file.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
 /** A navigation path.
  * @author hneuer */
-public interface NavPath<N extends NavNode> {
+public interface NavPath<N extends NavNode<N>> {
 	/** Fills the navigation path between the start and target node.
 	 * <p>
 	 * Note that current implementations have to follow the path backward from the targetNode to the startNode (following the
diff --git a/blade-engine/src/com/bladecoder/engine/pathfinder/PathFinder.java b/blade-engine/src/com/bladecoder/engine/pathfinder/PathFinder.java
index 63def8ff1..876bd6065 100644
--- a/blade-engine/src/com/bladecoder/engine/pathfinder/PathFinder.java
+++ b/blade-engine/src/com/bladecoder/engine/pathfinder/PathFinder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
+ * Copyright 2011 See AUTHORS file.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
  * Original implementation by Kevin Glass from Slick2D.
  * </p>
  * @author hneuer */
-public interface PathFinder {
+public interface PathFinder<N extends NavNode<N>> {
 	/** Find a path from the start node to the target node avoiding blockages and attempting to honor costs provided by the graph.
 	 * 
 	 * @param mover The entity that will be moving along the path. This provides a place to pass context information about the game
@@ -32,5 +32,5 @@ public interface PathFinder {
 	 * @param targetNode the target node
 	 * @param out out-parameter for the navigation path. Will only be filled if a path is found, otherwise it won't get touched.
 	 * @return True if a path was found. */
-	public boolean findPath (Object mover, NavNode startNode, NavNode targetNode, NavPath out);
+	public boolean findPath (Object mover, N startNode, N targetNode, NavPath<N> out);
 }
diff --git a/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/Distance.java b/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/Distance.java
new file mode 100644
index 000000000..8776bba39
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/Distance.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+package com.bladecoder.engine.polygonalpathfinder;
+
+import com.bladecoder.engine.pathfinder.AStarPathFinder.AStarHeuristicCalculator;
+import com.bladecoder.engine.pathfinder.NavContext;
+
+/** 
+ * Implementation of a heuristic calculator for a polygonal map. It simply calculates the distance between two points.
+ * 
+ * @author rgarcia
+ */
+public class Distance implements AStarHeuristicCalculator<NavNodePolygonal> {
+	@Override
+	public float getCost (NavContext<NavNodePolygonal> map, Object mover, NavNodePolygonal startNode, NavNodePolygonal targetNode) {
+		float sx = startNode.getX();
+		float sy = startNode.getY();
+
+		float tx = targetNode.getX();
+		float ty = targetNode.getY();
+		
+		float a = sx - tx;
+		float b = sy - ty;
+		
+		return (float)Math.sqrt(a * a + b * b);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/ManhattanDistance.java b/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/ManhattanDistance.java
index b41181123..750cdfe14 100644
--- a/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/ManhattanDistance.java
+++ b/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/ManhattanDistance.java
@@ -16,8 +16,8 @@
 
 package com.bladecoder.engine.polygonalpathfinder;
 
-import com.bladecoder.engine.pathfinder.NavContext;
 import com.bladecoder.engine.pathfinder.AStarPathFinder.AStarHeuristicCalculator;
+import com.bladecoder.engine.pathfinder.NavContext;
 
 /** 
  * Implementation of a heuristic calculator for a polygonal map. It simply calculates the Manhattan distance between two points.
diff --git a/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/NavNodePolygonal.java b/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/NavNodePolygonal.java
index 051dc7f13..f11a4b919 100644
--- a/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/NavNodePolygonal.java
+++ b/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/NavNodePolygonal.java
@@ -23,7 +23,7 @@
  * 
  * @author rgarcia 
  */
-public class NavNodePolygonal extends NavNode {
+public class NavNodePolygonal extends NavNode<NavNodePolygonal> {
 	public float x;
 	public float y;
 	
diff --git a/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/PolygonalNavGraph.java b/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/PolygonalNavGraph.java
index 6bf432f15..dfc2aa112 100644
--- a/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/PolygonalNavGraph.java
+++ b/blade-engine/src/com/bladecoder/engine/polygonalpathfinder/PolygonalNavGraph.java
@@ -16,13 +16,12 @@
 package com.bladecoder.engine.polygonalpathfinder;
 
 import java.util.ArrayList;
+import java.util.Collection;
 
 import com.badlogic.gdx.math.Polygon;
 import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.utils.Json;
-import com.badlogic.gdx.utils.Json.Serializable;
-import com.badlogic.gdx.utils.JsonValue;
-import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.ObstacleActor;
 import com.bladecoder.engine.pathfinder.AStarPathFinder;
 import com.bladecoder.engine.pathfinder.NavContext;
 import com.bladecoder.engine.pathfinder.NavGraph;
@@ -36,23 +35,24 @@
  * 
  * @author rgarcia
  */
-public class PolygonalNavGraph implements NavGraph<NavNodePolygonal>, Serializable{
+public class PolygonalNavGraph implements NavGraph<NavNodePolygonal> {
+	private static final int MAX_PATHFINDER_SEARCH_DISTANCE = 50;
+
 	private static final Vector2 tmp = new Vector2();
 	private static final Vector2 tmp2 = new Vector2();
 
 	private Polygon walkZone;
-	private ArrayList<Polygon> obstacles = new ArrayList<Polygon>();
-	private ArrayList<Polygon> dinamicObstacles = new ArrayList<Polygon>();
+	private final ArrayList<Polygon> obstacles = new ArrayList<>();
+
+	final private PathFinder<NavNodePolygonal> pathfinder = new AStarPathFinder<>(this,
+			MAX_PATHFINDER_SEARCH_DISTANCE, new ManhattanDistance());
 
-	final private PathFinder pathfinder = new AStarPathFinder(this, 100,
-			new ManhattanDistance());
-	final private NavPathPolygonal resultPath = new NavPathPolygonal();
 	final private NavNodePolygonal startNode = new NavNodePolygonal();
 	final private NavNodePolygonal targetNode = new NavNodePolygonal();
-	final private ArrayList<NavNodePolygonal> graphNodes = new ArrayList<NavNodePolygonal>();
+	final private ArrayList<NavNodePolygonal> graphNodes = new ArrayList<>();
 
 	public ArrayList<Vector2> findPath(float sx, float sy, float tx, float ty) {
-		resultPath.clear();
+		final NavPathPolygonal resultPath = new NavPathPolygonal();
 
 		Vector2 source = new Vector2(sx, sy);
 		Vector2 target = new Vector2(tx, ty);
@@ -62,27 +62,40 @@ public ArrayList<Vector2> findPath(float sx, float sy, float tx, float ty) {
 		// back inside.
 		if (!PolygonUtils.isPointInside(walkZone, sx, sy, true)) {
 			EngineLogger.debug("PolygonalPathFinder: Source not in polygon!");
-			return resultPath.getPath();
+
+			PolygonUtils.getClampedPoint(walkZone, sx, sy, source);
+
+			if (!PolygonUtils.isPointInside(walkZone, source.x, source.y, true)) {
+				EngineLogger.debug("PolygonalPathFinder: CLAMPED FAILED!!");
+
+				return resultPath.getPath();
+			}
+
 		}
 
 		if (!PolygonUtils.isPointInside(walkZone, tx, ty, true)) {
 			PolygonUtils.getClampedPoint(walkZone, tx, ty, target);
 
-//			if (!PolygonUtils.isPointInside(walkZone, target.x, target.y, true)) {
-//				EngineLogger.debug("PolygonalPathFinder: CLAMPED FAILED!!");
-//				return resultPath.getPath();
-//			}
-		}
-		
-		for (Polygon o : obstacles) {
-			if (PolygonUtils.isPointInside(o, target.x, target.y, false)) {
-				PolygonUtils.getClampedPoint(o, target.x, target.y, target);
+			if (!PolygonUtils.isPointInside(walkZone, target.x, target.y, true)) {
+				EngineLogger.debug("PolygonalPathFinder: CLAMPED FAILED!!");
+
+				return resultPath.getPath();
 			}
 		}
-		
-		for (Polygon o : dinamicObstacles) {
+
+		for (Polygon o : obstacles) {
 			if (PolygonUtils.isPointInside(o, target.x, target.y, false)) {
 				PolygonUtils.getClampedPoint(o, target.x, target.y, target);
+
+				// If the clamped point is not in the walkzone
+				// we search for the first vertex inside
+				if (!PolygonUtils.isPointInside(walkZone, target.x, target.y, true)) {
+					getFirstVertexInsideWalkzone(o, target);
+					// We exit after processing the first polygon with the point
+					// inside.
+					// Overlaped obstacles are not supported
+					break;
+				}
 			}
 		}
 
@@ -109,9 +122,35 @@ public ArrayList<Vector2> findPath(float sx, float sy, float tx, float ty) {
 		return resultPath.getPath();
 	}
 
-	public void createInitialGraph() {
+	/**
+	 * Search the first polygon vertex inside the walkzone.
+	 * 
+	 * @param p      the polygon
+	 * @param target the vertex found
+	 */
+	private void getFirstVertexInsideWalkzone(Polygon p, Vector2 target) {
+		float verts[] = p.getTransformedVertices();
+
+		for (int i = 0; i < verts.length; i += 2) {
+			if (PolygonUtils.isPointInside(walkZone, verts[i], verts[i + 1], true)) {
+				target.x = verts[i];
+				target.y = verts[i + 1];
+
+				return;
+			}
+		}
+	}
+
+	public void createInitialGraph(BaseActor wz, Collection<BaseActor> actors) {
 		graphNodes.clear();
 
+		if (wz == null) {
+			walkZone = null;
+			return;
+		}
+
+		walkZone = wz.getBBox();
+
 		// 1.- Add WalkZone convex nodes
 		float verts[] = walkZone.getTransformedVertices();
 
@@ -121,16 +160,21 @@ public void createInitialGraph() {
 			}
 		}
 
-		// 2.- Add obstacle concave nodes
+		// 2.- Add obstacles concave nodes
+		obstacles.clear();
+
+		for (BaseActor a : actors) {
+			if (a instanceof ObstacleActor && a.isVisible())
+				obstacles.add(a.getBBox());
+		}
+
 		for (Polygon o : obstacles) {
 			verts = o.getTransformedVertices();
 
 			for (int i = 0; i < verts.length; i += 2) {
 				if (PolygonUtils.isVertexConcave(o, i)
-						&& PolygonUtils.isPointInside(walkZone, verts[i],
-								verts[i + 1], false)) {
-					graphNodes
-							.add(new NavNodePolygonal(verts[i], verts[i + 1]));
+						&& PolygonUtils.isPointInside(walkZone, verts[i], verts[i + 1], false)) {
+					graphNodes.add(new NavNodePolygonal(verts[i], verts[i + 1]));
 				}
 			}
 		}
@@ -148,10 +192,6 @@ public void createInitialGraph() {
 				}
 			}
 		}
-		
-		// 4.- ADD DINAMIC OBSTACLES
-		for(Polygon p:dinamicObstacles)
-			addObstacleToGrapth(p);
 	}
 
 	private boolean inLineOfSight(float p1X, float p1Y, float p2X, float p2Y) {
@@ -168,12 +208,6 @@ private boolean inLineOfSight(float p1X, float p1Y, float p2X, float p2Y) {
 				return false;
 			}
 		}
-		
-		for (Polygon o : dinamicObstacles) {
-			if (!PolygonUtils.inLineOfSight(tmp, tmp2, o, true)) {
-				return false;
-			}
-		}
 
 		return true;
 	}
@@ -209,38 +243,27 @@ public void setWalkZone(Polygon walkZone) {
 		this.walkZone = walkZone;
 	}
 
-	public void addObstacle(Polygon obstacle) {
-		obstacles.add(obstacle);
-	}
-
-	public ArrayList<Polygon> getObstacles() {
-		return obstacles;
-	}
-	
 	public ArrayList<NavNodePolygonal> getGraphNodes() {
 		return graphNodes;
 	}
 
 	@Override
-	public boolean blocked(NavContext<NavNodePolygonal> context,
-			NavNodePolygonal targetNode) {
+	public boolean blocked(NavContext<NavNodePolygonal> context, NavNodePolygonal targetNode) {
 		return false;
 	}
 
 	@Override
-	public float getCost(NavContext<NavNodePolygonal> context,
-			NavNodePolygonal targetNode) {
+	public float getCost(NavContext<NavNodePolygonal> context, NavNodePolygonal targetNode) {
 		return 1;
 	}
-	
+
 	private void addObstacleToGrapth(Polygon poly) {
 		float verts[] = poly.getTransformedVertices();
 		for (int i = 0; i < verts.length; i += 2) {
 			if (PolygonUtils.isVertexConcave(poly, i)
-					&& PolygonUtils.isPointInside(walkZone, verts[i],
-							verts[i + 1], false)) {
+					&& PolygonUtils.isPointInside(walkZone, verts[i], verts[i + 1], false)) {
 				NavNodePolygonal n1 = new NavNodePolygonal(verts[i], verts[i + 1]);
-				
+
 				for (int j = 0; j < graphNodes.size(); j++) {
 					NavNodePolygonal n2 = graphNodes.get(j);
 
@@ -249,78 +272,50 @@ private void addObstacleToGrapth(Polygon poly) {
 						n2.neighbors.add(n1);
 					}
 				}
-				
+
 				graphNodes.add(n1);
 			}
-		}		
+		}
 	}
 
 	public void addDinamicObstacle(Polygon poly) {
-		dinamicObstacles.add(poly);
 
-		addObstacleToGrapth(poly);
+		int idx = obstacles.indexOf(poly);
+
+		// CHECK TO AVOID ADDING THE ACTOR SEVERAL TIMES
+		if (idx == -1 && walkZone != null) {
+			obstacles.add(poly);
+			addObstacleToGrapth(poly);
+		}
 	}
-	
-	public void removeDinamicObstacle(Polygon poly) {
+
+	public boolean removeDinamicObstacle(Polygon poly) {
+		boolean exists = obstacles.remove(poly);
+
+		if (!exists)
+			return false;
+
 		float verts[] = poly.getTransformedVertices();
-		dinamicObstacles.remove(poly);
 
 		for (int i = 0; i < verts.length; i += 2) {
 			if (PolygonUtils.isVertexConcave(poly, i)
-					&& PolygonUtils.isPointInside(walkZone, verts[i],
-							verts[i + 1], false)) {
+					&& PolygonUtils.isPointInside(walkZone, verts[i], verts[i + 1], false)) {
 				for (int j = 0; j < graphNodes.size(); j++) {
 					NavNodePolygonal n = graphNodes.get(j);
 
-					if (n.x == verts[i] && n.y == verts[i+1]) {
+					if (n.x == verts[i] && n.y == verts[i + 1]) {
 						graphNodes.remove(n);
 						j--;
-						
-						for(NavNodePolygonal n2:graphNodes) {
+
+						for (NavNodePolygonal n2 : graphNodes) {
 							n2.neighbors.removeValue(n, true);
 						}
-						
+
 					}
 				}
 			}
 		}
-	}
-	
-	@Override
-	public void write(Json json) {
-		Polygon p = new Polygon(walkZone.getVertices());
-		p.setPosition(walkZone.getX()/walkZone.getScaleX(), walkZone.getY()/walkZone.getScaleY());
-		json.writeValue("walkZone", p);
-		
-		ArrayList<Polygon> tmp = new ArrayList<Polygon>();
-		
-		for(Polygon poly:obstacles) {
-			// To SAVE space not writing worldVertices
-			p = new Polygon(poly.getVertices());
-			p.setPosition(poly.getX()/poly.getScaleX(), poly.getY()/poly.getScaleY());
-			tmp.add(p);
-		}
-		
-		json.writeValue("obstacles", tmp, ArrayList.class, Polygon.class);
-	}
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public void read(Json json, JsonValue jsonData) {
-		float worldScale = EngineAssetManager.getInstance().getScale();
-		
-		walkZone = json.readValue("walkZone", Polygon.class, jsonData);
-		walkZone.setScale(worldScale, worldScale);
-		walkZone.setPosition(walkZone.getX() * worldScale , 
-				walkZone.getY() * worldScale);
-		
-		obstacles = json.readValue("obstacles", ArrayList.class, Polygon.class,
-				jsonData);
-		
-		for(Polygon poly:obstacles) {
-			poly.setScale(worldScale, worldScale);
-			poly.setPosition(poly.getX() * worldScale , 
-					poly.getY() * worldScale);
-		}
+		return true;
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/serialization/ActionCallbackSerializer.java b/blade-engine/src/com/bladecoder/engine/serialization/ActionCallbackSerializer.java
new file mode 100644
index 000000000..fe4aa079f
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/serialization/ActionCallbackSerializer.java
@@ -0,0 +1,343 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.serialization;
+
+import java.util.HashMap;
+
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.ActionCallback;
+import com.bladecoder.engine.ink.InkVerbRunner;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Inventory;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.UIActors;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+
+/**
+ * 
+ * Helper class to serialize ActionCallbacks. An ActionCallback is an Action or
+ * a Verb.
+ * 
+ * This class can generate an String from an ActionCallback to save to a file
+ * and then locate the ActionCallback based in the generated String.
+ * 
+ * The String generated to locate an ActionCallback is like:
+ * 
+ * For verbs: actorId#verbId For actions: actorId#verbId#actionPos
+ * 
+ * If actorId == "DEFAULT_VERB" the ActionCallback is searched in the World
+ * default verbs. If actorId == current scene ID the ActionCallback is searched
+ * in the current scene verbs.
+ * 
+ * @author rgarcia
+ */
+public class ActionCallbackSerializer {
+
+	private static final String SEPARATION_SYMBOL = "#";
+	private static final String INK_MANAGER_TAG = "INK_MANAGER";
+	private static final String UIACTORS_TAG = "UIACTORS";
+	private static final String INVENTORY_TAG = "INVENTORY";
+	private static final String DEFAULT_VERB_TAG = "DEFAULT_VERB";
+
+	private static String serialize(ActionCallback cb, Verb v) {
+		String id = v.getHashKey();
+
+		if (cb == v)
+			return id;
+
+		int pos = 0;
+
+		for (Action a : v.getActions()) {
+			if (cb == a) {
+				StringBuilder stringBuilder = new StringBuilder(id);
+				stringBuilder.append(SEPARATION_SYMBOL).append(pos);
+
+				return stringBuilder.toString();
+			}
+
+			pos++;
+		}
+
+		return null;
+	}
+
+	private static String serialize(ActionCallback cb, InteractiveActor a) {
+		if (a == null)
+			return null;
+
+		String id = a.getId();
+
+		for (Verb v : a.getVerbManager().getVerbs().values()) {
+			String result = serialize(cb, v);
+
+			if (result != null) {
+				StringBuilder stringBuilder = new StringBuilder(id);
+				stringBuilder.append(SEPARATION_SYMBOL).append(result);
+
+				return stringBuilder.toString();
+			}
+		}
+
+		return null;
+	}
+
+	private static String serialize(ActionCallback cb, Scene s) {
+		if (s == null)
+			return null;
+
+		String id = s.getId();
+
+		for (Verb v : s.getVerbManager().getVerbs().values()) {
+			String result = serialize(cb, v);
+
+			if (result != null) {
+				StringBuilder stringBuilder = new StringBuilder(id);
+				stringBuilder.append(SEPARATION_SYMBOL).append(result);
+
+				return stringBuilder.toString();
+			}
+		}
+
+		return null;
+	}
+
+	private static String serialize(ActionCallback cb, HashMap<String, InkVerbRunner> runners) {
+		for (InkVerbRunner im : runners.values()) {
+
+			if (im == null)
+				return null;
+
+			if (cb instanceof InkVerbRunner) {
+				if (cb == im) {
+					StringBuilder stringBuilder = new StringBuilder(INK_MANAGER_TAG);
+					stringBuilder.append(SEPARATION_SYMBOL).append(im.getFlow());
+
+					return stringBuilder.toString();
+				} else {
+					continue;
+				}
+			}
+
+			int pos = 0;
+
+			for (Action a : im.getActions()) {
+				if (cb == a) {
+					StringBuilder stringBuilder = new StringBuilder(INK_MANAGER_TAG);
+					stringBuilder.append(SEPARATION_SYMBOL).append(im.getFlow()).append(SEPARATION_SYMBOL).append(pos);
+
+					return stringBuilder.toString();
+				}
+
+				pos++;
+			}
+		}
+
+		return null;
+	}
+
+	private static String serialize(ActionCallback cb, UIActors uia) {
+		if (uia == null)
+			return null;
+
+		for (InteractiveActor a : uia.getActors()) {
+			String id = serialize(cb, a);
+
+			if (id != null) {
+				StringBuilder stringBuilder = new StringBuilder(UIACTORS_TAG);
+				stringBuilder.append(SEPARATION_SYMBOL).append(id);
+
+				return stringBuilder.toString();
+			}
+		}
+
+		return null;
+	}
+
+	private static String serialize(ActionCallback cb, Inventory inv) {
+		for (int i = 0; i < inv.getNumItems(); i++) {
+			InteractiveActor a = inv.get(i);
+			String id = serialize(cb, a);
+
+			if (id != null) {
+				StringBuilder stringBuilder = new StringBuilder(INVENTORY_TAG);
+				stringBuilder.append(SEPARATION_SYMBOL).append(id);
+
+				return stringBuilder.toString();
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Generates a String for serialization that allows locate the ActionCallback
+	 * 
+	 * @param cb The ActionCallback to serialize
+	 * @return The generated location string
+	 */
+	public static String serialize(World w, Scene s, ActionCallback cb) {
+		String id = null;
+
+		if (cb == null)
+			return null;
+
+		// search in UIActors
+		id = serialize(cb, w.getUIActors());
+
+		if (id != null)
+			return id;
+
+		// search in inventory
+		id = serialize(cb, w.getInventory());
+
+		if (id != null)
+			return id;
+
+		// search in inkManager actions
+		if (w.getInkManager() != null) {
+			id = serialize(cb, w.getInkManager().getVerbRunners());
+		}
+
+		if (id != null)
+			return id;
+
+		// search in scene verbs
+		id = serialize(cb, s);
+
+		if (id != null)
+			return id;
+
+		// search in player
+		id = serialize(cb, s.getPlayer());
+		if (id != null)
+			return id;
+
+		// search in actors
+		for (BaseActor a : s.getActors().values()) {
+			if (!(a instanceof InteractiveActor))
+				continue;
+
+			id = serialize(cb, (InteractiveActor) a);
+			if (id != null)
+				return id;
+		}
+
+		// search in worldVerbs
+		for (Verb v : w.getVerbManager().getVerbs().values()) {
+			id = serialize(cb, v);
+			if (id != null) {
+				StringBuilder stringBuilder = new StringBuilder(DEFAULT_VERB_TAG);
+				stringBuilder.append(SEPARATION_SYMBOL).append(id);
+
+				return stringBuilder.toString();
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Searches for the ActionCallback represented by the id string.
+	 * 
+	 * @param sCb
+	 */
+	public static ActionCallback find(World w, Scene s, String sCb) {
+
+		if (sCb == null)
+			return null;
+
+		String[] split = sCb.split(SEPARATION_SYMBOL);
+
+		if (sCb.startsWith(INK_MANAGER_TAG)) {
+			if (split.length == 1) // FOR BACKWARDS COMPATIBILITY
+				return w.getInkManager().getDefaultVerbRunner();
+
+			if (split.length == 2)
+				return w.getInkManager().getVerbRunners().get(split[1]);
+
+			int actionPos = Integer.parseInt(split[2]);
+			Action action = w.getInkManager().getVerbRunners().get(split[1]).getActions().get(actionPos);
+
+			if (action instanceof ActionCallback)
+				return (ActionCallback) action;
+		}
+
+		if (split.length < 2)
+			return null;
+
+		String actorId;
+		String verbId;
+		int actionPos = -1;
+
+		if (sCb.startsWith(UIACTORS_TAG) || sCb.startsWith(INVENTORY_TAG)) {
+
+			actorId = split[1];
+			verbId = split[2];
+
+			if (split.length > 3)
+				actionPos = Integer.parseInt(split[3]);
+		} else {
+			actorId = split[0];
+			verbId = split[1];
+
+			if (split.length > 2)
+				actionPos = Integer.parseInt(split[2]);
+		}
+
+		Verb v = null;
+
+		if (actorId.equals(DEFAULT_VERB_TAG)) {
+			v = w.getVerbManager().getVerb(verbId, null, null);
+		} else {
+
+			InteractiveActor a;
+
+			if (actorId.equals(s.getId())) {
+				v = s.getVerbManager().getVerbs().get(verbId);
+			} else {
+				a = (InteractiveActor) s.getActor(actorId, true);
+
+				if (a == null) {
+					EngineLogger.error("ActionCallbackSerialization - Actor not found: " + actorId + " cb: " + sCb);
+					return null;
+				}
+
+				v = a.getVerbManager().getVerbs().get(verbId);
+			}
+		}
+
+		if (v == null) {
+			EngineLogger.error("ActionCallbackSerialization - Verb not found: " + verbId + " cb: " + sCb);
+
+			return null;
+		}
+
+		if (actionPos == -1)
+			return v;
+
+		Action action = v.getActions().get(actionPos);
+
+		if (action instanceof ActionCallback)
+			return (ActionCallback) action;
+
+		EngineLogger.error("ActionCallbackSerialization - CB not found: " + sCb);
+
+		return null;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/serialization/BladeJson.java b/blade-engine/src/com/bladecoder/engine/serialization/BladeJson.java
new file mode 100644
index 000000000..8b6c09dbb
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/serialization/BladeJson.java
@@ -0,0 +1,93 @@
+package com.bladecoder.engine.serialization;
+
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.ObjectMap;
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.ActionFactory;
+import com.bladecoder.engine.anim.AtlasAnimationDesc;
+import com.bladecoder.engine.anim.SpineAnimationDesc;
+import com.bladecoder.engine.model.*;
+
+/**
+ * The libgdx Json object with the World instance, the serialization mode and
+ * the ActionCallback + World serializers added.
+ *
+ * @author rgarcia
+ */
+public class BladeJson extends Json {
+    public enum Mode {
+        MODEL, STATE
+    }
+
+    ;
+
+    private final World w;
+    private final Mode mode;
+    private boolean init;
+
+    // the scene being saved
+    private Scene scene;
+
+    public BladeJson(World w, Mode mode, boolean init) {
+        super();
+
+        this.w = w;
+        this.mode = mode;
+        this.init = init;
+
+        // Add tags for known classes to reduce .json size.
+        addClassTag(SpineAnimationDesc.class);
+        addClassTag(AtlasAnimationDesc.class);
+
+        addClassTag(CharacterActor.class);
+        addClassTag(AnchorActor.class);
+        addClassTag(ObstacleActor.class);
+        addClassTag(InteractiveActor.class);
+        addClassTag(SpriteActor.class);
+        addClassTag(WalkZoneActor.class);
+
+        addClassTag(AtlasRenderer.class);
+        addClassTag(ImageRenderer.class);
+        addClassTag(ParticleRenderer.class);
+        addClassTag(TextRenderer.class);
+
+        ObjectMap<String, Class<? extends Action>> classTags = ActionFactory.getClassTags();
+
+        for (ObjectMap.Entry<String, Class<? extends Action>> e : classTags.entries()) {
+            addClassTag(e.key, e.value);
+        }
+
+    }
+
+    public BladeJson(World w, Mode mode) {
+        this(w, mode, true);
+    }
+
+    public World getWorld() {
+        return w;
+    }
+
+    public Mode getMode() {
+        return mode;
+    }
+
+    public boolean getInit() {
+        return init;
+    }
+
+    public void setInit(boolean init) {
+        this.init = init;
+    }
+
+    public Scene getScene() {
+        return scene == null ? w.getCurrentScene() : scene;
+    }
+
+    public void setScene(Scene scene) {
+        this.scene = scene;
+    }
+
+    public void addClassTag(Class<?> tag) {
+        addClassTag(tag.getSimpleName(), tag);
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/serialization/WorldSerialization.java b/blade-engine/src/com/bladecoder/engine/serialization/WorldSerialization.java
new file mode 100644
index 000000000..5e935737c
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/serialization/WorldSerialization.java
@@ -0,0 +1,600 @@
+package com.bladecoder.engine.serialization;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.Json.Serializable;
+import com.badlogic.gdx.utils.JsonReader;
+import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.JsonWriter.OutputType;
+import com.badlogic.gdx.utils.reflect.ReflectionException;
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.ActionFactory;
+import com.bladecoder.engine.actions.PlaySoundAction;
+import com.bladecoder.engine.actions.SoundAction;
+import com.bladecoder.engine.anim.AnimationDesc;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Inventory;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SoundDesc;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.model.World.WorldProperties;
+import com.bladecoder.engine.serialization.BladeJson.Mode;
+import com.bladecoder.engine.util.ActionUtils;
+import com.bladecoder.engine.util.Config;
+import com.bladecoder.engine.util.EngineLogger;
+
+@SuppressWarnings("deprecation")
+public class WorldSerialization implements Serializable {
+	public static final String GAMESTATE_EXT = ".gamestate.v14";
+
+	private static final int SCREENSHOT_DEFAULT_WIDTH = 300;
+
+	private final World w;
+
+	public WorldSerialization(World w) {
+		this.w = w;
+	}
+
+	/**
+	 * Load the world description in 'world.json'.
+	 * 
+	 * @throws IOException
+	 */
+	public void loadWorldDesc() throws IOException {
+
+		String worldFilename = EngineAssetManager.WORLD_FILENAME;
+
+		if (!EngineAssetManager.getInstance().getModelFile(worldFilename).exists()) {
+
+			// Search the world file with ".json" ext if not found.
+			worldFilename = EngineAssetManager.WORLD_FILENAME + ".json";
+
+			if (!EngineAssetManager.getInstance().getModelFile(worldFilename).exists()) {
+				EngineLogger.error("ERROR LOADING WORLD: world file not found.");
+				w.dispose();
+				throw new IOException("ERROR LOADING WORLD: world file not found.");
+			}
+		}
+
+		JsonValue root = new JsonReader()
+				.parse(EngineAssetManager.getInstance().getModelFile(worldFilename).reader("UTF-8"));
+
+		Json json = new BladeJson(w, Mode.MODEL);
+		json.setIgnoreUnknownFields(true);
+
+		int width = json.readValue("width", Integer.class, root);
+		int height = json.readValue("height", Integer.class, root);
+
+		// We know the world width, so we can set the scale
+		EngineAssetManager.getInstance().setScale(width, height);
+		float scale = EngineAssetManager.getInstance().getScale();
+
+		w.setWidth((int) (width * scale));
+		w.setHeight((int) (height * scale));
+		w.setInitChapter(json.readValue("initChapter", String.class, root));
+		w.getVerbManager().read(json, root);
+		w.getI18N().loadWorld(EngineAssetManager.MODEL_DIR + EngineAssetManager.WORLD_FILENAME);
+	}
+
+	public void saveWorldDesc(FileHandle file) throws IOException {
+
+		float scale = EngineAssetManager.getInstance().getScale();
+
+		Json json = new BladeJson(w, Mode.MODEL);
+		json.setOutputType(OutputType.javascript);
+
+		json.setWriter(new StringWriter());
+
+		json.writeObjectStart();
+		json.writeValue("width", w.getWidth() / scale);
+		json.writeValue("height", w.getHeight() / scale);
+		json.writeValue("initChapter", w.getInitChapter());
+		w.getVerbManager().write(json);
+		json.writeObjectEnd();
+
+		String s = null;
+
+		if (EngineLogger.debugMode())
+			s = json.prettyPrint(json.getWriter().getWriter().toString());
+		else
+			s = json.getWriter().getWriter().toString();
+
+		Writer w = file.writer(false, "UTF-8");
+		w.write(s);
+		w.close();
+	}
+
+	public void loadChapter() throws IOException {
+		loadChapter(null, null, true);
+	}
+
+	/**
+	 * Loads a JSON chapter file.
+	 * 
+	 * @param chapterName filename without path and extension.
+	 * @param scene       the init scene. null to use the chapter defined init
+	 *                    scene.
+	 * @param initScene   false only when it comes from loading a saved game.
+	 * @throws IOException
+	 */
+	public void loadChapter(String chapterName, String scene, boolean initScene) throws IOException {
+		if (!w.isDisposed())
+			w.dispose();
+
+		long initTime = System.currentTimeMillis();
+
+		if (chapterName == null)
+			chapterName = w.getInitChapter();
+
+		w.setChapter(chapterName);
+
+		if (EngineAssetManager.getInstance().getModelFile(chapterName + EngineAssetManager.CHAPTER_EXT).exists()) {
+
+			JsonValue root = new JsonReader().parse(EngineAssetManager.getInstance()
+					.getModelFile(chapterName + EngineAssetManager.CHAPTER_EXT).reader("UTF-8"));
+
+			Json json = new BladeJson(w, Mode.MODEL, initScene);
+			json.setIgnoreUnknownFields(true);
+
+			read(json, root);
+
+			if (scene == null)
+				w.setCurrentScene(w.getScenes().get(w.getInitScene()), initScene, null);
+			else
+				w.setCurrentScene(w.getScenes().get(scene), initScene, null);
+
+			w.getI18N().loadChapter(EngineAssetManager.MODEL_DIR + chapterName);
+
+			w.getCustomProperties().put(WorldProperties.CURRENT_CHAPTER.toString(), chapterName);
+			w.getCustomProperties().put(WorldProperties.PLATFORM.toString(), Gdx.app.getType().toString());
+		} else {
+			EngineLogger.error(
+					"ERROR LOADING CHAPTER: " + chapterName + EngineAssetManager.CHAPTER_EXT + " doesn't exists.");
+			w.dispose();
+			throw new IOException(
+					"ERROR LOADING CHAPTER: " + chapterName + EngineAssetManager.CHAPTER_EXT + " doesn't exists.");
+		}
+
+		EngineLogger.debug("MODEL LOADING TIME (ms): " + (System.currentTimeMillis() - initTime));
+	}
+
+	public void saveModel(String chapterId) throws IOException {
+		EngineLogger.debug("SAVING GAME MODEL");
+
+		if (w.isDisposed())
+			return;
+
+		Json json = new BladeJson(w, Mode.MODEL);
+		json.setOutputType(OutputType.javascript);
+
+		String s = null;
+
+		if (EngineLogger.debugMode())
+			s = json.prettyPrint(this);
+		else
+			s = json.toJson(this);
+
+		Writer w = EngineAssetManager.getInstance().getModelFile(chapterId + EngineAssetManager.CHAPTER_EXT)
+				.writer(false, "UTF-8");
+
+		try {
+			w.write(s);
+			w.flush();
+		} catch (IOException e) {
+			throw new IOException("ERROR SAVING MODEL", e);
+		} finally {
+			w.close();
+		}
+	}
+
+	public void loadGameState(FileHandle savedFile) throws IOException {
+		EngineLogger.debug("LOADING GAME STATE");
+
+		if (savedFile.exists()) {
+
+			JsonValue root = new JsonReader().parse(savedFile.reader("UTF-8"));
+
+			Json json = new BladeJson(w, Mode.STATE);
+			json.setIgnoreUnknownFields(true);
+
+			read(json, root);
+
+		} else {
+			throw new IOException("LOADGAMESTATE: no saved game exists");
+		}
+	}
+
+	public void saveGameState(String filename, boolean screenshot) throws IOException {
+		EngineLogger.debug("SAVING GAME STATE");
+
+		if (w.isDisposed())
+			return;
+
+		Json json = new BladeJson(w, Mode.STATE);
+		json.setOutputType(OutputType.javascript);
+		json.setSortFields(true);
+
+		String s = null;
+
+		if (EngineLogger.debugMode())
+			s = json.prettyPrint(this);
+		else
+			s = json.toJson(this);
+
+		Writer writer = EngineAssetManager.getInstance().getUserFile(filename).writer(false, "UTF-8");
+
+		try {
+			writer.write(s);
+			writer.flush();
+		} catch (IOException e) {
+			throw new IOException("ERROR SAVING GAME", e);
+		} finally {
+			writer.close();
+		}
+
+		// Save Screenshot
+		if (screenshot)
+			w.takeScreenshot(filename + ".png", SCREENSHOT_DEFAULT_WIDTH);
+	}
+
+	@Override
+	public void write(Json json) {
+		BladeJson bjson = (BladeJson) json;
+
+		json.writeValue(Config.BLADE_ENGINE_VERSION_PROP,
+				Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, null));
+
+		if (bjson.getMode() == Mode.MODEL) {
+			SortedMap<String, SoundDesc> sortedSounds = new TreeMap<>();
+			sortedSounds.putAll(w.getSounds());
+			json.writeValue("sounds", sortedSounds, sortedSounds.getClass(), SoundDesc.class);
+
+			SortedMap<String, Scene> sortedScenes = new TreeMap<>();
+			sortedScenes.putAll(w.getScenes());
+			json.writeValue("scenes", sortedScenes, sortedScenes.getClass(), Scene.class);
+
+			json.writeValue("initScene", w.getInitScene());
+
+		} else {
+			json.writeValue(Config.VERSION_PROP, Config.getInstance().getProperty(Config.VERSION_PROP, null));
+
+			SortedMap<String, Scene> sortedScenes = new TreeMap<>();
+			sortedScenes.putAll(w.getScenes());
+			json.writeValue("scenes", sortedScenes, sortedScenes.getClass(), Scene.class);
+
+			json.writeValue("currentScene", w.getCurrentScene().getId());
+			json.writeValue("inventories", w.getInventories());
+			json.writeValue("currentInventory", w.getCurrentInventory());
+			json.writeValue("timeOfGame", w.getTimeOfGame());
+			json.writeValue("cutmode", w.inCutMode());
+			w.getVerbManager().write(json);
+			json.writeValue("customProperties", w.getCustomProperties(), w.getCustomProperties().getClass(),
+					String.class);
+
+			if (w.getCurrentDialog() != null) {
+				json.writeValue("dialogActor", w.getCurrentDialog().getActor().getId());
+				json.writeValue("currentDialog", w.getCurrentDialog().getId());
+			}
+
+			if (w.getTransition() != null)
+				json.writeValue("transition", w.getTransition());
+
+			json.writeValue("chapter", w.getCurrentChapter());
+			json.writeValue("musicEngine", w.getMusicManager());
+
+			if (!w.getUIActors().getActors().isEmpty())
+				json.writeValue("uiActors", w.getUIActors());
+		}
+
+		if (w.getInkManager() != null && w.getInkManager().getStoryName() != null)
+			json.writeValue("inkManager", w.getInkManager());
+	}
+
+	@Override
+	public void read(Json json, JsonValue jsonData) {
+
+		String bladeVersion = json.readValue(Config.BLADE_ENGINE_VERSION_PROP, String.class, jsonData);
+
+		BladeJson bjson = (BladeJson) json;
+		if (bjson.getMode() == Mode.MODEL) {
+			if (bladeVersion != null
+					&& !bladeVersion.equals(Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""))) {
+				EngineLogger.debug("Model Engine Version v" + bladeVersion + " differs from Current Engine Version v"
+						+ Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""));
+			}
+
+			// SOUNDS
+			JsonValue jsonSounds = jsonData.get("sounds");
+			HashMap<String, SoundDesc> sounds = w.getSounds();
+
+			if (jsonSounds != null) {
+				for (int i = 0; i < jsonSounds.size; i++) {
+					JsonValue jsonValue = jsonSounds.get(i);
+					SoundDesc s = json.readValue(SoundDesc.class, jsonValue);
+					sounds.put(jsonValue.name, s);
+				}
+			}
+
+			// SCENES
+			JsonValue jsonScenes = jsonData.get("scenes");
+			Map<String, Scene> scenes = w.getScenes();
+
+			for (int i = 0; i < jsonScenes.size; i++) {
+				JsonValue jsonValue = jsonScenes.get(i);
+				Scene s = new Scene(w);
+				scenes.put(jsonValue.name, s);
+				s.read(json, jsonValue);
+			}
+
+			w.setInitScene(json.readValue("initScene", String.class, jsonData));
+
+			if (w.getInitScene() == null && w.getScenes().size() > 0) {
+				w.setInitScene(w.getScenes().keySet().toArray(new String[0])[0]);
+			}
+
+			for (Scene s : w.getScenes().values()) {
+				s.resetCamera(w.getWidth(), w.getHeight());
+			}
+
+			// Load Ink story
+			if (jsonData.get("inkManager") != null) {
+				w.getInkManager().read(json, jsonData.get("inkManager"));
+			}
+
+			// Add sounds to cache
+			cacheSounds();
+		} else {
+			if (bladeVersion != null
+					&& !bladeVersion.equals(Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""))) {
+				EngineLogger
+						.debug("Saved Game Engine Version v" + bladeVersion + " differs from Current Engine Version v"
+								+ Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""));
+			}
+
+			String currentChapter = json.readValue("chapter", String.class, jsonData);
+			String currentScene = json.readValue("currentScene", String.class, jsonData);
+
+			try {
+				loadChapter(currentChapter, currentScene, false);
+			} catch (IOException e1) {
+				EngineLogger.error("Error Loading Chapter");
+				return;
+			}
+
+			// read inkManager after setting he current scene but before reading
+			// scenes and verbs tweens
+			if (jsonData.get("inkManager") != null) {
+				w.getInkManager().read(json, jsonData.get("inkManager"));
+			}
+
+			// inventories have to be put in the hash to find the actors when
+			// reading saved data
+			w.setCurrentInventory(json.readValue("currentInventory", String.class, jsonData));
+
+			JsonValue jsonInventories = jsonData.get("inventories");
+
+			for (int i = 0; i < jsonInventories.size; i++) {
+				JsonValue jsonValue = jsonInventories.get(i);
+				Inventory inv = new Inventory();
+				w.getInventories().put(jsonValue.name, inv);
+				inv.read(json, jsonValue);
+			}
+
+			if (jsonData.get("uiActors") != null) {
+				w.getUIActors().read(json, jsonData.get("uiActors"));
+			}
+
+			for (Scene s : w.getScenes().values()) {
+				JsonValue jsonValue = jsonData.get("scenes").get(s.getId());
+
+				if (jsonValue != null)
+					s.read(json, jsonValue);
+				else
+					EngineLogger.debug("LOAD WARNING: Scene not found in saved game: " + s.getId());
+			}
+
+			w.setTimeOfGame(json.readValue("timeOfGame", long.class, 0L, jsonData));
+			w.setCutMode(json.readValue("cutmode", boolean.class, false, jsonData));
+
+			w.getVerbManager().read(json, jsonData);
+
+			// CUSTOM PROPERTIES
+			JsonValue jsonProperties = jsonData.get("customProperties");
+			HashMap<String, String> props = w.getCustomProperties();
+
+			for (int i = 0; i < jsonProperties.size; i++) {
+				JsonValue jsonValue = jsonProperties.get(i);
+				props.put(jsonValue.name, jsonValue.asString());
+			}
+
+			String version = json.readValue(Config.VERSION_PROP, String.class, jsonData);
+			if (version == null)
+				version = "TEST";
+			props.put(WorldProperties.SAVED_GAME_VERSION.toString(), version);
+
+			String actorId = json.readValue("dialogActor", String.class, jsonData);
+			String dialogId = json.readValue("currentDialog", String.class, jsonData);
+
+			if (dialogId != null) {
+				CharacterActor actor = (CharacterActor) w.getCurrentScene().getActor(actorId, false);
+				w.setCurrentDialog(actor.getDialog(dialogId));
+			}
+
+			w.getTransition().read(json, jsonData.get("transition"));
+			w.getMusicManager().read(json, jsonData.get("musicEngine"));
+
+			w.getI18N().loadChapter(EngineAssetManager.MODEL_DIR + w.getCurrentChapter());
+		}
+	}
+
+	private void cacheSounds() {
+		for (Scene s : w.getScenes().values()) {
+
+			HashMap<String, Verb> verbs = s.getVerbManager().getVerbs();
+
+			// Search SoundAction and PlaySoundAction
+			for (Verb v : verbs.values()) {
+				ArrayList<Action> actions = v.getActions();
+
+				for (int i = 0; i < actions.size(); i++) {
+
+					Action act = actions.get(i);
+
+					try {
+						if (act instanceof SoundAction) {
+
+							String actor = ActionUtils.getStringValue(act, "actor");
+							String play = ActionUtils.getStringValue(act, "play");
+							if (play != null) {
+
+								if (actor.equals("$PLAYER"))
+									actor = s.getPlayer().getId();
+
+								SoundDesc sd = w.getSounds().get(actor + "_" + play);
+
+								if (sd == null) {
+									EngineLogger.error(
+											"Reference to sound not found: " + s.getId() + "." + actor + "." + play);
+									continue;
+								}
+
+								s.getSoundManager().addSoundToLoad(sd);
+
+								HashMap<String, String> params = new HashMap<>();
+								params.put("sound", sd.getId());
+
+								try {
+									Action a2 = ActionFactory.create(PlaySoundAction.class.getName(), params);
+									actions.set(i, a2);
+									a2.init(w);
+								} catch (ClassNotFoundException | ReflectionException e) {
+									e.printStackTrace();
+								}
+								EngineLogger.debug("Converting SoundAction:" + s.getId() + "." + v.getId());
+							} else {
+								EngineLogger
+										.debug("WARNING: Cannot convert SoundAction:" + s.getId() + "." + v.getId());
+							}
+
+						} else if (act instanceof PlaySoundAction) {
+							String sound = ActionUtils.getStringValue(act, "sound");
+							SoundDesc sd = w.getSounds().get(sound);
+
+							if (sd != null && sd.isPreload())
+								s.getSoundManager().addSoundToLoad(sd);
+
+						}
+					} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+					}
+				}
+			}
+
+			for (BaseActor a : s.getActors().values()) {
+
+				if (a instanceof InteractiveActor) {
+					HashMap<String, Verb> actorVerbs = ((InteractiveActor) a).getVerbManager().getVerbs();
+
+					for (Verb v : actorVerbs.values()) {
+						ArrayList<Action> actions = v.getActions();
+
+						for (int i = 0; i < actions.size(); i++) {
+
+							Action act = actions.get(i);
+
+							try {
+								if (act instanceof SoundAction) {
+
+									String actor = ActionUtils.getStringValue(act, "actor");
+									String play = ActionUtils.getStringValue(act, "play");
+
+									if (play != null) {
+										if ("$PLAYER".equals(actor))
+											actor = s.getPlayer().getId();
+
+										SoundDesc sd = w.getSounds().get(actor + "_" + play);
+
+										if (sd == null) {
+											EngineLogger.error("Reference to sound not found: " + s.getId() + "."
+													+ actor + "." + play);
+											continue;
+										}
+
+										s.getSoundManager().addSoundToLoad(sd);
+
+										HashMap<String, String> params = new HashMap<>();
+										params.put("sound", sd.getId());
+
+										try {
+											Action a2 = ActionFactory.create(PlaySoundAction.class.getName(), params);
+											actions.set(i, a2);
+											a2.init(w);
+										} catch (ClassNotFoundException | ReflectionException e) {
+											e.printStackTrace();
+										}
+										EngineLogger.debug("Converting SoundAction in:" + s.getId() + "." + a.getId()
+												+ "." + v.getId());
+									} else {
+										EngineLogger.debug("WARNING: Cannot convert SoundAction:" + s.getId() + "."
+												+ a.getId() + "." + v.getId());
+									}
+
+								} else if (act instanceof PlaySoundAction) {
+									String sound = ActionUtils.getStringValue(act, "sound");
+									SoundDesc sd = w.getSounds().get(sound);
+
+									if (sd != null && sd.isPreload())
+										s.getSoundManager().addSoundToLoad(sd);
+
+								}
+							} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
+							}
+						}
+					}
+				}
+
+				if (a instanceof SpriteActor && ((SpriteActor) a).getRenderer() instanceof AnimationRenderer) {
+					HashMap<String, AnimationDesc> anims = ((AnimationRenderer) ((SpriteActor) a).getRenderer())
+							.getAnimations();
+
+					for (AnimationDesc ad : anims.values()) {
+						if (ad.sound != null) {
+							String sid = ad.sound;
+
+							SoundDesc sd = w.getSounds().get(sid);
+
+							if (sd == null)
+								sid = a.getId() + "_" + sid;
+
+							sd = w.getSounds().get(sid);
+
+							if (sd != null) {
+								if (sd.isPreload())
+									s.getSoundManager().addSoundToLoad(sd);
+							} else
+								EngineLogger.error(
+										a.getId() + ": SOUND not found: " + ad.sound + " in animation: " + ad.id);
+						}
+					}
+				}
+
+			}
+		}
+
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/shading/CelShader.java b/blade-engine/src/com/bladecoder/engine/shading/CelShader.java
deleted file mode 100644
index e20f49a35..000000000
--- a/blade-engine/src/com/bladecoder/engine/shading/CelShader.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.shading;
-
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.graphics.Camera;
-import com.badlogic.gdx.graphics.g3d.Attribute;
-import com.badlogic.gdx.graphics.g3d.Renderable;
-import com.badlogic.gdx.graphics.g3d.Shader;
-import com.badlogic.gdx.graphics.g3d.shaders.BaseShader;
-import com.badlogic.gdx.graphics.g3d.utils.RenderContext;
-import com.badlogic.gdx.graphics.glutils.ShaderProgram;
-import com.badlogic.gdx.utils.GdxRuntimeException;
-
-public class CelShader extends BaseShader  {
-
-	protected final int u_projTrans = register(new Uniform("u_projTrans"));
-	protected final int u_worldTrans = register(new Uniform("u_worldTrans"));
-	protected final int u_test = register(new Uniform("u_test"));
-
-	protected final ShaderProgram program;
-	
-	public static class TestAttribute extends Attribute {
-		public final static String Alias = "Test";
-		public final static long ID = register(Alias);
-
-		public float value;
-
-		protected TestAttribute(final float value) {
-			super(ID);
-			this.value = value;
-		}
-
-		@Override
-		public Attribute copy() {
-			return new TestAttribute(value);
-		}
-
-		@Override
-		protected boolean equals(Attribute other) {
-			return ((TestAttribute) other).value == value;
-		}
-	}	
-
-	public CelShader() {
-		super();
-		program = new ShaderProgram(Gdx.files.classpath("org/bladecoder/engine/shading/cel.vertex.glsl"), 
-				Gdx.files.classpath("org/bladecoder/engine/shading/cel.fragment.glsl"));
-		if (!program.isCompiled())
-			throw new GdxRuntimeException("Couldn't compile shader "
-					+ program.getLog());
-	}
-
-	@Override
-	public void init() {
-		super.init(program, null);
-	}
-
-	@Override
-	public int compareTo(Shader other) {
-		return 0;
-	}
-
-	@Override
-	public boolean canRender(Renderable instance) {
-		return true;
-	}
-
-	@Override
-	public void begin(Camera camera, RenderContext context) {
-		program.begin();
-		set(u_projTrans, camera.combined);
-	}
-
-	@Override
-	public void render(Renderable renderable) {
-		set(u_worldTrans, renderable.worldTransform);
-		TestAttribute attr = (TestAttribute) renderable.material
-				.get(TestAttribute.ID);
-		set(u_test, attr == null ? 1f : attr.value);
-		renderable.mesh.render(program, renderable.primitiveType,
-				renderable.meshPartOffset, renderable.meshPartSize);
-	}
-
-	@Override
-	public void end() {
-		program.end();
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-		program.dispose();
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/shading/cel.fragment.copy.glsl b/blade-engine/src/com/bladecoder/engine/shading/cel.fragment.copy.glsl
deleted file mode 100644
index 82b7a2423..000000000
--- a/blade-engine/src/com/bladecoder/engine/shading/cel.fragment.copy.glsl
+++ /dev/null
@@ -1,180 +0,0 @@
-#ifdef GL_ES 
-#define LOWP lowp
-#define MED mediump
-#define HIGH highp
-precision mediump float;
-#else
-#define MED
-#define LOWP
-#define HIGH
-#endif
-
-#if defined(specularTextureFlag) || defined(specularColorFlag)
-#define specularFlag
-#endif
-
-#ifdef normalFlag
-varying vec3 v_normal;
-#endif //normalFlag
-
-#if defined(colorFlag)
-varying vec4 v_color;
-#endif
-
-#ifdef blendedFlag
-varying float v_opacity;
-#ifdef alphaTestFlag
-varying float v_alphaTest;
-#endif //alphaTestFlag
-#endif //blendedFlag
-
-#if defined(diffuseTextureFlag) || defined(specularTextureFlag)
-#define textureFlag
-varying MED vec2 v_texCoords0;
-#endif
-
-#ifdef diffuseColorFlag
-uniform vec4 u_diffuseColor;
-#endif
-
-#ifdef diffuseTextureFlag
-uniform sampler2D u_diffuseTexture;
-#endif
-
-#ifdef specularColorFlag
-uniform vec4 u_specularColor;
-#endif
-
-#ifdef specularTextureFlag
-uniform sampler2D u_specularTexture;
-#endif
-
-#ifdef normalTextureFlag
-uniform sampler2D u_normalTexture;
-#endif
-
-#ifdef lightingFlag
-varying vec3 v_lightDiffuse;
-
-#if	defined(ambientLightFlag) || defined(ambientCubemapFlag) || defined(sphericalHarmonicsFlag)
-#define ambientFlag
-#endif //ambientFlag
-
-#ifdef specularFlag
-varying vec3 v_lightSpecular;
-#endif //specularFlag
-
-#ifdef shadowMapFlag
-uniform sampler2D u_shadowTexture;
-uniform float u_shadowPCFOffset;
-varying vec3 v_shadowMapUv;
-#define separateAmbientFlag
-
-float getShadowness(vec2 offset)
-{
-    const vec4 bitShifts = vec4(1.0, 1.0 / 255.0, 1.0 / 65025.0, 1.0 / 160581375.0);
-    return step(v_shadowMapUv.z, dot(texture2D(u_shadowTexture, v_shadowMapUv.xy + offset), bitShifts));//+(1.0/255.0));	
-}
-
-float getShadow() 
-{
-	return (//getShadowness(vec2(0,0)) + 
-			getShadowness(vec2(u_shadowPCFOffset, u_shadowPCFOffset)) +
-			getShadowness(vec2(-u_shadowPCFOffset, u_shadowPCFOffset)) +
-			getShadowness(vec2(u_shadowPCFOffset, -u_shadowPCFOffset)) +
-			getShadowness(vec2(-u_shadowPCFOffset, -u_shadowPCFOffset))) * 0.25;
-}
-#endif //shadowMapFlag
-
-#if defined(ambientFlag) && defined(separateAmbientFlag)
-varying vec3 v_ambientLight;
-#endif //separateAmbientFlag
-
-#endif //lightingFlag
-
-#ifdef fogFlag
-uniform vec4 u_fogColor;
-varying float v_fog;
-#endif // fogFlag
-
-void main() {
-	#if defined(normalFlag) 
-		vec3 normal = v_normal;
-	#endif // normalFlag
-		
-	#if defined(diffuseTextureFlag) && defined(diffuseColorFlag) && defined(colorFlag)
-		vec4 diffuse = texture2D(u_diffuseTexture, v_texCoords0) * u_diffuseColor * v_color;
-	#elif defined(diffuseTextureFlag) && defined(diffuseColorFlag)
-		vec4 diffuse = texture2D(u_diffuseTexture, v_texCoords0) * u_diffuseColor;
-	#elif defined(diffuseTextureFlag) && defined(colorFlag)
-		vec4 diffuse = texture2D(u_diffuseTexture, v_texCoords0) * v_color;
-	#elif defined(diffuseTextureFlag)
-		vec4 diffuse = texture2D(u_diffuseTexture, v_texCoords0);
-	#elif defined(diffuseColorFlag) && defined(colorFlag)
-		vec4 diffuse = u_diffuseColor * v_color;
-	#elif defined(diffuseColorFlag)
-		vec4 diffuse = u_diffuseColor;
-	#elif defined(colorFlag)
-		vec4 diffuse = v_color;
-	#else
-		vec4 diffuse = vec4(1.0);
-	#endif
-
-	#if (!defined(lightingFlag))  
-		gl_FragColor.rgb = diffuse.rgb;
-	#elif (!defined(specularFlag))
-		#if defined(ambientFlag) && defined(separateAmbientFlag)
-			#ifdef shadowMapFlag
-				gl_FragColor.rgb = (diffuse.rgb * (v_ambientLight + getShadow() * v_lightDiffuse));
-				//gl_FragColor.rgb = texture2D(u_shadowTexture, v_shadowMapUv.xy);
-			#else
-				gl_FragColor.rgb = (diffuse.rgb * (v_ambientLight + v_lightDiffuse));
-			#endif //shadowMapFlag
-		#else
-			#ifdef shadowMapFlag
-				gl_FragColor.rgb = getShadow() * (diffuse.rgb * v_lightDiffuse);
-			#else
-				//gl_FragColor.rgb = (diffuse.rgb * v_lightDiffuse);
-				
-float intensity;
-	vec4 color;
-	intensity = dot(v_lightDiffuse,normal);
-
-	if (intensity > 0.80)
-		color = vec4(1.0,0.5,0.5,1.0);
-	else if (intensity > 0.2)
-		color = vec4(0.6,0.3,0.3,1.0);
-	else
-		color = vec4(0.2,0.1,0.1,1.0);
-	
-	gl_FragColor = color;
-					
-			#endif //shadowMapFlag
-		#endif
-	#else
-		#if defined(specularTextureFlag) && defined(specularColorFlag)
-			vec3 specular = texture2D(u_specularTexture, v_texCoords0).rgb * u_specularColor.rgb * v_lightSpecular;
-		#elif defined(specularTextureFlag)
-			vec3 specular = texture2D(u_specularTexture, v_texCoords0).rgb * v_lightSpecular;
-		#elif defined(specularColorFlag)
-			vec3 specular = u_specularColor.rgb * v_lightSpecular;
-		#else
-			vec3 specular = v_lightSpecular;
-		#endif
-			
-		#if defined(ambientFlag) && defined(separateAmbientFlag)
-			#ifdef shadowMapFlag
-			gl_FragColor.rgb = (diffuse.rgb * (getShadow() * v_lightDiffuse + v_ambientLight)) + specular;
-				//gl_FragColor.rgb = texture2D(u_shadowTexture, v_shadowMapUv.xy);
-			#else
-				gl_FragColor.rgb = (diffuse.rgb * (v_lightDiffuse + v_ambientLight)) + specular;
-			#endif //shadowMapFlag
-		#else
-			#ifdef shadowMapFlag
-				gl_FragColor.rgb = getShadow() * ((diffuse.rgb * v_lightDiffuse) + specular);
-			#else
-				gl_FragColor.rgb = (diffuse.rgb * v_lightDiffuse) + specular;
-			#endif //shadowMapFlag
-		#endif
-	#endif //lightingFlag
-}
diff --git a/blade-engine/src/com/bladecoder/engine/shading/cel.fragment.glsl b/blade-engine/src/com/bladecoder/engine/shading/cel.fragment.glsl
deleted file mode 100644
index a038aa646..000000000
--- a/blade-engine/src/com/bladecoder/engine/shading/cel.fragment.glsl
+++ /dev/null
@@ -1,103 +0,0 @@
-#ifdef GL_ES 
-#define LOWP lowp
-#define MED mediump
-#define HIGH highp
-precision mediump float;
-#else
-#define MED
-#define LOWP
-#define HIGH
-#endif
-
-
-#ifdef normalFlag
-varying vec3 v_normal;
-#endif //normalFlag
-
-#if defined(colorFlag)
-varying vec4 v_color;
-#endif
-
-
-#if defined(diffuseTextureFlag)
-#define textureFlag
-varying MED vec2 v_texCoords0;
-#endif
-
-#ifdef diffuseColorFlag
-uniform vec4 u_diffuseColor;
-#endif
-
-#ifdef diffuseTextureFlag
-uniform sampler2D u_diffuseTexture;
-#endif
-
-#ifdef lightingFlag
-varying vec3 v_lightDiffuse;
-
-#if	defined(ambientLightFlag)
-#define ambientFlag
-#endif //ambientFlag
-
-#if defined(ambientFlag) && defined(separateAmbientFlag)
-varying vec3 v_ambientLight;
-#endif //separateAmbientFlag
-
-#if defined(numPointLights) && (numPointLights > 0)
-struct PointLight
-{
-	vec3 color;
-	vec3 position;
-};
-uniform PointLight u_pointLights[numPointLights];
-#endif // numPointLights
-
-#endif //lightingFlag
-
-void main() {
-		
-	//#if defined(diffuseTextureFlag) && defined(diffuseColorFlag) && defined(colorFlag)
-	//	vec4 diffuse = texture2D(u_diffuseTexture, v_texCoords0) * u_diffuseColor * v_color;
-	//#elif defined(diffuseTextureFlag) && defined(diffuseColorFlag)
-	//	vec4 diffuse = texture2D(u_diffuseTexture, v_texCoords0) * u_diffuseColor;
-	//#elif defined(diffuseTextureFlag) && defined(colorFlag)
-	//	vec4 diffuse = texture2D(u_diffuseTexture, v_texCoords0) * v_color;
-	#if defined(diffuseTextureFlag)
-		vec4 diffuse = texture2D(u_diffuseTexture, v_texCoords0);
-	#elif defined(diffuseColorFlag) && defined(colorFlag)
-		vec4 diffuse = u_diffuseColor * v_color;
-	#elif defined(diffuseColorFlag)
-		vec4 diffuse = u_diffuseColor;
-	#elif defined(colorFlag)
-		vec4 diffuse = v_color;
-	#else
-		vec4 diffuse = vec4(1.0);
-	#endif
-
-	#if (!defined(lightingFlag) || numPointLights < 1)  
-		gl_FragColor = diffuse;
-	#else
-				
-		vec4 c;
-		float df = dot(normalize(u_pointLights[0].position), normalize(v_normal));
-		
-		c = diffuse;
-		
-		c.rgb *= u_pointLights[0].color;
-		
-    	float E = 0.04;
-    	if (df > 0.5 - E && df < 0.5 + E)    {
-        	df = smoothstep(0.5 - E, 0.5 + E, df);
-    	} else if(df < 0.5) {
-        	df = 0.5;
-    	} else {
-    		df = 1.0;
-    	}
-    	    	
-    	c.rgb = df * diffuse.rgb;
-	
-		gl_FragColor = c;
-	#endif					
-
-
-}
diff --git a/blade-engine/src/com/bladecoder/engine/shading/cel.vertex.copy.glsl b/blade-engine/src/com/bladecoder/engine/shading/cel.vertex.copy.glsl
deleted file mode 100644
index c14953d16..000000000
--- a/blade-engine/src/com/bladecoder/engine/shading/cel.vertex.copy.glsl
+++ /dev/null
@@ -1,323 +0,0 @@
-#if defined(diffuseTextureFlag) || defined(specularTextureFlag)
-#define textureFlag
-#endif
-
-#if defined(specularTextureFlag) || defined(specularColorFlag)
-#define specularFlag
-#endif
-
-#if defined(specularFlag) || defined(fogFlag)
-#define cameraPositionFlag
-#endif
-
-attribute vec3 a_position;
-uniform mat4 u_projViewTrans;
-
-#if defined(colorFlag)
-varying vec4 v_color;
-attribute vec4 a_color;
-#endif // colorFlag
-
-#ifdef normalFlag
-attribute vec3 a_normal;
-uniform mat3 u_normalMatrix;
-varying vec3 v_normal;
-#endif // normalFlag
-
-#ifdef textureFlag
-attribute vec2 a_texCoord0;
-varying vec2 v_texCoords0;
-#endif // textureFlag
-
-#ifdef boneWeight0Flag
-#define boneWeightsFlag
-attribute vec2 a_boneWeight0;
-#endif //boneWeight0Flag
-
-#ifdef boneWeight1Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight1;
-#endif //boneWeight1Flag
-
-#ifdef boneWeight2Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight2;
-#endif //boneWeight2Flag
-
-#ifdef boneWeight3Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight3;
-#endif //boneWeight3Flag
-
-#ifdef boneWeight4Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight4;
-#endif //boneWeight4Flag
-
-#ifdef boneWeight5Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight5;
-#endif //boneWeight5Flag
-
-#ifdef boneWeight6Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight6;
-#endif //boneWeight6Flag
-
-#ifdef boneWeight7Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight7;
-#endif //boneWeight7Flag
-
-#if defined(numBones) && defined(boneWeightsFlag)
-#if (numBones > 0) 
-#define skinningFlag
-#endif
-#endif
-
-uniform mat4 u_worldTrans;
-
-#if defined(numBones)
-#if numBones > 0
-uniform mat4 u_bones[numBones];
-#endif //numBones
-#endif
-
-#ifdef shininessFlag
-uniform float u_shininess;
-#else
-const float u_shininess = 20.0;
-#endif // shininessFlag
-
-#ifdef blendedFlag
-uniform float u_opacity;
-varying float v_opacity;
-
-#ifdef alphaTestFlag
-uniform float u_alphaTest;
-varying float v_alphaTest;
-#endif //alphaTestFlag
-#endif // blendedFlag
-
-#ifdef lightingFlag
-varying vec3 v_lightDiffuse;
-
-#ifdef ambientLightFlag
-uniform vec3 u_ambientLight;
-#endif // ambientLightFlag
-
-#ifdef ambientCubemapFlag
-uniform vec3 u_ambientCubemap[6];
-#endif // ambientCubemapFlag 
-
-#ifdef sphericalHarmonicsFlag
-uniform vec3 u_sphericalHarmonics[9];
-#endif //sphericalHarmonicsFlag
-
-#ifdef specularFlag
-varying vec3 v_lightSpecular;
-#endif // specularFlag
-
-#ifdef cameraPositionFlag
-uniform vec4 u_cameraPosition;
-#endif // cameraPositionFlag
-
-#ifdef fogFlag
-varying float v_fog;
-#endif // fogFlag
-
-
-#if defined(numDirectionalLights) && (numDirectionalLights > 0)
-struct DirectionalLight
-{
-	vec3 color;
-	vec3 direction;
-};
-uniform DirectionalLight u_dirLights[numDirectionalLights];
-#endif // numDirectionalLights
-
-#if defined(numPointLights) && (numPointLights > 0)
-struct PointLight
-{
-	vec3 color;
-	vec3 position;
-};
-uniform PointLight u_pointLights[numPointLights];
-#endif // numPointLights
-
-#if	defined(ambientLightFlag) || defined(ambientCubemapFlag) || defined(sphericalHarmonicsFlag)
-#define ambientFlag
-#endif //ambientFlag
-
-#ifdef shadowMapFlag
-uniform mat4 u_shadowMapProjViewTrans;
-varying vec3 v_shadowMapUv;
-#define separateAmbientFlag
-#endif //shadowMapFlag
-
-#if defined(ambientFlag) && defined(separateAmbientFlag)
-varying vec3 v_ambientLight;
-#endif //separateAmbientFlag
-
-#endif // lightingFlag
-
-void main() {
-	#ifdef textureFlag
-		v_texCoords0 = a_texCoord0;
-	#endif // textureFlag
-	
-	#if defined(colorFlag)
-		v_color = a_color;
-	#endif // colorFlag
-		
-	#ifdef blendedFlag
-		v_opacity = u_opacity;
-		#ifdef alphaTestFlag
-			v_alphaTest = u_alphaTest;
-		#endif //alphaTestFlag
-	#endif // blendedFlag
-	
-	#ifdef skinningFlag
-		mat4 skinning = mat4(0.0);
-		#ifdef boneWeight0Flag
-			skinning += (a_boneWeight0.y) * u_bones[int(a_boneWeight0.x)];
-		#endif //boneWeight0Flag
-		#ifdef boneWeight1Flag				
-			skinning += (a_boneWeight1.y) * u_bones[int(a_boneWeight1.x)];
-		#endif //boneWeight1Flag
-		#ifdef boneWeight2Flag		
-			skinning += (a_boneWeight2.y) * u_bones[int(a_boneWeight2.x)];
-		#endif //boneWeight2Flag
-		#ifdef boneWeight3Flag
-			skinning += (a_boneWeight3.y) * u_bones[int(a_boneWeight3.x)];
-		#endif //boneWeight3Flag
-		#ifdef boneWeight4Flag
-			skinning += (a_boneWeight4.y) * u_bones[int(a_boneWeight4.x)];
-		#endif //boneWeight4Flag
-		#ifdef boneWeight5Flag
-			skinning += (a_boneWeight5.y) * u_bones[int(a_boneWeight5.x)];
-		#endif //boneWeight5Flag
-		#ifdef boneWeight6Flag
-			skinning += (a_boneWeight6.y) * u_bones[int(a_boneWeight6.x)];
-		#endif //boneWeight6Flag
-		#ifdef boneWeight7Flag
-			skinning += (a_boneWeight7.y) * u_bones[int(a_boneWeight7.x)];
-		#endif //boneWeight7Flag
-	#endif //skinningFlag
-
-	#ifdef skinningFlag
-		vec4 pos = u_worldTrans * skinning * vec4(a_position, 1.0);
-	#else
-		vec4 pos = u_worldTrans * vec4(a_position, 1.0);
-	#endif
-		
-	gl_Position = u_projViewTrans * pos;
-		
-	#ifdef shadowMapFlag
-		vec4 spos = u_shadowMapProjViewTrans * pos;
-		v_shadowMapUv.xy = (spos.xy / spos.w) * 0.5 + 0.5;
-		v_shadowMapUv.z = min(spos.z * 0.5 + 0.5, 0.998);
-	#endif //shadowMapFlag
-	
-	#if defined(normalFlag)
-		#if defined(skinningFlag)
-			vec3 normal = normalize((u_worldTrans * skinning * vec4(a_normal, 0.0)).xyz);
-		#else
-			vec3 normal = normalize(u_normalMatrix * a_normal);
-		#endif
-		v_normal = normal;
-	#endif // normalFlag
-
-    #ifdef fogFlag
-        vec3 flen = u_cameraPosition.xyz - pos.xyz;
-        float fog = dot(flen, flen) * u_cameraPosition.w;
-        v_fog = min(fog, 1.0);
-    #endif
-
-	#ifdef lightingFlag
-		#if	defined(ambientLightFlag)
-        	vec3 ambientLight = u_ambientLight;
-		#elif defined(ambientFlag)
-        	vec3 ambientLight = vec3(0.0);
-		#endif
-			
-		#ifdef ambientCubemapFlag 		
-			vec3 squaredNormal = normal * normal;
-			vec3 isPositive  = step(0.0, normal);
-			ambientLight += squaredNormal.x * mix(u_ambientCubemap[0], u_ambientCubemap[1], isPositive.x) +
-					squaredNormal.y * mix(u_ambientCubemap[2], u_ambientCubemap[3], isPositive.y) +
-					squaredNormal.z * mix(u_ambientCubemap[4], u_ambientCubemap[5], isPositive.z);
-		#endif // ambientCubemapFlag
-
-		#ifdef sphericalHarmonicsFlag
-			ambientLight += u_sphericalHarmonics[0];
-			ambientLight += u_sphericalHarmonics[1] * normal.x;
-			ambientLight += u_sphericalHarmonics[2] * normal.y;
-			ambientLight += u_sphericalHarmonics[3] * normal.z;
-			ambientLight += u_sphericalHarmonics[4] * (normal.x * normal.z);
-			ambientLight += u_sphericalHarmonics[5] * (normal.z * normal.y);
-			ambientLight += u_sphericalHarmonics[6] * (normal.y * normal.x);
-			ambientLight += u_sphericalHarmonics[7] * (3.0 * normal.z * normal.z - 1.0);
-			ambientLight += u_sphericalHarmonics[8] * (normal.x * normal.x - normal.y * normal.y);			
-		#endif // sphericalHarmonicsFlag
-
-		#ifdef ambientFlag
-			#ifdef separateAmbientFlag
-				v_ambientLight = ambientLight;
-				v_lightDiffuse = vec3(0.0);
-			#else
-				v_lightDiffuse = ambientLight;
-			#endif //separateAmbientFlag
-		#else
-	        v_lightDiffuse = vec3(0.0);
-		#endif //ambientFlag
-
-			
-		#ifdef specularFlag
-			v_lightSpecular = vec3(0.0);
-			vec3 viewVec = normalize(u_cameraPosition.xyz - pos.xyz);
-		#endif // specularFlag
-			
-		#if defined(numDirectionalLights) && (numDirectionalLights > 0) && defined(normalFlag)
-			for (int i = 0; i < numDirectionalLights; i++) {
-				vec3 lightDir = -u_dirLights[i].direction;
-				float NdotL = clamp(dot(normal, lightDir), 0.0, 1.0);
-				vec3 value = u_dirLights[i].color * NdotL;
-				v_lightDiffuse += value;
-				#ifdef specularFlag
-					float halfDotView = max(0.0, dot(normal, normalize(lightDir + viewVec)));
-					v_lightSpecular += value * pow(halfDotView, u_shininess);
-				#endif // specularFlag
-			}
-		#endif // numDirectionalLights
-
-		#if defined(numPointLights) && (numPointLights > 0) && defined(normalFlag)
-			for (int i = 0; i < numPointLights; i++) {
-				vec3 lightDir = u_pointLights[i].position - pos.xyz;
-				float dist2 = dot(lightDir, lightDir);
-				lightDir *= inversesqrt(dist2);
-				float NdotL = clamp(dot(normal, lightDir), 0.0, 1.0);
-				vec3 value = u_pointLights[i].color * (NdotL / (1.0 + dist2));
-				v_lightDiffuse += value;
-				#ifdef specularFlag
-					float halfDotView = max(0.0, dot(normal, normalize(lightDir + viewVec)));
-					v_lightSpecular += value * pow(halfDotView, u_shininess);
-				#endif // specularFlag
-			}
-		#endif // numPointLights
-	#endif // lightingFlag
-}
diff --git a/blade-engine/src/com/bladecoder/engine/shading/cel.vertex.glsl b/blade-engine/src/com/bladecoder/engine/shading/cel.vertex.glsl
deleted file mode 100644
index f02c76120..000000000
--- a/blade-engine/src/com/bladecoder/engine/shading/cel.vertex.glsl
+++ /dev/null
@@ -1,215 +0,0 @@
-#if defined(diffuseTextureFlag) || defined(specularTextureFlag)
-#define textureFlag
-#endif
-
-#if defined(specularTextureFlag) || defined(specularColorFlag)
-#define specularFlag
-#endif
-
-#if defined(specularFlag) || defined(fogFlag)
-#define cameraPositionFlag
-#endif
-
-attribute vec3 a_position;
-uniform mat4 u_projViewTrans;
-
-#if defined(colorFlag)
-varying vec4 v_color;
-attribute vec4 a_color;
-#endif // colorFlag
-
-#ifdef normalFlag
-attribute vec3 a_normal;
-uniform mat3 u_normalMatrix;
-varying vec3 v_normal;
-#endif // normalFlag
-
-#ifdef textureFlag
-attribute vec2 a_texCoord0;
-varying vec2 v_texCoords0;
-#endif // textureFlag
-
-#ifdef boneWeight0Flag
-#define boneWeightsFlag
-attribute vec2 a_boneWeight0;
-#endif //boneWeight0Flag
-
-#ifdef boneWeight1Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight1;
-#endif //boneWeight1Flag
-
-#ifdef boneWeight2Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight2;
-#endif //boneWeight2Flag
-
-#ifdef boneWeight3Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight3;
-#endif //boneWeight3Flag
-
-#ifdef boneWeight4Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight4;
-#endif //boneWeight4Flag
-
-#ifdef boneWeight5Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight5;
-#endif //boneWeight5Flag
-
-#ifdef boneWeight6Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight6;
-#endif //boneWeight6Flag
-
-#ifdef boneWeight7Flag
-#ifndef boneWeightsFlag
-#define boneWeightsFlag
-#endif
-attribute vec2 a_boneWeight7;
-#endif //boneWeight7Flag
-
-#if defined(numBones) && defined(boneWeightsFlag)
-#if (numBones > 0) 
-#define skinningFlag
-#endif
-#endif
-
-uniform mat4 u_worldTrans;
-
-#if defined(numBones)
-#if numBones > 0
-uniform mat4 u_bones[numBones];
-#endif //numBones
-#endif
-
-
-#ifdef lightingFlag
-varying vec3 v_lightDiffuse;
-
-#ifdef ambientLightFlag
-uniform vec3 u_ambientLight;
-#endif // ambientLightFlag
-
-#ifdef cameraPositionFlag
-uniform vec4 u_cameraPosition;
-#endif // cameraPositionFlag
-
-
-#if defined(numPointLights) && (numPointLights > 0)
-struct PointLight
-{
-	vec3 color;
-	vec3 position;
-};
-uniform PointLight u_pointLights[numPointLights];
-#endif // numPointLights
-
-#if	defined(ambientLightFlag)
-#define ambientFlag
-#endif //ambientFlag
-
-#ifdef shadowMapFlag
-uniform mat4 u_shadowMapProjViewTrans;
-varying vec3 v_shadowMapUv;
-#define separateAmbientFlag
-#endif //shadowMapFlag
-
-#if defined(ambientFlag) && defined(separateAmbientFlag)
-varying vec3 v_ambientLight;
-#endif //separateAmbientFlag
-
-#endif // lightingFlag
-
-void main() {
-	#ifdef textureFlag
-		v_texCoords0 = a_texCoord0;
-	#endif // textureFlag
-	
-	#if defined(colorFlag)
-		v_color = a_color;
-	#endif // colorFlag
-		
-
-	#ifdef skinningFlag
-		mat4 skinning = mat4(0.0);
-		#ifdef boneWeight0Flag
-			skinning += (a_boneWeight0.y) * u_bones[int(a_boneWeight0.x)];
-		#endif //boneWeight0Flag
-		#ifdef boneWeight1Flag				
-			skinning += (a_boneWeight1.y) * u_bones[int(a_boneWeight1.x)];
-		#endif //boneWeight1Flag
-		#ifdef boneWeight2Flag		
-			skinning += (a_boneWeight2.y) * u_bones[int(a_boneWeight2.x)];
-		#endif //boneWeight2Flag
-		#ifdef boneWeight3Flag
-			skinning += (a_boneWeight3.y) * u_bones[int(a_boneWeight3.x)];
-		#endif //boneWeight3Flag
-		#ifdef boneWeight4Flag
-			skinning += (a_boneWeight4.y) * u_bones[int(a_boneWeight4.x)];
-		#endif //boneWeight4Flag
-		#ifdef boneWeight5Flag
-			skinning += (a_boneWeight5.y) * u_bones[int(a_boneWeight5.x)];
-		#endif //boneWeight5Flag
-		#ifdef boneWeight6Flag
-			skinning += (a_boneWeight6.y) * u_bones[int(a_boneWeight6.x)];
-		#endif //boneWeight6Flag
-		#ifdef boneWeight7Flag
-			skinning += (a_boneWeight7.y) * u_bones[int(a_boneWeight7.x)];
-		#endif //boneWeight7Flag
-	#endif //skinningFlag
-
-	#ifdef skinningFlag
-		vec4 pos = u_worldTrans * skinning * vec4(a_position, 1.0);
-	#else
-		vec4 pos = u_worldTrans * vec4(a_position, 1.0);
-	#endif
-		
-	gl_Position = u_projViewTrans * pos;
-		
-	#ifdef shadowMapFlag
-		vec4 spos = u_shadowMapProjViewTrans * pos;
-		v_shadowMapUv.xy = (spos.xy / spos.w) * 0.5 + 0.5;
-		v_shadowMapUv.z = min(spos.z * 0.5 + 0.5, 0.998);
-	#endif //shadowMapFlag
-	
-	#if defined(normalFlag)
-		#if defined(skinningFlag)
-			vec3 normal = normalize((u_worldTrans * skinning * vec4(a_normal, 0.0)).xyz);
-		#else
-			vec3 normal = normalize(u_normalMatrix * a_normal);
-		#endif
-		v_normal = normal;
-	#endif // normalFlag
-
-	#ifdef lightingFlag
-		#ifdef ambientFlag
-			#ifdef separateAmbientFlag
-				v_ambientLight = ambientLight;
-				v_lightDiffuse = vec3(0.0);
-			#else
-				v_lightDiffuse = ambientLight;
-			#endif //separateAmbientFlag
-		#else
-	        v_lightDiffuse = vec3(1.0);
-		#endif //ambientFlag			
-
-		#if defined(numPointLights) && (numPointLights > 0) && defined(normalFlag)
-			v_lightDiffuse = normalize(u_pointLights[0].position) ;
-		#endif // numPointLights
-	#endif // lightingFlag
-}
diff --git a/blade-engine/src/com/bladecoder/engine/shading/floor.fragment.glsl b/blade-engine/src/com/bladecoder/engine/shading/floor.fragment.glsl
deleted file mode 100644
index 228cd7a99..000000000
--- a/blade-engine/src/com/bladecoder/engine/shading/floor.fragment.glsl
+++ /dev/null
@@ -1,39 +0,0 @@
-// VERTEX SHADER TO DRAW THE SHADOW ON THE FLOOR
-// DRAWS THE SEMITRANSPARENT SHADOW AND SETS THE PIXEL TRANSPARENT WHEN NO SHADOW
-// TODO: SET SHADOW ALPHA AS PARAM
-
-#ifdef GL_ES 
-#define LOWP lowp
-#define MED mediump
-#define HIGH highp
-precision mediump float;
-#else
-#define MED
-#define LOWP
-#define HIGH
-#endif
-
-uniform sampler2D u_shadowTexture;
-uniform float u_shadowPCFOffset;
-varying vec3 v_shadowMapUv;
-
-float getShadowness(vec2 offset)
-{
-    const vec4 bitShifts = vec4(1.0, 1.0 / 255.0, 1.0 / 65025.0, 1.0 / 160581375.0);
-    return step(v_shadowMapUv.z, dot(texture2D(u_shadowTexture, v_shadowMapUv.xy + offset), bitShifts));//+(1.0/255.0));	
-}
-
-float getShadow() 
-{
-	return (//getShadowness(vec2(0,0)) + 
-			getShadowness(vec2(u_shadowPCFOffset, u_shadowPCFOffset)) +
-			getShadowness(vec2(-u_shadowPCFOffset, u_shadowPCFOffset)) +
-			getShadowness(vec2(u_shadowPCFOffset, -u_shadowPCFOffset)) +
-			getShadowness(vec2(-u_shadowPCFOffset, -u_shadowPCFOffset))) * 0.25;
-}
-
-
-void main() {	
-	gl_FragColor.rgb = vec3(0.0,0.0,0.0);
-	gl_FragColor.a =  (1.0 - getShadow()) * 0.2;
-}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/AnimButton.java b/blade-engine/src/com/bladecoder/engine/ui/AnimButton.java
new file mode 100644
index 000000000..fa0f36986
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/AnimButton.java
@@ -0,0 +1,29 @@
+package com.bladecoder.engine.ui;
+
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+
+public class AnimButton extends Button {
+	public AnimButton(Skin skin, String styleName) {
+		super(skin, styleName);
+	}
+
+	public AnimButton(ButtonStyle style) {
+		super(style);
+	}
+
+	@Override
+	public void act(float delta) {
+		ButtonStyle style = getStyle();
+		if (style.up != null && style.up instanceof AnimationDrawable)
+			((AnimationDrawable) style.up).act(delta);
+
+		if (style.over != null && style.over instanceof AnimationDrawable)
+			((AnimationDrawable) style.over).act(delta);
+
+		if (style.down != null && style.down instanceof AnimationDrawable)
+			((AnimationDrawable) style.down).act(delta);
+
+		super.act(delta);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/AnimationDrawable.java b/blade-engine/src/com/bladecoder/engine/ui/AnimationDrawable.java
new file mode 100644
index 000000000..1e0cfe66e
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/AnimationDrawable.java
@@ -0,0 +1,75 @@
+package com.bladecoder.engine.ui;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.Animation;
+import com.badlogic.gdx.graphics.g2d.Animation.PlayMode;
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
+import com.badlogic.gdx.scenes.scene2d.utils.BaseDrawable;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.scenes.scene2d.utils.TransformDrawable;
+
+public class AnimationDrawable extends BaseDrawable implements TransformDrawable {
+	public final Animation<AtlasRegion> anim;
+	private float stateTime = 0;
+	private Color tint;
+
+	public AnimationDrawable(Animation<AtlasRegion> anim) {
+		this.anim = anim;
+		setMinWidth(anim.getKeyFrames()[0].getRegionWidth());
+		setMinHeight(anim.getKeyFrames()[0].getRegionHeight());
+	}
+
+	public AnimationDrawable(AnimationDrawable ad) {
+		super(ad);
+		anim = new Animation<AtlasRegion>(ad.getAnimation().getFrameDuration(), ad.getAnimation().getKeyFrames());
+		anim.setPlayMode(PlayMode.LOOP);
+	}
+
+	public void act(float delta) {
+		stateTime += delta;
+	}
+
+	public void reset() {
+		stateTime = 0;
+	}
+
+	@Override
+	public void draw(Batch batch, float x, float y, float width, float height) {
+		if (tint != null)
+			batch.setColor(tint);
+
+		batch.draw(anim.getKeyFrame(stateTime), x, y, width, height);
+
+		if (tint != null)
+			batch.setColor(Color.WHITE);
+	}
+
+	@Override
+	public void draw(Batch batch, float x, float y, float originX, float originY, float width, float height,
+			float scaleX, float scaleY, float rotation) {
+
+		if (tint != null)
+			batch.setColor(tint);
+
+		batch.draw(anim.getKeyFrame(stateTime), x, y, originX, originY, width, height, scaleX, scaleY, rotation);
+
+		if (tint != null)
+			batch.setColor(Color.WHITE);
+	}
+
+	public Animation<AtlasRegion> getAnimation() {
+		return anim;
+	}
+
+	public Drawable tint(Color tint) {
+		AnimationDrawable d = new AnimationDrawable(this);
+		d.setTint(tint);
+
+		return d;
+	}
+
+	public void setTint(Color t) {
+		this.tint = t;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/BladeSkin.java b/blade-engine/src/com/bladecoder/engine/ui/BladeSkin.java
index df932cca7..a15bfb705 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/BladeSkin.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/BladeSkin.java
@@ -2,100 +2,280 @@
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.Animation;
+import com.badlogic.gdx.graphics.g2d.Animation.PlayMode;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.BaseDrawable;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.Json;
 import com.badlogic.gdx.utils.Json.ReadOnlySerializer;
 import com.badlogic.gdx.utils.JsonValue;
 import com.badlogic.gdx.utils.SerializationException;
+import com.badlogic.gdx.utils.reflect.ClassReflection;
+import com.badlogic.gdx.utils.reflect.ReflectionException;
 import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.EngineLogger;
 import com.bladecoder.engine.util.FileUtils;
+import com.bladecoder.engine.util.MultiFontBitmapFontData;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Custom Skin class to add TTF font support
- * 
+ *
  * @author rgarcia
  */
 public class BladeSkin extends Skin {
 
-	public BladeSkin(FileHandle skinFile, TextureAtlas atlas) {
-		super(skinFile, atlas);
-	}
-
-	/**
-	 * Override BitmapFont.class serializer to support TTF fonts
-	 * 
-	 * Also add the size parameter to support bitmaps font size in pt
-	 */
-	@Override
-	protected Json getJsonLoader(final FileHandle skinFile) {
-		Json json = super.getJsonLoader(skinFile);
-
-		final Skin skin = this;
-
-		json.setSerializer(BitmapFont.class, new ReadOnlySerializer<BitmapFont>() {
-			public BitmapFont read(Json json, JsonValue jsonData, @SuppressWarnings("rawtypes") Class type) {
-				String path = json.readValue("file", String.class, jsonData);
-				int scaledSize = json.readValue("scaledSize", int.class, -1, jsonData);
-				Boolean flip = json.readValue("flip", Boolean.class, false, jsonData);
-				int size = json.readValue("size", int.class, -1, jsonData);
-
-				FileHandle fontFile = skinFile.parent().child(path);
-				if (!FileUtils.exists(fontFile))
-					fontFile = Gdx.files.internal(path);
-				
-				if (!FileUtils.exists(fontFile))
-					throw new SerializationException("Font file not found: " + fontFile);
-				
-				BitmapFont font;
-
-				if (fontFile.extension().equalsIgnoreCase("ttf")) {
-					
-					if (size == -1) 
-						throw new SerializationException("'size' parameter mandatory for .ttf fonts");
-					
-					FreeTypeFontGenerator generator = new FreeTypeFontGenerator(fontFile);
-					FreeTypeFontParameter parameter = new FreeTypeFontParameter();
-					parameter.size = (int) (DPIUtils.dpToPixels(size) * DPIUtils.getSizeMultiplier());
-					font = generator.generateFont(parameter); 
-					generator.dispose(); 
-				} else {
-
-					// Use a region with the same name as the font, else use a
-					// PNG file in the same directory as the FNT file.
-					String regionName = fontFile.nameWithoutExtension();
-					try {
-						TextureRegion region = skin.optional(regionName, TextureRegion.class);
-						if (region != null)
-							font = new BitmapFont(fontFile, region, flip);
-						else {
-							FileHandle imageFile = fontFile.parent().child(regionName + ".png");
-							if (FileUtils.exists(imageFile))
-								font = new BitmapFont(fontFile, imageFile, flip);
-							else
-								font = new BitmapFont(fontFile, flip);
-						}
-						// Scaled size is the desired cap height to scale the
-						// font to.
-						if (scaledSize != -1)
-							font.setScale(scaledSize / font.getCapHeight());
-						else if(size != -1) // TODO set size in points (dpi independent)
-							font.setScale(DPIUtils.ptToPixels(size) / font.getCapHeight());
-					} catch (RuntimeException ex) {
-						throw new SerializationException("Error loading bitmap font: " + fontFile, ex);
-					}
-				}
-				
-				font.setMarkupEnabled(true);
-				
-				return font;
-			}
-		});
-
-		return json;
-	}
+    private List<FreeTypeFontGenerator> fontGenerators;
+
+    public BladeSkin(FileHandle skinFile) {
+        super(skinFile);
+    }
+
+    public BladeSkin(FileHandle skinFile, TextureAtlas atlas) {
+        super(skinFile, atlas);
+    }
+
+    public BladeSkin(TextureAtlas atlas) {
+        super(atlas);
+    }
+
+    /**
+     * Override BitmapFont.class serializer to support TTF fonts
+     * <p>
+     * Also add the size parameter to support bitmaps font size in pt
+     */
+    @Override
+    protected Json getJsonLoader(final FileHandle skinFile) {
+        Json json = super.getJsonLoader(skinFile);
+
+        final Skin skin = this;
+
+        json.setSerializer(Skin.class, new ReadOnlySerializer<Skin>() {
+            @Override
+            public Skin read(Json json, JsonValue typeToValueMap, @SuppressWarnings("rawtypes") Class ignored) {
+                for (JsonValue valueMap = typeToValueMap.child; valueMap != null; valueMap = valueMap.next) {
+                    try {
+                        Class<?> type = json.getClass(valueMap.name());
+                        if (type == null)
+                            type = ClassReflection.forName(valueMap.name());
+                        readNamedObjects(json, type, valueMap);
+                    } catch (ReflectionException ex) {
+                        throw new SerializationException(ex);
+                    }
+                }
+                return skin;
+            }
+
+            private void readNamedObjects(Json json, Class<?> type, JsonValue valueMap) {
+                Class<?> addType = type == TintedDrawable.class ? Drawable.class : type;
+                for (JsonValue valueEntry = valueMap.child; valueEntry != null; valueEntry = valueEntry.next) {
+                    Object object = json.readValue(type, valueEntry);
+                    if (object == null)
+                        continue;
+                    try {
+                        add(valueEntry.name, object, addType);
+                        if (addType != Drawable.class && ClassReflection.isAssignableFrom(Drawable.class, addType))
+                            add(valueEntry.name, object, Drawable.class);
+                    } catch (Exception ex) {
+                        throw new SerializationException(
+                                "Error reading " + ClassReflection.getSimpleName(type) + ": " + valueEntry.name, ex);
+                    }
+                }
+            }
+        });
+
+        json.setSerializer(BitmapFont.class, new ReadOnlySerializer<BitmapFont>() {
+            @Override
+            public BitmapFont read(Json json, JsonValue jsonData, @SuppressWarnings("rawtypes") Class type) {
+                String path = json.readValue("file", String.class, jsonData);
+                int scaledSize = json.readValue("scaledSize", int.class, -1, jsonData);
+                Boolean flip = json.readValue("flip", Boolean.class, false, jsonData);
+                int size = json.readValue("size", int.class, -1, jsonData);
+
+                FileHandle fontFile = skinFile.parent().child(path);
+                if (!FileUtils.exists(fontFile))
+                    fontFile = Gdx.files.internal(path);
+
+                if (!FileUtils.exists(fontFile))
+                    throw new SerializationException("Font file not found: " + fontFile);
+
+                BitmapFont font;
+
+                if (fontFile.extension().equalsIgnoreCase("ttf")) {
+
+                    if (size == -1)
+                        throw new SerializationException("'size' mandatory parameter for .ttf fonts");
+
+                    long initTime = System.currentTimeMillis();
+
+                    FreeTypeFontGenerator generator = new FreeTypeFontGenerator(fontFile);
+                    FreeTypeFontParameter parameter = new FreeTypeFontParameter();
+                    parameter.size = (int) (DPIUtils.dpToPixels(size) * DPIUtils.getSizeMultiplier());
+                    parameter.color = json.readValue("color", Color.class, Color.WHITE, jsonData);
+                    parameter.incremental = json.readValue("incremental", boolean.class, true, jsonData);
+                    parameter.borderWidth = json.readValue("borderWidth", int.class, 0, jsonData);
+                    parameter.borderColor = json.readValue("borderColor", Color.class, Color.BLACK, jsonData);
+                    parameter.borderStraight = json.readValue("borderStraight", boolean.class, false, jsonData);
+                    parameter.shadowOffsetX = json.readValue("shadowOffsetX", int.class, 0, jsonData);
+                    parameter.shadowOffsetY = json.readValue("shadowOffsetY", int.class, 0, jsonData);
+                    parameter.shadowColor = json.readValue("shadowColor", Color.class, Color.BLACK, jsonData);
+                    if (parameter.incremental)
+                        parameter.characters = "";
+
+                    ArrayList<String> fallbacksFonts = json.readValue("fallbacks", ArrayList.class, String.class, jsonData);
+
+                    // parameter.hinting = Hinting.Medium;
+                    // parameter.mono = false;
+
+                    if (fallbacksFonts == null) {
+                        font = generator.generateFont(parameter);
+                    } else {
+                        MultiFontBitmapFontData data = new MultiFontBitmapFontData();
+                        data.createPacker(parameter);
+                        font = generator.generateFont(parameter, data);
+
+                        FreeTypeFontParameter parameterFB = new FreeTypeFontParameter();
+                        parameterFB.size = parameter.size;
+                        parameterFB.color = parameter.color;
+                        parameterFB.incremental = true;
+                        parameterFB.borderWidth = parameter.borderWidth;
+                        parameterFB.borderColor = parameter.borderColor;
+                        parameterFB.borderStraight = parameter.borderStraight;
+                        parameterFB.shadowOffsetX = parameter.shadowOffsetX;
+                        parameterFB.shadowOffsetY = parameter.shadowOffsetY;
+                        parameterFB.shadowColor = parameter.shadowColor;
+                        parameterFB.characters = "";
+
+                        for (String filename : fallbacksFonts) {
+                            FileHandle file = skinFile.parent().child(filename);
+
+                            if (!FileUtils.exists(file))
+                                file = Gdx.files.internal(path);
+
+                            if (!FileUtils.exists(file))
+                                throw new SerializationException("Font file not found: " + file);
+
+                            data.addFallBackFont(file, parameterFB);
+                        }
+                    }
+
+                    EngineLogger.debug(path + " TIME (ms): " + (System.currentTimeMillis() - initTime));
+
+                    if (fontGenerators == null)
+                        fontGenerators = new ArrayList<>();
+
+                    fontGenerators.add(generator);
+
+                } else {
+
+                    // Use a region with the same name as the font, else use a
+                    // PNG file in the same directory as the FNT file.
+                    String regionName = fontFile.nameWithoutExtension();
+                    try {
+                        TextureRegion region = skin.optional(regionName, TextureRegion.class);
+                        if (region != null)
+                            font = new BitmapFont(fontFile, region, flip);
+                        else {
+                            FileHandle imageFile = fontFile.parent().child(regionName + ".png");
+                            if (FileUtils.exists(imageFile))
+                                font = new BitmapFont(fontFile, imageFile, flip);
+                            else
+                                font = new BitmapFont(fontFile, flip);
+                        }
+                        // Scaled size is the desired cap height to scale the
+                        // font to.
+                        if (scaledSize != -1)
+                            font.getData().setScale(scaledSize / font.getCapHeight());
+                        else if (size != -1) // TODO set size in points (dpi
+                            // independent)
+                            font.getData().setScale(
+                                    (DPIUtils.dpToPixels(size) * DPIUtils.getSizeMultiplier()) / font.getCapHeight());
+                    } catch (RuntimeException ex) {
+                        throw new SerializationException("Error loading bitmap font: " + fontFile, ex);
+                    }
+                }
+
+                font.getData().markupEnabled = true;
+
+                return font;
+            }
+        });
+
+        json.setSerializer(AnimationDrawable.class, new ReadOnlySerializer<AnimationDrawable>() {
+            @Override
+            public AnimationDrawable read(Json json, JsonValue jsonData, @SuppressWarnings("rawtypes") Class type) {
+                String name = json.readValue("name", String.class, jsonData);
+                float duration = json.readValue("duration", Float.class, 1f, jsonData);
+                PlayMode playMode = json.readValue("play_mode", PlayMode.class, PlayMode.LOOP, jsonData);
+
+                Array<AtlasRegion> regions = getAtlas().findRegions(name);
+
+                if (regions.size == 0)
+                    throw new SerializationException("AnimationDrawable not found: " + name);
+
+                Animation<AtlasRegion> a = new Animation<>(duration / regions.size, regions, playMode);
+                AnimationDrawable drawable = new AnimationDrawable(a);
+
+                if (drawable instanceof BaseDrawable) {
+                    BaseDrawable named = drawable;
+                    named.setName(jsonData.name + " (" + name + ", " + duration + ")");
+                }
+
+                return drawable;
+            }
+        });
+
+        json.addClassTag("AnimationDrawable", AnimationDrawable.class);
+
+        return json;
+    }
+
+    public void addStyleTag(Class<?> tag) {
+        getJsonClassTags().put(tag.getSimpleName(), tag);
+    }
+
+    @Override
+    public Drawable newDrawable(Drawable drawable) {
+        if (drawable instanceof AnimationDrawable)
+            return new AnimationDrawable((AnimationDrawable) drawable);
+        return super.newDrawable(drawable);
+    }
+
+    @Override
+    public Drawable newDrawable(Drawable drawable, Color tint) {
+        Drawable newDrawable;
+        if (drawable instanceof AnimationDrawable) {
+            newDrawable = ((AnimationDrawable) drawable).tint(tint);
+            ((BaseDrawable) newDrawable).setName(((BaseDrawable) drawable).getName() + " (" + tint + ")");
+
+            return newDrawable;
+        }
+
+        return super.newDrawable(drawable, tint);
+    }
+
+    @Override
+    public void dispose() {
+        super.dispose();
+
+        if (fontGenerators == null)
+            return;
+        
+        for (FreeTypeFontGenerator generator : fontGenerators) {
+            generator.dispose();
+        }
+
+        fontGenerators.clear();
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/CreditsScreen.java b/blade-engine/src/com/bladecoder/engine/ui/CreditsScreen.java
index 755d0cbbc..b13354913 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/CreditsScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/CreditsScreen.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,65 +21,91 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
+import com.badlogic.gdx.Application.ApplicationType;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
+import com.badlogic.gdx.InputAdapter;
 import com.badlogic.gdx.InputProcessor;
+import com.badlogic.gdx.ScreenAdapter;
 import com.badlogic.gdx.audio.Music;
+import com.badlogic.gdx.controllers.Controller;
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.Texture.TextureFilter;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.viewport.ScreenViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
 import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.ui.UI.Screens;
+import com.bladecoder.engine.ui.defaults.ScreenControllerHandler;
+import com.bladecoder.engine.util.DPIUtils;
 import com.bladecoder.engine.util.EngineLogger;
-import com.bladecoder.engine.util.TextUtils;
 
-public class CreditsScreen implements BladeScreen, InputProcessor {
-
-	private final static String CREDITS_FILENAME = "ui/credits";
-	private static final String FONT_TITLE_STYLE = "credits-title";
-	private static final String FONT_STYLE = "credits";
-	private static final float SPEED = 40; // px/sec.
+public class CreditsScreen extends ScreenAdapter implements BladeScreen {
+	private static final String CREDITS_FILENAME = "ui/credits";
+	private static final float SPEED = 10 * DPIUtils.getSpacing(); // px/sec.
 
 	// title and texts pair sequence
-	private List<String> credits = new ArrayList<String>();
+	private final List<String> credits = new ArrayList<>();
 
-	private BitmapFont creditsFont;
-	private BitmapFont titlesFont;
+	private CreditScreenStyle style;
 
 	private int stringHead = 0;
-	private float scrollY = 0; 
+	private float scrollY = 0;
 
 	private UI ui;
 
 	private Music music;
-	
-	private final HashMap<String, Texture> images = new HashMap<String, Texture>();
-	
+
+	private final Map<String, Texture> images = new HashMap<>();
+
 	private Viewport viewport;
 
-	public CreditsScreen() {
-	}
+	private final GlyphLayout layout = new GlyphLayout();
+
+	private ScreenControllerHandler controller;
+
+	private final InputProcessor inputProcessor = new InputAdapter() {
+		@Override
+		public boolean keyUp(int keycode) {
+			if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK)
+				ui.setCurrentScreen(Screens.MENU_SCREEN);
+
+			return true;
+		}
+
+		@Override
+		public boolean touchUp(int screenX, int screenY, int pointer, int button) {
+			ui.setCurrentScreen(Screens.MENU_SCREEN);
+			return true;
+		}
+	};
 
 	@Override
-	public void render(float delta) {		
-		SpriteBatch batch = ui.getBatch();
-		int width = (int)viewport.getWorldWidth();
-		int height = (int)viewport.getWorldHeight();
-		
-		Gdx.gl.glClearColor(0, 0, 0, 1);			
+	public void render(float delta) {
+		final SpriteBatch batch = ui.getBatch();
+		final int width = (int) viewport.getWorldWidth();
+		final int height = (int) viewport.getWorldHeight();
+
+		Gdx.gl.glClearColor(0, 0, 0, 1);
 		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
 
 		batch.setProjectionMatrix(viewport.getCamera().combined);
-		batch.begin();	
-		
-		scrollY+= delta * SPEED * EngineAssetManager.getInstance().getScale();
-		
+		batch.begin();
+
+		if (style.background != null) {
+			style.background.draw(batch, 0, 0, width, height);
+		}
+
+		scrollY += delta * SPEED * EngineAssetManager.getInstance().getScale();
+
 		float y = scrollY;
 
 		if (stringHead >= credits.size())
@@ -87,129 +113,184 @@ public void render(float delta) {
 
 		for (int i = stringHead; i < credits.size(); i++) {
 			String s = credits.get(i);
-			
-			char type = 'c'; // types are 'c' -> credit, 't' -> title, 'i' -> image, 's' -> space, 'm' -> music
-			
-			if(s.indexOf('#') != -1 ) {
+
+			char type = 'c'; // types are 'c' -> credit, 't' -> title, 'i' -> image, 's' -> space, 'm' ->
+								// music
+
+			if (s.indexOf('#') != -1) {
 				type = s.charAt(0);
 				s = s.substring(2);
 			}
-			
-			if(type == 't') {				
-				y -= titlesFont.getLineHeight() * 2;
-				
-				TextUtils.drawCenteredScreenX(batch, titlesFont, s, y, width);
-				y -= titlesFont.getLineHeight();
-				
-				if (y > height + titlesFont.getLineHeight()) {
-					stringHead = i + 1;
-					scrollY -= titlesFont.getLineHeight();
-					scrollY -= titlesFont.getLineHeight() * 2;
-				}
-			} else if(type == 'i') {
-				Texture img = images.get(s);
-				batch.draw(img, (width - img.getWidth()) / 2, y -  img.getHeight());
-				
-				y -= img.getHeight();
-				
-				if (y > height) {
-					stringHead = i + 1;
-					scrollY -=  img.getHeight();
-				}
-			} else if(type == 's') {
-				int space =(int) (Integer.valueOf(s) * EngineAssetManager.getInstance().getScale());
-				y -= space;
-				
-				if (y -  space > height) {
-					stringHead = i + 1;
-					scrollY -= space;
-				}
-			} else if(type == 'm') {
-				if(music != null)
-					music.dispose();
-				
-				music = Gdx.audio.newMusic(EngineAssetManager.getInstance().getAsset("music/" + s));
-				music.play();
-			} else {
-				TextUtils.drawCenteredScreenX(batch, creditsFont, s, y, width);
-				y -= creditsFont.getLineHeight();
-				
-				if (y > height + creditsFont.getLineHeight()) {
-					stringHead = i + 1;
-					scrollY -= creditsFont.getLineHeight();
-				}
+
+			switch (type) {
+			case 't':
+				y = processCreditTitle(batch, width, height, y, i, s);
+				break;
+			case 'i':
+				y = processCreditImage(batch, width, height, y, i, s);
+				break;
+			case 's':
+				y = processCreditSpace(height, y, i, s);
+				break;
+			case 'm':
+				processCreditMusic(s);
+				credits.remove(i);
+				i--;
+				break;
+			default:
+				y = processCreditDefault(batch, width, height, y, i, s);
+				break;
 			}
-			
-			if(y < 0) {
+
+			if (y < 0) {
 				break;
 			}
 		}
 
-		ui.getPointer().draw(batch, viewport);
-		
 		batch.end();
+
+		controller.update(delta);
+	}
+
+	private float processCreditTitle(SpriteBatch batch, int width, int height, float y, int i, String s) {
+		final float lineHeight = style.titleFont.getLineHeight();
+		y -= lineHeight * 2;
+
+		drawCenteredScreenX(batch, style.titleFont, s, y, width);
+		y -= lineHeight;
+
+		if (y > height + lineHeight) {
+			stringHead = i + 1;
+			scrollY -= lineHeight;
+			scrollY -= lineHeight * 2;
+		}
+		return y;
+	}
+
+	private float processCreditImage(SpriteBatch batch, int width, int height, float y, int i, String s) {
+		Texture img = images.get(s);
+		final int lineHeight = img.getHeight();
+		batch.draw(img, (width - img.getWidth()) / 2, y - lineHeight);
+
+		y -= lineHeight;
+
+		if (y > height) {
+			stringHead = i + 1;
+			scrollY -= lineHeight;
+		}
+		return y;
+	}
+
+	private float processCreditSpace(int height, float y, int i, String s) {
+		int lineHeight = (int) (Integer.valueOf(s) * EngineAssetManager.getInstance().getScale());
+		y -= lineHeight;
+
+		if (y > height) {
+			stringHead = i + 1;
+			scrollY -= lineHeight;
+		}
+		return y;
+	}
+
+	private void processCreditMusic(final String s) {
+		if (music != null)
+			music.dispose();
+
+		final String file = EngineAssetManager.getInstance().checkIOSSoundName("music/" + s);
+
+		new Thread() {
+			@Override
+			public void run() {
+				music = Gdx.audio.newMusic(EngineAssetManager.getInstance().getAsset(file));
+
+				try {
+					music.play();
+					music.setVolume(0.5f);
+				} catch (Exception e) {
+
+					// DEAL WITH OPENAL BUG
+					if (Gdx.app.getType() == ApplicationType.Desktop && e.getMessage().contains("40963")) {
+						EngineLogger.debug("!!!!!!!!!!!!!!!!!!!!!!!ERROR playing music trying again...!!!!!!!!!!!!!!!");
+
+						music = Gdx.audio.newMusic(EngineAssetManager.getInstance().getAsset(file));
+						music.play();
+						music.setVolume(0.5f);
+
+						return;
+					}
+
+					EngineLogger.error("Error Playing music: " + file);
+				}
+			}
+		}.start();
+	}
+
+	private float processCreditDefault(SpriteBatch batch, int width, int height, float y, int i, String s) {
+		drawCenteredScreenX(batch, style.font, s, y, width);
+
+		final float lineHeight = style.font.getLineHeight();
+		y -= lineHeight;
+
+		if (y > height + lineHeight) {
+			stringHead = i + 1;
+			scrollY -= lineHeight;
+		}
+		return y;
 	}
 
 	@Override
-	public void resize(int width, int height) {		
+	public void resize(int width, int height) {
 		viewport.update(width, height, true);
 	}
 
 	@Override
 	public void dispose() {
-		
-		for(Texture t:images.values())
+		for (Texture t : images.values())
 			t.dispose();
-		
+
 		images.clear();
 		credits.clear();
-		
-		if(music != null) {
+
+		if (music != null) {
 			music.stop();
 			music.dispose();
+			music = null;
 		}
-			
 	}
 
-	private void retrieveAssets(TextureAtlas atlas) {
-		titlesFont = ui.getSkin().getFont(FONT_TITLE_STYLE);
-		creditsFont = ui.getSkin().getFont(FONT_STYLE);
+	private void retrieveAssets() {
+		style = ui.getSkin().get(CreditScreenStyle.class);
 
-		Locale locale = Locale.getDefault();
+		final Locale locale = Locale.getDefault();
 
-		String localeFilename = MessageFormat.format("{0}_{1}.txt", CREDITS_FILENAME,
-				locale.getLanguage());
+		String localeFilename = MessageFormat.format("{0}_{1}.txt", CREDITS_FILENAME, locale.getLanguage());
 
 		if (!EngineAssetManager.getInstance().assetExists(localeFilename))
 			localeFilename = MessageFormat.format("{0}.txt", CREDITS_FILENAME);
 
-		BufferedReader reader = EngineAssetManager.getInstance().getAsset(localeFilename)
-				.reader(4096, "utf-8");
+		BufferedReader reader = EngineAssetManager.getInstance().getAsset(localeFilename).reader(4096, "utf-8");
 
 		try {
-			String line = null;
+			String line;
 			while ((line = reader.readLine()) != null) {
 				credits.add(line);
 			}
 		} catch (Exception e) {
 			EngineLogger.error(e.getMessage());
-			
+
 			ui.setCurrentScreen(Screens.MENU_SCREEN);
 		}
-		
-		scrollY += titlesFont.getLineHeight();
-		
+
+		scrollY += style.titleFont.getLineHeight();
+
 		// Load IMAGES
-		for (int i = 0; i < credits.size(); i++) {
-			String s = credits.get(i);
-			
-			
-			if(s.indexOf('#') != -1 && s.charAt(0) == 'i') {
+		for (String s : credits) {
+			if (s.indexOf('#') != -1 && s.charAt(0) == 'i') {
 				s = s.substring(2);
-				
+
 				Texture tex = new Texture(EngineAssetManager.getInstance().getResAsset("ui/" + s));
 				tex.setFilter(TextureFilter.Linear, TextureFilter.Linear);
-				
+
 				images.put(s, tex);
 			}
 		}
@@ -217,75 +298,72 @@ private void retrieveAssets(TextureAtlas atlas) {
 
 	@Override
 	public void show() {
-		retrieveAssets(ui.getUIAtlas());
-		Gdx.input.setInputProcessor(this);
-		
+		retrieveAssets();
+		Gdx.input.setInputProcessor(inputProcessor);
+
 //		int wWidth = EngineAssetManager.getInstance().getResolution().portraitWidth;
 //		int wHeight = EngineAssetManager.getInstance().getResolution().portraitHeight;
-		
+
 //		viewport = new ExtendViewport(wWidth, wHeight);
 		viewport = new ScreenViewport();
-	}
 
-	@Override
-	public void hide() {
-		dispose();
-	}
+		stringHead = 0;
+		scrollY = 0;
 
-	@Override
-	public void pause() {		
-	}
+		controller = new ScreenControllerHandler(ui, null, viewport) {
+			@Override
+			protected boolean buttonUp(Controller controller, int buttonCode) {
 
-	@Override
-	public void resume() {
-	}
+				ui.setCurrentScreen(Screens.MENU_SCREEN);
 
-	@Override
-	public boolean keyDown(int keycode) {		
-		return false;
+				return true;
+			}
+		};
 	}
 
 	@Override
-	public boolean keyUp(int keycode) {
-		if (keycode == Input.Keys.ESCAPE
-				|| keycode == Input.Keys.BACK)
-			ui.setCurrentScreen(Screens.MENU_SCREEN);		
-		return false;
+	public void hide() {
+		dispose();
 	}
 
 	@Override
-	public boolean keyTyped(char character) {	
-		return false;
+	public void setUI(UI ui) {
+		this.ui = ui;
 	}
 
-	@Override
-	public boolean touchDown(int screenX, int screenY, int pointer, int button) {
-		return false;
-	}
+	public void drawCenteredScreenX(SpriteBatch batch, BitmapFont font, CharSequence str, float y, int viewportWidth) {
+		float x = 0;
 
-	@Override
-	public boolean touchUp(int screenX, int screenY, int pointer, int button) {
-		ui.setCurrentScreen(Screens.MENU_SCREEN);
-		return true;
-	}
+		layout.setText(font, str, Color.WHITE, viewportWidth, Align.center, true);
 
-	@Override
-	public boolean touchDragged(int screenX, int screenY, int pointer) {
-		return false;
-	}
+		// x = (viewportWidth - layout.width)/2;
 
-	@Override
-	public boolean mouseMoved(int screenX, int screenY) {
-		return false;
+		font.draw(batch, layout, x, y);
 	}
 
-	@Override
-	public boolean scrolled(int amount) {
-		return false;
-	}
+	/**
+	 * The style for the CreditsScreen
+	 */
+	public static class CreditScreenStyle {
+		/**
+		 * Optional.
+		 */
+		public Drawable background;
+		/**
+		 * if 'bg' not specified try to load the bgFile
+		 */
+		public String bgFile;
+		public BitmapFont titleFont;
+		public BitmapFont font;
+
+		public CreditScreenStyle() {
+		}
 
-	@Override
-	public void setUI(UI ui) {
-		this.ui = ui;
+		public CreditScreenStyle(CreditScreenStyle style) {
+			background = style.background;
+			bgFile = style.bgFile;
+			titleFont = style.titleFont;
+			font = style.font;
+		}
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/DebugDrawer.java b/blade-engine/src/com/bladecoder/engine/ui/DebugDrawer.java
new file mode 100644
index 000000000..5cbee2938
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/DebugDrawer.java
@@ -0,0 +1,122 @@
+package com.bladecoder.engine.ui;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.bladecoder.engine.model.AnchorActor;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engine.util.RectangleRenderer;
+
+public class DebugDrawer {
+
+	private final Skin skin;
+	private final World w;
+	private final Viewport viewport;
+	private final StringBuilder sbTmp = new StringBuilder();
+	private final Vector3 unprojectTmp = new Vector3();
+	private final GlyphLayout textLayout = new GlyphLayout();
+
+	public DebugDrawer(World w, Skin skin, Viewport viewport) {
+		this.w = w;
+		this.skin = skin;
+		this.viewport = viewport;
+	}
+
+	public void draw(SpriteBatch batch) {
+
+		w.getSceneCamera().getInputUnProject(viewport, unprojectTmp);
+
+		Color color;
+
+		sbTmp.setLength(0);
+
+		if (EngineLogger.lastError != null) {
+			// sbTmp.append(EngineLogger.lastError);
+			sbTmp.append(EngineLogger.errorBuffer);
+
+			color = Color.RED;
+		} else {
+
+			// sbTmp.append(" Density:");
+			// sbTmp.append(Gdx.graphics.getDensity());
+			// sbTmp.append(" UI Multiplier:");
+			// sbTmp.append(DPIUtils.getSizeMultiplier());
+			sbTmp.append(" ");
+
+			long millis = w.getTimeOfGame();
+			long second = (millis / 1000) % 60;
+			long minute = (millis / (1000 * 60)) % 60;
+			long hour = (millis / (1000 * 60 * 60));
+
+			String time = String.format("%02d:%02d:%02d", hour, minute, second);
+
+			sbTmp.append(time);
+
+			if (EngineLogger.getDebugLevel() == EngineLogger.DEBUG1) {
+				if (w.inCutMode()) {
+					sbTmp.append(" CUT_MODE ");
+				} else if (w.hasDialogOptions()) {
+					sbTmp.append(" DIALOG_MODE ");
+				} else if (w.isPaused()) {
+					sbTmp.append(" PAUSED ");
+				}
+
+				sbTmp.append(" ( ");
+				sbTmp.append((int) unprojectTmp.x);
+				sbTmp.append(", ");
+				sbTmp.append((int) unprojectTmp.y);
+				sbTmp.append(") FPS:");
+				sbTmp.append(Gdx.graphics.getFramesPerSecond());
+
+				if (w.getCurrentScene().getState() != null) {
+					sbTmp.append(" Scn State: ");
+					sbTmp.append(w.getCurrentScene().getState());
+				}
+
+				if (w.getCurrentScene().getPlayer() != null) {
+					sbTmp.append(" Depth Scl: ");
+					sbTmp.append(w.getCurrentScene().getFakeDepthScale(unprojectTmp.y));
+				}
+			}
+
+			color = Color.WHITE;
+		}
+
+		String strDebug = sbTmp.toString();
+
+		textLayout.setText(skin.getFont("debug"), strDebug, color, viewport.getScreenWidth(), Align.left, true);
+		RectangleRenderer.draw(batch, 0, viewport.getScreenHeight() - textLayout.height - 10, textLayout.width,
+				textLayout.height + 10, Color.BLACK);
+		skin.getFont("debug").draw(batch, textLayout, 0, viewport.getScreenHeight() - 5);
+
+		// Draw actor states when debug
+		if (EngineLogger.getDebugLevel() == EngineLogger.DEBUG1) {
+
+			for (BaseActor a : w.getCurrentScene().getActors().values()) {
+
+				if (a instanceof AnchorActor)
+					continue;
+
+				Rectangle r = a.getBBox().getBoundingRectangle();
+				sbTmp.setLength(0);
+				sbTmp.append(a.getId());
+				if (a instanceof InteractiveActor && ((InteractiveActor) a).getState() != null)
+					sbTmp.append(".").append(((InteractiveActor) a).getState());
+
+				unprojectTmp.set(r.getX(), r.getY(), 0);
+				w.getSceneCamera().scene2screen(viewport, unprojectTmp);
+				skin.getFont("debug").draw(batch, sbTmp.toString(), unprojectTmp.x, unprojectTmp.y);
+			}
+
+		}
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/DebugScreen.java b/blade-engine/src/com/bladecoder/engine/ui/DebugScreen.java
index 0405b321e..977de190e 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/DebugScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/DebugScreen.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,218 +15,453 @@
  ******************************************************************************/
 package com.bladecoder.engine.ui;
 
-import java.util.ArrayList;
-
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.InputListener;
 import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.Container;
+import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
 import com.badlogic.gdx.scenes.scene2d.ui.SelectBox;
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.scenes.scene2d.ui.TextField;
-import com.badlogic.gdx.scenes.scene2d.utils.Align;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.viewport.ScreenViewport;
 import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.ui.UI.Screens;
+import com.bladecoder.engine.ui.defaults.ScreenControllerHandler;
+import com.bladecoder.engine.util.Config;
 import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.EngineLogger;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
 
 public class DebugScreen implements BladeScreen {
-	private UI ui;
-
-	private Stage stage;
-
-	private TextField speedText;
-	SelectBox<String> recordings;
-	SelectBox<String> scenes;
-
-	public DebugScreen() {
-	}
-
-	@Override
-	public void render(float delta) {
-		Gdx.gl.glClearColor(0, 0, 0, 1);
-		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-
-		stage.act(delta);
-		stage.draw();
-
-		ui.getBatch().setProjectionMatrix(stage.getViewport().getCamera().combined);
-		ui.getBatch().begin();
-		ui.getPointer().draw(ui.getBatch(), stage.getViewport());
-		ui.getBatch().end();
-	}
-
-	@Override
-	public void resize(int width, int height) {
-		stage.getViewport().update(width, height, true);
-	}
-
-	@Override
-	public void dispose() {
-		stage.dispose();
-		stage = null;
-	}
-
-	@Override
-	public void show() {
-
-		stage = new Stage(new ScreenViewport());
-
-		Table table = new Table(ui.getSkin());
-		table.setFillParent(true);
-		table.center();
-
-		table.addListener(new InputListener() {
-			@Override
-			public boolean keyUp(InputEvent event, int keycode) {
-				if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK)
-					ui.setCurrentScreen(Screens.MENU_SCREEN);
-				return true;
-			}
-		});
-
-		stage.setKeyboardFocus(table);
-
-		Label title = new Label("DEBUG SCREEN", ui.getSkin(), "title");
-
-		table.add(title).padBottom(DPIUtils.getMarginSize() * 2).colspan(3);
-
-		// ------------- SPEED
-		speedText = new TextField(Float.toString(((SceneScreen) ui.getScreen(Screens.SCENE_SCREEN)).getSpeed()),
-				ui.getSkin());
-		TextButton speedButton = new TextButton("Set Speed", ui.getSkin());
-		speedButton.addListener(new ClickListener() {
-
-			public void clicked(InputEvent event, float x, float y) {
-				SceneScreen scnScr = (SceneScreen) ui.getScreen(Screens.SCENE_SCREEN);
-				scnScr.setSpeed(Float.parseFloat(speedText.getText()));
-			}
-		});
-		
-		speedButton.pad(2,3,2,3);
-		table.row().pad(5).align(Align.left);
-		table.add("Game Speed: ");
-		table.add(speedText);
-		table.add(speedButton);
-
-		// ------------- RECORDING
-
-		Recorder r = ((SceneScreen) ui.getScreen(Screens.SCENE_SCREEN)).getRecorder();
-		TextButton play = new TextButton(r.isPlaying() ? "Stop" : "Play", ui.getSkin());
-		TextButton rec = new TextButton(r.isRecording() ? "Stop Rec" : "Rec", ui.getSkin());
-		play.addListener(new ClickListener() {
-
-			public void clicked(InputEvent event, float x, float y) {
-				SceneScreen scnScr = (SceneScreen) ui.getScreen(Screens.SCENE_SCREEN);
-				Recorder r = scnScr.getRecorder();
-
-				if (!r.isPlaying()) {
-					r.load(recordings.getSelected());
-					r.setPlaying(true);
-					ui.setCurrentScreen(Screens.SCENE_SCREEN);
-				} else {
-					r.setPlaying(false);
-					ui.setCurrentScreen(Screens.MENU_SCREEN);
-				}
-			}
-		});
-
-		rec.addListener(new ClickListener() {
-
-			public void clicked(InputEvent event, float x, float y) {
-				SceneScreen scnScr = (SceneScreen) ui.getScreen(Screens.SCENE_SCREEN);
-				Recorder r = scnScr.getRecorder();
-
-				if (r.isPlaying()) {
-					r.setPlaying(false);
-				}
-
-				r.setRecording(!r.isRecording());
-			}
-		});
-
-		recordings = new SelectBox<String>(ui.getSkin());
-		
-		String[] testFiles = EngineAssetManager.getInstance().listAssetFiles("/tests");
-		ArrayList<String> al = new ArrayList<String>();
-		
-		for(String file:testFiles)
-			if(file.endsWith(".verbs.rec"))
-				al.add(file.substring(0,file.indexOf(".verbs.rec")));
-		
-		recordings.setItems(al.toArray(new String[al.size()]));
-		
-		play.pad(2,3,2,3);
-		rec.pad(2,3,2,3);
-
-		table.row().pad(5).align(Align.left);
-		table.add("Game Recording: ");
-		table.add(recordings);
-		table.add(play);
-		table.add(rec);
-
-		// ------------- SCENES
-		TextButton go = new TextButton("Go", ui.getSkin());
-		go.addListener(new ClickListener() {
-
-			public void clicked(InputEvent event, float x, float y) {
-				World.getInstance().setCurrentScene(scenes.getSelected());
-				ui.setCurrentScreen(Screens.SCENE_SCREEN);
-			}
-		});
-		
-		go.pad(2,3,2,3);
-
-		scenes = new SelectBox<String>(ui.getSkin());
-		scenes.setItems(World.getInstance().getScenes().keySet().toArray(new String[World.getInstance().getScenes().size()]));
-
-		table.row().pad(5).align(Align.left);
-		table.add("Go to Scene: ");
-		table.add(scenes);
-		table.add(go);
-
-		// ------------- BACK BUTTON
-
-		TextButton back = new TextButton("Back", ui.getSkin());
-		back.addListener(new ClickListener() {
-			public void clicked(InputEvent event, float x, float y) {
-				ui.setCurrentScreen(Screens.MENU_SCREEN);
-			}
-		});
-		
-		back.pad(4,4,4,4);
-
-		table.row().pad(5);
-		table.add(back).colspan(3);
-
-		table.pack();
-
-		stage.addActor(table);
-
-		Gdx.input.setInputProcessor(stage);
-	}
-
-	@Override
-	public void hide() {
-		dispose();
-	}
-
-	@Override
-	public void pause() {
-	}
-
-	@Override
-	public void resume() {
-	}
-
-	@Override
-	public void setUI(UI ui) {
-		this.ui = ui;
-	}
+    private UI ui;
+
+    private Stage stage;
+
+    private TextField speedText;
+    private SelectBox<String> recordings;
+    private SelectBox<String> scenes;
+    private TextField recFilename;
+    private TextButton rec;
+
+    private TextField testerTimeConf;
+    private TextField inSceneTimeConf;
+    private TextField testerExcludeList;
+
+    private Pointer pointer;
+
+    private ScreenControllerHandler controller;
+
+    public DebugScreen() {
+    }
+
+    @Override
+    public void render(float delta) {
+        Gdx.gl.glClearColor(0, 0, 0, 1);
+        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+
+        stage.act(delta);
+        stage.draw();
+
+        controller.update(delta);
+    }
+
+    @Override
+    public void resize(int width, int height) {
+        stage.getViewport().update(width, height, true);
+        pointer.resize();
+        table.invalidate();
+    }
+
+    @Override
+    public void dispose() {
+        if (stage != null) {
+            stage.dispose();
+            stage = null;
+        }
+    }
+
+    Table table;
+
+    @Override
+    public void show() {
+        float size = DPIUtils.getPrefButtonSize();
+        float margin = DPIUtils.getMarginSize();
+
+        stage = new Stage(new ScreenViewport());
+
+        table = new Table(ui.getSkin());
+        table.setFillParent(true);
+        table.left().top();
+        table.pad(margin);
+
+        table.addListener(new InputListener() {
+            @Override
+            public boolean keyUp(InputEvent event, int keycode) {
+                if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK)
+                    ui.setCurrentScreen(Screens.SCENE_SCREEN);
+                return true;
+            }
+        });
+
+        stage.setKeyboardFocus(table);
+        controller = new ScreenControllerHandler(ui, stage, stage.getViewport());
+
+        Button back = new Button(ui.getSkin(), "back");
+
+        back.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                ui.setCurrentScreen(Screens.SCENE_SCREEN);
+            }
+        });
+
+        Label title = new Label("DEBUG SCREEN", ui.getSkin(), "title");
+
+        Table header = new Table();
+        header.padBottom(margin);
+        Container<Button> cont = new Container<>(back);
+        cont.size(size);
+        header.add(cont);
+        header.add(title).fillX().expandX().left();
+        table.add(header).colspan(3).fillX().expandX().left();
+
+        // ------------- SPEED
+        speedText = new TextField(Float.toString(((SceneScreen) ui.getScreen(Screens.SCENE_SCREEN)).getSpeed()),
+                ui.getSkin());
+        TextButton speedButton = new TextButton("Set Speed", ui.getSkin());
+        speedButton.addListener(new ClickListener() {
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                SceneScreen scnScr = (SceneScreen) ui.getScreen(Screens.SCENE_SCREEN);
+                scnScr.setSpeed(Float.parseFloat(speedText.getText()));
+            }
+        });
+
+        speedButton.pad(2, 3, 2, 3);
+        HorizontalGroup sGroup = new HorizontalGroup();
+        sGroup.space(10);
+        sGroup.addActor(speedText);
+        sGroup.addActor(speedButton);
+
+        table.row().pad(5).align(Align.left);
+        table.add(new Label("Game Speed: ", ui.getSkin(), "debug"));
+        table.add(sGroup);
+
+        // ------------- RECORDING
+
+        final Recorder r = ui.getRecorder();
+        TextButton play = new TextButton(r.isPlaying() ? "Stop" : "Play", ui.getSkin());
+        rec = new TextButton(r.isRecording() ? "Stop Rec" : "Rec", ui.getSkin());
+        play.addListener(new ClickListener() {
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                final Recorder r = ui.getRecorder();
+
+                if (!r.isPlaying()) {
+                    r.setFilename(recordings.getSelected());
+                    r.load();
+                    r.setPlaying(true);
+                    ui.setCurrentScreen(Screens.SCENE_SCREEN);
+                } else {
+                    r.setPlaying(false);
+                    ui.setCurrentScreen(Screens.SCENE_SCREEN);
+                }
+            }
+        });
+
+        rec.addListener(new ClickListener() {
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                final Recorder r = ui.getRecorder();
+
+                if (r.isPlaying()) {
+                    r.setPlaying(false);
+                }
+
+                if (!r.isRecording())
+                    r.setFilename(recFilename.getText());
+
+                r.setRecording(!r.isRecording());
+                rec.setText(r.isRecording() ? "Stop Rec" : "Rec");
+
+                if (r.isRecording())
+                    ui.setCurrentScreen(Screens.SCENE_SCREEN);
+            }
+        });
+
+        recordings = new SelectBox<>(ui.getSkin());
+
+        String[] testFiles = EngineAssetManager.getInstance().listAssetFiles("tests");
+        ArrayList<String> al = new ArrayList<>();
+
+        for (String file : testFiles)
+            if (file.endsWith(Recorder.RECORD_EXT))
+                al.add(file.substring(0, file.indexOf(Recorder.RECORD_EXT)));
+
+        FileHandle[] testFiles2 = EngineAssetManager.getInstance().getUserFolder().list();
+
+        for (FileHandle file : testFiles2)
+            if (file.name().endsWith(Recorder.RECORD_EXT))
+                al.add(file.name().substring(0, file.name().indexOf(Recorder.RECORD_EXT)));
+
+        recordings.setItems(al.toArray(new String[al.size()]));
+
+        play.pad(2, 3, 2, 3);
+        rec.pad(2, 3, 2, 3);
+
+        recFilename = new TextField(r.getFileName(), ui.getSkin());
+
+        HorizontalGroup rGroup = new HorizontalGroup();
+        rGroup.space(10);
+        rGroup.addActor(recordings);
+        rGroup.addActor(play);
+        rGroup.addActor(new Label("Rec. Filename", ui.getSkin(), "debug"));
+        rGroup.addActor(recFilename);
+        rGroup.addActor(rec);
+
+        table.row().pad(5).align(Align.left);
+        table.add(new Label("Game Recording: ", ui.getSkin(), "debug"));
+        table.add(rGroup);
+
+        // ------------- LOAD CHAPTER
+        table.row().pad(5).align(Align.left);
+        table.add(new Label("Load Chapter: ", ui.getSkin(), "debug"));
+
+        HorizontalGroup chGroup = new HorizontalGroup();
+        chGroup.space(10);
+
+        final TextField chapter = new TextField("", ui.getSkin());
+        chGroup.addActor(chapter);
+
+        TextButton loadButton = new TextButton("Load", ui.getSkin());
+        loadButton.addListener(new ClickListener() {
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                String c = chapter.getText();
+
+                if (!c.isEmpty()) {
+                    try {
+                        ui.getWorld().getSerializer().loadChapter(c, null, true);
+                        ui.setCurrentScreen(Screens.SCENE_SCREEN);
+                    } catch (IOException e) {
+                        EngineLogger.error("Loading chapter.", e);
+                    }
+                }
+            }
+        });
+
+        chGroup.addActor(loadButton);
+
+        table.add(chGroup);
+
+        // ------------- SCENES
+        final TextButton testScene = new TextButton("Run Test Verb", ui.getSkin(), "toggle");
+        final TextButton initScene = new TextButton("Init", ui.getSkin(), "toggle");
+
+        initScene.setChecked(true);
+
+        TextButton go = new TextButton("Go", ui.getSkin());
+        go.addListener(new ClickListener() {
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                ui.getWorld().setCutMode(false);
+                ui.getWorld().resume();
+
+                if (testScene.isChecked())
+                    ui.getWorld().setTestScene(scenes.getSelected());
+
+                ui.getWorld().setCurrentScene(scenes.getSelected(), initScene.isChecked(), null);
+                ui.setCurrentScreen(Screens.SCENE_SCREEN);
+            }
+        });
+
+        go.pad(2, 3, 2, 3);
+
+        scenes = new SelectBox<>(ui.getSkin());
+        String[] scnArray = ui.getWorld().getScenes().keySet().toArray(new String[0]);
+        Arrays.sort(scnArray);
+        scenes.setItems(scnArray);
+
+        HorizontalGroup scGroup = new HorizontalGroup();
+        scGroup.space(10);
+        scGroup.addActor(scenes);
+        scGroup.addActor(go);
+        scGroup.addActor(testScene);
+        scGroup.addActor(initScene);
+
+        table.row().pad(5).align(Align.left);
+        table.add(new Label("Go to Scene: ", ui.getSkin(), "debug"));
+        table.add(scGroup);
+
+        // ------------- TESTERBOT
+        final TesterBot bot = ui.getTesterBot();
+
+        TextButton runBot = new TextButton(bot.isEnabled() ? "Stop" : "Run", ui.getSkin());
+        runBot.addListener(new ClickListener() {
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                final TesterBot bot = ui.getTesterBot();
+
+                bot.setMaxWaitInverval(Float.parseFloat(testerTimeConf.getText()));
+                bot.setInSceneTime(Float.parseFloat(inSceneTimeConf.getText()));
+                bot.setExcludeList(testerExcludeList.getText());
+                bot.setEnabled(!bot.isEnabled());
+
+                ui.setCurrentScreen(Screens.SCENE_SCREEN);
+            }
+        });
+
+        runBot.pad(2, 3, 2, 3);
+
+        testerTimeConf = new TextField(Float.toString(bot.getMaxWaitInverval()), ui.getSkin());
+        inSceneTimeConf = new TextField(Float.toString(bot.getInSceneTime()), ui.getSkin());
+        testerExcludeList = new TextField(bot.getExcludeList(), ui.getSkin());
+
+        TextButton testerLeaveConf = new TextButton("Leave", ui.getSkin(), "toggle");
+        testerLeaveConf.addListener(new ClickListener() {
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                final TesterBot bot = ui.getTesterBot();
+
+                bot.setRunLeaveVerbs(!bot.isRunLeaveVerbs());
+            }
+        });
+
+        testerLeaveConf.setChecked(bot.isRunLeaveVerbs());
+
+        TextButton testerGotoConf = new TextButton("Goto", ui.getSkin(), "toggle");
+        testerGotoConf.addListener(new ClickListener() {
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                final TesterBot bot = ui.getTesterBot();
+
+                bot.setRunGoto(!bot.isRunGoto());
+            }
+        });
+
+        testerGotoConf.setChecked(bot.isRunGoto());
+
+        TextButton testerPassText = new TextButton("Pass Texts", ui.getSkin(), "toggle");
+        testerPassText.addListener(new ClickListener() {
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                final TesterBot bot = ui.getTesterBot();
+
+                bot.setPassTexts(!bot.isPassTexts());
+            }
+        });
+
+        testerPassText.setChecked(bot.isPassTexts());
+
+        TextButton testerWaitWhenWalking = new TextButton("Wait When Walking", ui.getSkin(), "toggle");
+        testerWaitWhenWalking.addListener(new ClickListener() {
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                final TesterBot bot = ui.getTesterBot();
+
+                bot.setWaitWhenWalking(!bot.isWaitWhenWalking());
+            }
+        });
+
+        testerWaitWhenWalking.setChecked(bot.isWaitWhenWalking());
+
+        HorizontalGroup botGroup = new HorizontalGroup();
+        botGroup.space(10);
+
+        botGroup.addActor(testerLeaveConf);
+        botGroup.addActor(testerGotoConf);
+        botGroup.addActor(testerPassText);
+        botGroup.addActor(testerWaitWhenWalking);
+
+        HorizontalGroup botGroup2 = new HorizontalGroup();
+        botGroup2.space(10);
+
+        botGroup2.addActor(new Label("Excl. List: ", ui.getSkin(), "debug"));
+        botGroup2.addActor(testerExcludeList);
+        botGroup2.addActor(new Label("Interval: ", ui.getSkin(), "debug"));
+        botGroup2.addActor(testerTimeConf);
+        botGroup2.addActor(new Label("Scn Time: ", ui.getSkin(), "debug"));
+        botGroup2.addActor(inSceneTimeConf);
+        botGroup2.addActor(runBot);
+
+        table.row().pad(5).align(Align.left);
+        table.add(new Label("Tester Bot: ", ui.getSkin(), "debug"));
+        table.add(botGroup);
+        table.row().pad(5).align(Align.left);
+        table.add();
+        table.add(botGroup2);
+
+        // ------------- VERSION LABEL NOT IN TABLE
+        String versionString = Config.getInstance().getProperty(Config.TITLE_PROP, "title unspecified") + " v"
+                + Config.getInstance().getProperty(Config.VERSION_PROP, "unspecified") + "\n" + "Blade Engine: v"
+                + Config.getInstance().getProperty(Config.BLADE_ENGINE_VERSION_PROP, "unspecified") + "\n" + "libGdx: v"
+                + Config.getInstance().getProperty("gdxVersion", "unspecified") + "\n" + "RoboVM: v"
+                + Config.getInstance().getProperty("roboVMVersion", "unspecified") + "\n";
+        // + "Gdx.app.getVersion: " + Gdx.app.getVersion();
+
+        Label version = new Label(versionString, ui.getSkin(), "debug");
+        version.setColor(Color.LIGHT_GRAY);
+        Table versionStack = new Table();
+        versionStack.defaults().pad(DPIUtils.getSpacing());
+        versionStack.pad(0);
+        versionStack.add(version);
+        versionStack.bottom().left();
+        versionStack.setFillParent(true);
+        versionStack.pack();
+        table.row();
+        table.add(versionStack).colspan(3).left();
+
+        table.pack();
+
+        ScrollPane scrollPane = new ScrollPane(table);
+        scrollPane.setFillParent(true);
+        stage.addActor(scrollPane);
+
+        pointer = new Pointer(ui);
+        stage.addActor(pointer);
+
+        Gdx.input.setInputProcessor(stage);
+    }
+
+    @Override
+    public void hide() {
+        dispose();
+    }
+
+    @Override
+    public void pause() {
+    }
+
+    @Override
+    public void resume() {
+    }
+
+    @Override
+    public void setUI(UI ui) {
+        this.ui = ui;
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/DialogUI.java b/blade-engine/src/com/bladecoder/engine/ui/DialogUI.java
index e5f219924..66b603e6c 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/DialogUI.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/DialogUI.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,164 +15,248 @@
  ******************************************************************************/
 package com.bladecoder.engine.ui;
 
-import java.util.ArrayList;
-
-import com.bladecoder.engine.ui.Recorder;
-import com.bladecoder.engine.ui.SceneScreen;
-
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.Batch;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.InputListener;
+import com.badlogic.gdx.scenes.scene2d.actions.Actions;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
 import com.bladecoder.engine.i18n.I18N;
-import com.bladecoder.engine.model.Dialog;
-import com.bladecoder.engine.model.DialogOption;
 import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.ui.UI.InputMode;
+import com.bladecoder.engine.ui.defaults.ScreenControllerHandler;
 import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.EngineLogger;
+
+import java.util.List;
+
+public class DialogUI extends ScrollPane {
+    public static final String DIALOG_END_COMMAND = "dialog_end";
+
+    private DialogUIStyle style;
+
+    private Recorder recorder;
+
+    private Table panel;
+
+    private Button up;
+    private Button down;
+
+    private List<String> choices;
+    private final World world;
+
+    private Task postponedSelect = null;
+
+    private UI ui;
+
+    public DialogUI(UI ui, Recorder recorder) {
+        super(new Table(ui.getSkin()), ui.getSkin());
+
+        this.ui = ui;
+
+        setFadeScrollBars(true);
+        setOverscroll(false, false);
+
+        up = new Button(ui.getSkin(), "dialog-up");
+        down = new Button(ui.getSkin(), "dialog-down");
+
+        panel = (Table) getActor();
+        style = ui.getSkin().get(DialogUIStyle.class);
+        this.recorder = recorder;
+        this.world = ui.getWorld();
+
+        if (style.background != null)
+            getStyle().background = style.background;
+
+        panel.top().left();
+        panel.pad(DPIUtils.getMarginSize());
+
+        setVisible(false);
+        panel.defaults().expandX().fillX().top().left().padBottom(DPIUtils.getSpacing());
+
+        up.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                setScrollY(getScrollY() - DPIUtils.getPrefButtonSize());
+            }
+        });
+
+        down.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                setScrollY(getScrollY() + DPIUtils.getPrefButtonSize());
+            }
+        });
+    }
+
+    public void setUpDownVisibility() {
+        EngineLogger.debug(
+                "setUpDownVisibility: " + isScrollY() + " maxY: " + getMaxY() + " Margin: " + DPIUtils.getMarginSize());
+        if (isScrollY() && getMaxY() > DPIUtils.getMarginSize()) {
+
+            if (getScrollPercentY() > 0f && !up.isVisible()) {
+                up.setVisible(true);
+            } else if (getScrollPercentY() == 0f && up.isVisible()) {
+                up.setVisible(false);
+            }
+
+            if (getScrollPercentY() < 1f && !down.isVisible()) {
+                down.setVisible(true);
+            } else if (getScrollPercentY() == 1f && down.isVisible()) {
+                down.setVisible(false);
+            }
+        } else {
+            up.setVisible(false);
+            down.setVisible(false);
+        }
+    }
+
+    @Override
+    public void setVisible(boolean visible) {
+        super.setVisible(visible);
+
+        if (visible) {
+            if (getParent() != null)
+                show();
+        } else {
+            up.setVisible(false);
+            down.setVisible(false);
+            up.remove();
+            down.remove();
+            if (getParent() != null)
+                getStage().setScrollFocus(null);
+        }
+    }
+
+    @Override
+    public void setScrollY(float pixels) {
+        super.setScrollY(pixels);
+        setUpDownVisibility();
+    }
+
+    private void show() {
+        choices = world.getDialogOptions();
+
+        if (choices.isEmpty()) {
+            setVisible(false);
+            return;
+        } else if (style.autoselect && choices.size() == 1) {
+            // If only has one option, autoselect it
+
+            // To work properly, delay the selection one frame to avoid select it before
+            // 'talkto' finished.
+
+            if (postponedSelect != null)
+                postponedSelect.cancel();
+
+            postponedSelect = Timer.schedule(new Task() {
+
+                @Override
+                public void run() {
+                    select(0);
+                }
+            }, 0.01f);
+
+            setVisible(false);
+            return;
+        }
+
+        panel.clear();
+        setScrollPercentY(0);
+
+        for (int i = 0; i < choices.size(); i++) {
+            String str = choices.get(i);
+
+            if (str.charAt(0) == I18N.PREFIX)
+                str = world.getI18N().getString(str.substring(1));
+
+            TextButton ob = new TextButton("- " + str, style.textButtonStyle);
+            ob.setUserObject(i);
+            panel.row();
+            panel.add(ob);
+            ob.getLabel().setWrap(true);
+            ob.getLabel().setAlignment(Align.left);
+
+            ob.addListener(new ClickListener() {
+                @Override
+                public void clicked(InputEvent event, float x, float y) {
+                    int i = (Integer) event.getListenerActor().getUserObject();
+
+                    select(i);
+                }
+            });
+        }
+
+        setWidth(getStage().getViewport().getScreenWidth());
+        setHeight(Math.min(panel.getPrefHeight(), getStage().getViewport().getScreenHeight() / 2f));
+
+        float size = DPIUtils.getPrefButtonSize() * .8f;
+        float margin = DPIUtils.getSpacing();
+
+        getStage().addActor(up);
+        up.setSize(size, size);
+        up.setPosition(getX() + getWidth() - size - margin, getY() + getHeight() - margin - size);
+
+        getStage().addActor(down);
+        down.setSize(size, size);
+        down.setPosition(getX() + getWidth() - size - margin, getY() + margin);
+
+        layout();
+
+        setUpDownVisibility();
+
+        if (down.isVisible()) {
+            down.addAction(
+                    Actions.repeat(3, Actions.sequence(Actions.moveBy(0, 15, .08f), Actions.moveBy(0, -15, .08f))));
+        }
+
+        if (ui.getInputMode() == InputMode.GAMEPAD) {
+            ScreenControllerHandler.cursorToActor(((Table) (getChildren().get(0))).getChildren().get(0));
+        }
+
+        getStage().setScrollFocus(this);
+    }
+
+    private void select(int i) {
+        // RECORD
+        if (recorder.isRecording()) {
+            recorder.add(i);
+        }
+
+        world.selectDialogOption(i);
+
+        setVisible(false);
+    }
+
+    /**
+     * The style for the DialogUI
+     */
+    static public class DialogUIStyle {
+        /**
+         * Optional.
+         */
+        public Drawable background;
+
+        public TextButtonStyle textButtonStyle;
+
+        // If only one option is visible, auto select it.
+        public boolean autoselect = true;
+
+        public DialogUIStyle() {
+        }
 
-public class DialogUI extends Actor {
-	public static final String DIALOG_END_COMMAND = "dialog_end";
-	
-	private DialogUIStyle style;
-
-	private Recorder recorder;
-
-	private int selected = -1;
-
-	public DialogUI(SceneScreen scr) {
-		style = scr.getUI().getSkin().get(DialogUIStyle.class);		
-		this.recorder = scr.getRecorder();
-
-		addListener(new InputListener() {
-			public void touchUp(InputEvent event, float x, float y,
-					int pointer, int button) {
-				int i = getOption(x, y);
-
-				if (i >= 0) {
-					select(i);
-				}
-			}
-
-			public boolean mouseMoved(InputEvent event, float x, float y) {
-				selected = getOption(x, y);
-
-				return true;
-			}
-
-			public void touchDragged(InputEvent event, float x, float y,
-					int pointer) {
-				selected = getOption(x, y);
-			}
-			
-			public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
-				return true;
-			}
-		});
-
-		setPosition(0, 0);
-	}
-	
-	@Override
-	public void act(float delta) {
-		super.act(delta);
-
-		if(isVisible() && (World.getInstance().getCurrentDialog() == null || World.getInstance().inCutMode())) {
-			setVisible(false);
-			selected = -1;
-		} else if( !isVisible() &&  World.getInstance().getCurrentDialog() != null && !World.getInstance().inCutMode()) {
-			setVisible(true);
-		}
-	}
-
-	@Override
-	public void draw(Batch batch, float alpha) {
-		
-		ArrayList<DialogOption> options = World.getInstance()
-				.getCurrentDialog().getVisibleOptions();
-
-		if (options.size() == 0)
-			return;
-		
-		else if (options.size() == 1) { // If only has one option,
-										// autoselect it
-			select(0);
-			return;
-		}
-
-		float lineHeight = style.font.getLineHeight();
-		float y = lineHeight * options.size();
-		setWidth(getStage().getViewport().getScreenWidth());
-		float margin = DPIUtils.getMarginSize();
-		setHeight( margin + lineHeight * options.size());
-
-		if (style.background != null) {
-			style.background.draw(batch, getX(), getY(), getWidth(), getHeight());
-		}
-
-		for (int i = 0; i < options.size(); i++) {
-			DialogOption o = options.get(i);
-			String str = o.getText();
-
-			if (str.charAt(0) == '@')
-				str = I18N.getString(str.substring(1));
-
-			if (i == selected) {
-				style.font.setColor(style.overFontColor);
-				style.font.draw(batch, str, margin, y);
-			} else {
-				style.font.setColor(style.fontColor);
-				style.font.draw(batch, str, margin, y);
-			}
-
-			y -= lineHeight;
-		}
-	}
-
-	private int getOption(float x, float y) {
-		float lineHeight = style.font.getLineHeight();
-
-		int selectedLine = (int) (y / lineHeight);
-
-		return World.getInstance().getCurrentDialog().getNumVisibleOptions()
-				- selectedLine - 1;
-	}
-
-	private void select(int i) {
-		Dialog d = World.getInstance().getCurrentDialog();
-
-		// RECORD
-		if (recorder.isRecording()) {
-			recorder.add(i);
-		}
-
-		d.selectOption(i);
-
-		if (World.getInstance().getCurrentDialog().ended()) {
-			World.getInstance().setCurrentDialog(null);
-			selected = -1;
-			setVisible(false);
-		}
-	}
-	
-	/** The style for the DialogUI */
-	static public class DialogUIStyle {
-		/** Optional. */
-		public Drawable background;
-		public BitmapFont font;
-		public Color fontColor;
-		public Color overFontColor;
-
-		public DialogUIStyle () {
-		}
-
-		public DialogUIStyle (DialogUIStyle style) {
-			background = style.background;
-			font = style.font;
-			fontColor = style.fontColor;
-			overFontColor = style.overFontColor;
-		}
-	}
+        public DialogUIStyle(DialogUIStyle style) {
+            background = style.background;
+            textButtonStyle = style.textButtonStyle;
+            autoselect = style.autoselect;
+        }
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/HelpScreen.java b/blade-engine/src/com/bladecoder/engine/ui/HelpScreen.java
index 433b0115b..65b5b3ae1 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/HelpScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/HelpScreen.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,143 +20,155 @@
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
+import com.badlogic.gdx.InputAdapter;
 import com.badlogic.gdx.InputProcessor;
+import com.badlogic.gdx.ScreenAdapter;
+import com.badlogic.gdx.controllers.Controller;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.Texture.TextureFilter;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.utils.viewport.ScreenViewport;
+import com.badlogic.gdx.utils.viewport.FitViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
 import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.ui.UI.InputMode;
 import com.bladecoder.engine.ui.UI.Screens;
+import com.bladecoder.engine.ui.defaults.DefaultSceneScreen.UIModes;
+import com.bladecoder.engine.ui.defaults.ScreenControllerHandler;
+import com.bladecoder.engine.util.Config;
 
-public class HelpScreen implements BladeScreen, InputProcessor {
-	
+public class HelpScreen extends ScreenAdapter implements BladeScreen {
 	private final static String PIE_FILENAME = "ui/helpPie";
-	private final static String DESKTOP_FILENAME = "ui/helpDesktop";
+	private final static String TWO_BUTTONS_FILENAME = "ui/helpDesktop";
+	private final static String SINGLE_CLICK_FILENAME = "ui/helpDesktop"; // TODO
+																			// Help
+																			// for
+																			// single
+																			// button
 
 	private Texture tex;
 
 	private UI ui;
-	
+
 	private String localeFilename;
-	private final Viewport viewport = new ScreenViewport();
+	private final Viewport viewport;
+
+	private ScreenControllerHandler controller;
 
 	public HelpScreen() {
+		viewport = new FitViewport(Gdx.graphics.getWidth(), Gdx.graphics.getWidth() * 9f / 16f);
+	}
+
+	private final InputProcessor inputProcessor = new InputAdapter() {
+		@Override
+		public boolean keyUp(int keycode) {
+			switch (keycode) {
+			case Input.Keys.ESCAPE:
+			case Input.Keys.BACK:
+				ui.setCurrentScreen(Screens.MENU_SCREEN);
+				break;
+			}
+
+			// FIXME: This ALWAYS return true, even when we haven't dealt with
+			// the key. Is that expected?
+			return true;
+		}
 
-	}
+		@Override
+		public boolean touchUp(int screenX, int screenY, int pointer, int button) {
+			ui.setCurrentScreen(Screens.MENU_SCREEN);
+			return true;
+		}
+	};
 
 	@Override
 	public void render(float delta) {
 		SpriteBatch batch = ui.getBatch();
-		
-		Gdx.gl.glClearColor(0, 0, 0, 1);			
+
+		Gdx.gl.glClearColor(0, 0, 0, 1);
 		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
 
 		batch.setProjectionMatrix(viewport.getCamera().combined);
-		batch.begin();	
+		batch.begin();
 		batch.draw(tex, 0, 0, viewport.getScreenWidth(), viewport.getScreenHeight());
-		ui.getPointer().draw(batch, viewport);
 		batch.end();
+
+		controller.update(delta);
 	}
 
 	@Override
 	public void resize(int width, int height) {
+
+		float aspect = width / height;
+		float bgAspect = (float) tex.getWidth() / (float) tex.getHeight();
+
+		if (aspect < bgAspect)
+			viewport.setWorldSize(width, (int) (width / bgAspect));
+		else
+			viewport.setWorldSize((int) (height * bgAspect), height);
+
 		viewport.update(width, height, true);
 	}
 
 	@Override
 	public void dispose() {
-		tex.dispose();
+		if (tex != null) {
+			tex.dispose();
+			tex = null;
+		}
 	}
 
 	@Override
 	public void show() {
-		tex = new Texture(EngineAssetManager.getInstance().getResAsset(localeFilename));
-		tex.setFilter(TextureFilter.Linear, TextureFilter.Linear);	
-		
-		Gdx.input.setInputProcessor(this);
-	}
-
-	@Override
-	public void hide() {
-		dispose();
-	}
-
-	@Override
-	public void pause() {
-		
-	}
+		final Locale locale = ui.getWorld().getI18N().getCurrentLocale();
+		String filename = null;
+		UIModes uiMode = UIModes
+				.valueOf(Config.getInstance().getProperty(Config.UI_MODE, "TWO_BUTTONS").toUpperCase(Locale.ENGLISH));
 
-	@Override
-	public void resume() {
-		
-	}
-	
-	@Override
-	public boolean keyDown(int keycode) {
-		return false;
-	}
+		if (ui.getInputMode() == InputMode.TOUCHPANEL && uiMode == UIModes.TWO_BUTTONS) {
+			uiMode = UIModes.PIE;
+		}
 
-	@Override
-	public boolean keyUp(int keycode) {
-		switch (keycode) {
-		case Input.Keys.ESCAPE:
-		case Input.Keys.BACK:
-			ui.setCurrentScreen(Screens.SCENE_SCREEN);
+		switch (uiMode) {
+		case PIE:
+			filename = PIE_FILENAME;
+			break;
+		case SINGLE_CLICK:
+			filename = SINGLE_CLICK_FILENAME;
 			break;
+		case TWO_BUTTONS:
+			filename = TWO_BUTTONS_FILENAME;
+			break;
+
 		}
 
-		return true;
-	}
+		localeFilename = MessageFormat.format("{0}_{1}.png", filename, locale.getLanguage());
 
-	@Override
-	public boolean keyTyped(char character) {
-		return false;
-	}
+		if (!EngineAssetManager.getInstance().assetExists(localeFilename))
+			localeFilename = MessageFormat.format("{0}.png", filename);
 
-	@Override
-	public boolean touchDown(int screenX, int screenY, int pointer, int button) {
-		return false;
-	}
+		tex = new Texture(EngineAssetManager.getInstance().getResAsset(localeFilename));
+		tex.setFilter(TextureFilter.Linear, TextureFilter.Linear);
 
-	@Override
-	public boolean touchUp(int screenX, int screenY, int pointer, int button) {
-		ui.setCurrentScreen(Screens.MENU_SCREEN);
-		return true;
-	}
+		Gdx.input.setInputProcessor(inputProcessor);
+		controller = new ScreenControllerHandler(ui, null, viewport) {
+			@Override
+			protected boolean buttonUp(Controller controller, int buttonCode) {
 
-	@Override
-	public boolean touchDragged(int screenX, int screenY, int pointer) {
-		return false;
-	}
+				ui.setCurrentScreen(Screens.MENU_SCREEN);
 
-	@Override
-	public boolean mouseMoved(int screenX, int screenY) {
-		return false;
+				return true;
+			}
+		};
 	}
 
 	@Override
-	public boolean scrolled(int amount) {
-		return false;
+	public void hide() {
+		dispose();
 	}
 
 	@Override
 	public void setUI(UI ui) {
 		this.ui = ui;
-		
-		Locale locale = Locale.getDefault();
-		
-		String filename = null;
-		
-		if(ui.isPieMode())
-			filename = PIE_FILENAME;
-		else
-			filename = DESKTOP_FILENAME;
-		
-		localeFilename = MessageFormat.format("{0}_{1}.png", filename, locale.getLanguage());
-		
-		if(!EngineAssetManager.getInstance().assetExists(localeFilename))
-			localeFilename = MessageFormat.format("{0}.png", filename);
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/HotspotsDrawer.java b/blade-engine/src/com/bladecoder/engine/ui/HotspotsDrawer.java
new file mode 100644
index 000000000..c6427f085
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/HotspotsDrawer.java
@@ -0,0 +1,91 @@
+package com.bladecoder.engine.ui;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.math.Polygon;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.scenes.scene2d.utils.TransformDrawable;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engine.util.RectangleRenderer;
+import com.bladecoder.engine.util.UIUtils;
+
+public class HotspotsDrawer {
+
+	private final UI ui;
+	private final Viewport viewport;
+
+	private final GlyphLayout textLayout = new GlyphLayout();
+	private final Vector3 unprojectTmp = new Vector3();
+
+	public HotspotsDrawer(UI ui, Viewport viewport) {
+		this.ui = ui;
+		this.viewport = viewport;
+	}
+
+	public void draw(SpriteBatch batch, boolean showDesc) {
+		World w = ui.getWorld();
+
+		for (BaseActor a : w.getCurrentScene().getActors().values()) {
+			if (!(a instanceof InteractiveActor) || !a.isVisible() || a == w.getCurrentScene().getPlayer())
+				continue;
+
+			InteractiveActor ia = (InteractiveActor) a;
+
+			if (!ia.canInteract())
+				continue;
+
+			Polygon p = a.getBBox();
+
+			if (p == null) {
+				EngineLogger.error("ERROR DRAWING HOTSPOT FOR: " + a.getId());
+			}
+
+			Rectangle r = a.getBBox().getBoundingRectangle();
+
+			unprojectTmp.set(r.getX() + r.getWidth() / 2, r.getY() + r.getHeight() / 2, 0);
+			w.getSceneCamera().scene2screen(viewport, unprojectTmp);
+
+			if (!showDesc || ia.getDesc() == null) {
+
+				float size = DPIUtils.ICON_SIZE * DPIUtils.getSizeMultiplier();
+
+				if (ia.getVerb(Verb.LEAVE_VERB) != null) {
+					TransformDrawable drawable = (TransformDrawable) ui.getSkin().getDrawable(Verb.LEAVE_VERB);
+
+					drawable.draw(batch, unprojectTmp.x - size / 2, unprojectTmp.y - size / 2, size / 2, size / 2, size,
+							size, 1.0f, 1.0f, UIUtils.calcLeaveArrowRotation(viewport, ia));
+				} else {
+					Drawable drawable = ui.getSkin().getDrawable("hotspot");
+
+					if (drawable != null)
+						drawable.draw(batch, unprojectTmp.x - size / 2, unprojectTmp.y - size / 2, size, size);
+				}
+			} else {
+				BitmapFont font = ui.getSkin().getFont("desc");
+				String desc = ia.getDesc();
+				if (desc.charAt(0) == I18N.PREFIX)
+					desc = w.getI18N().getString(desc.substring(1));
+
+				textLayout.setText(font, desc);
+
+				float textX = unprojectTmp.x - textLayout.width / 2;
+				float textY = unprojectTmp.y + textLayout.height;
+
+				RectangleRenderer.draw(batch, textX - 8, textY - textLayout.height - 8, textLayout.width + 16,
+						textLayout.height + 16, Color.BLACK);
+				font.draw(batch, textLayout, textX, textY);
+			}
+		}
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/ITextManagerUI.java b/blade-engine/src/com/bladecoder/engine/ui/ITextManagerUI.java
new file mode 100644
index 000000000..23531daf5
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/ITextManagerUI.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui;
+
+import com.bladecoder.engine.model.Text;
+
+/**
+ * TextManagerUI draws texts and dialogs on screen.
+ * 
+ * @author rgarcia
+ * 
+ */
+public interface ITextManagerUI {
+	public void setText(Text t);
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/InitScreen.java b/blade-engine/src/com/bladecoder/engine/ui/InitScreen.java
index 0393f9439..df731586e 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/InitScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/InitScreen.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,6 +16,7 @@
 package com.bladecoder.engine.ui;
 
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.ScreenAdapter;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Texture;
@@ -26,68 +27,73 @@
 import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.ui.UI.Screens;
 
-public class InitScreen implements BladeScreen {
+public class InitScreen extends ScreenAdapter implements BladeScreen {
 	private final static String FILENAME = "ui/blade_logo.png";
 	private final static float FADE_TIME = .6f;
 	private final static float SCREEN_TIME = .8f;
 
-	private Texture tex;	
-	
+	private Texture tex;
+
 	private UI ui;
-	
+
 	private float time;
 	private float fadeTime;
 	private float scale = 1f;
-	
+
 	private final Viewport viewport = new ScreenViewport();
-	
-	public InitScreen() {
-	}
 
 	@Override
 	public void render(float delta) {
 		SpriteBatch batch = ui.getBatch();
-		
-		Gdx.gl.glClearColor(0, 0, 0, 1);			
+
+		Gdx.gl.glClearColor(0, 0, 0, 1);
 		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
 
 		batch.setProjectionMatrix(viewport.getCamera().combined);
-		batch.begin();	
-		
-		if(time > FADE_TIME * 2 + SCREEN_TIME) {  // EXIT INIT SCREEN
+		batch.begin();
+
+		if (time > FADE_TIME * 2 + SCREEN_TIME) {  // EXIT INIT SCREEN
 			batch.setColor(Color.WHITE);
 			ui.setCurrentScreen(Screens.MENU_SCREEN);
-		} else if(time > FADE_TIME + SCREEN_TIME) {  // FADE_OUT
-			batch.setColor(1, 1, 1,  1 - fadeTime/FADE_TIME);			
-		} else if(time < FADE_TIME) { // FADE IN
-			batch.setColor(1, 1, 1,  fadeTime/FADE_TIME);	
+			batch.end();
+			return;
+		} else if (time > FADE_TIME + SCREEN_TIME) {  // FADE_OUT
+			batch.setColor(1, 1, 1, 1 - fadeTime / FADE_TIME);
+		} else if (time < FADE_TIME) { // FADE IN
+			batch.setColor(1, 1, 1, fadeTime / FADE_TIME);
 		} else {
 			fadeTime = 0;
-		}		
-		
-		batch.draw(tex, (viewport.getScreenWidth() - tex.getWidth()* scale  ) /2, (viewport.getScreenHeight() - tex.getHeight()* scale)  /2,
-				tex.getWidth() * scale, tex.getHeight() * scale);
-		batch.setColor(1, 1, 1, 1);
-	
+		}
+
+		final int viewportW = viewport.getScreenWidth();
+		final int viewportH = viewport.getScreenHeight();
+		final float texW = tex.getWidth() * scale;
+		final float texH = tex.getHeight() * scale;
+		batch.draw(tex, (viewportW - texW) / 2, (viewportH - texH) / 2, texW, texH);
+		batch.setColor(Color.WHITE);
+
 		time += delta;
 		fadeTime += delta;
 		batch.end();
 	}
 
 	@Override
-	public void resize(int width, int height) {	
+	public void resize(int width, int height) {
 		viewport.update(width, height, true);
-		scale = width / (float)EngineAssetManager.getInstance().getResolution().portraitWidth;
+		scale = width / (float) EngineAssetManager.getInstance().getResolution().portraitWidth;
 	}
 
-	public void retrieveAssets() {
+	protected void retrieveAssets() {
 		tex = new Texture(EngineAssetManager.getInstance().getResAsset(FILENAME));
-		tex.setFilter(TextureFilter.Linear, TextureFilter.Linear);	
+		tex.setFilter(TextureFilter.Linear, TextureFilter.Linear);
 	}
 
 	@Override
 	public void dispose() {
-		tex.dispose();
+		if(tex != null) {
+			tex.dispose();
+			tex = null;
+		}
 	}
 
 	@Override
@@ -95,7 +101,6 @@ public void show() {
 		time = fadeTime = 0;
 		Gdx.input.setInputProcessor(null);
 		retrieveAssets();
-		ui.getPointer().reset();
 	}
 
 	@Override
@@ -103,14 +108,6 @@ public void hide() {
 		dispose();
 	}
 
-	@Override
-	public void pause() {
-	}
-
-	@Override
-	public void resume() {
-	}
-
 	@Override
 	public void setUI(UI ui) {
 		this.ui = ui;
diff --git a/blade-engine/src/com/bladecoder/engine/ui/InventoryButton.java b/blade-engine/src/com/bladecoder/engine/ui/InventoryButton.java
index 48bc8a383..26dcc1f7f 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/InventoryButton.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/InventoryButton.java
@@ -1,44 +1,85 @@
 package com.bladecoder.engine.ui;
 
-
-import com.bladecoder.engine.ui.InventoryUI;
-
 import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.actions.Actions;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.ui.InventoryUI.InventoryPos;
+import com.bladecoder.engine.ui.InventoryUI.InventoryUIStyle;
 import com.bladecoder.engine.util.DPIUtils;
 
-public class InventoryButton extends ImageButton {
-	
+public class InventoryButton extends AnimButton {
+
 	private final InventoryUI inventory;
+	private final World world;
+
+	private int numItems = Integer.MAX_VALUE;
+
+	private static ButtonStyle getDefaultStyle(Skin skin) {
+		InventoryUIStyle inventoryUIStyle = skin.get(InventoryUIStyle.class);
+		ButtonStyle inventoryButtonStyle = inventoryUIStyle.inventoryButtonStyle;
 
-	public InventoryButton(Skin skin, InventoryUI inv) {
-		super(skin, "inventory");
+		if (inventoryButtonStyle == null) {
+			inventoryButtonStyle = skin.get("inventory", ButtonStyle.class);
+		}
+
+		return inventoryButtonStyle;
+	}
+
+	public InventoryButton(Skin skin, World w, InventoryUI inv) {
+		super(getDefaultStyle(skin));
 		this.inventory = inv;
-		
+		this.world = w;
+
 		addListener(new ChangeListener() {
 			@Override
 			public void changed(ChangeEvent event, Actor actor) {
-				if(!inventory.isVisible())
+				if (!inventory.isVisible())
 					inventory.show();
 				else
 					inventory.hide();
 			}
 		});
 	}
-	
+
+	@Override
+	public void act(float delta) {
+		super.act(delta);
+
+		if (numItems < world.getInventory().getNumItems()) {
+//			addAction(Actions.repeat(30, Actions.sequence(Actions.rotateBy(40, 1f), Actions.rotateBy(-40, 1f))));
+			addAction(Actions.repeat(4, Actions.sequence(Actions.moveBy(20, 0, .06f), Actions.moveBy(-20, 0, .06f))));
+//			addAction(Actions.repeat(3, Actions.sequence(Actions.alpha(0, .4f), Actions.alpha(1, .4f))));
+		}
+
+		numItems = world.getInventory().getNumItems();
+	}
+
 	public void resize(int width, int height) {
 		float size = DPIUtils.getPrefButtonSize();
 		float margin = DPIUtils.getMarginSize();
-		
+
 		setSize(size, size);
-		
-//		getImageCell().minSize(DPIUtils.getPrefButtonSize(width, height),DPIUtils.getPrefButtonSize(width, height));
-		
-		float iconSize = Math.max(size/2, DPIUtils.ICON_SIZE);
-		getImageCell().maxSize(iconSize, iconSize);
-		
-		setPosition(margin, margin);
+
+		InventoryPos inventoryPos = inventory.getInventoryPos();
+
+		switch (inventoryPos) {
+		case TOP:
+			setPosition(margin, height - margin - getHeight());
+			break;
+		case LEFT:
+			setPosition(margin, margin);
+			break;
+		case RIGHT:
+			setPosition(width - margin - getWidth(), margin);
+			break;
+		case DOWN:
+		case CENTER:
+			setPosition(margin, margin);
+			break;
+		default:
+			break;
+		}
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/InventoryUI.java b/blade-engine/src/com/bladecoder/engine/ui/InventoryUI.java
index d5c652804..890779b5a 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/InventoryUI.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/InventoryUI.java
@@ -15,87 +15,85 @@
  ******************************************************************************/
 package com.bladecoder.engine.ui;
 
+import java.util.Locale;
+
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
-import com.badlogic.gdx.math.Rectangle;
-import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.InputListener;
 import com.badlogic.gdx.scenes.scene2d.actions.Actions;
-import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
-import com.badlogic.gdx.scenes.scene2d.ui.ImageButton.ImageButtonStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.Button.ButtonStyle;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
-import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.ActorRenderer;
+import com.bladecoder.engine.model.InteractiveActor;
 import com.bladecoder.engine.model.Inventory;
 import com.bladecoder.engine.model.SpriteActor;
-import com.bladecoder.engine.model.SpriteRenderer;
-import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.ui.SceneScreen.ActionButton;
+import com.bladecoder.engine.ui.UI.InputMode;
+import com.bladecoder.engine.ui.defaults.SceneGestureListener;
+import com.bladecoder.engine.ui.defaults.ScenePointer;
 import com.bladecoder.engine.util.Config;
 import com.bladecoder.engine.util.DPIUtils;
 import com.bladecoder.engine.util.EngineLogger;
 
 public class InventoryUI extends com.badlogic.gdx.scenes.scene2d.Group {
-	private final static int TOP = 0;
-	private final static int DOWN = 1;
-	private final static int LEFT = 2;
-	private final static int RIGHT = 3;
-
-	private final static String MENU_BUTTON = "config";
-
-	private Rectangle configBbox = new Rectangle();
+	public enum InventoryPos {
+		TOP, DOWN, LEFT, RIGHT, CENTER
+	};
 
 	private int tileSize;
-	private float destY;
 	private int margin;
-	private int inventoryPos = DOWN;
+	private float rowSpace;
+	private int cols, rows;
+	private final InventoryPos inventoryPos;
+	private boolean autosize = true;
 
 	private SpriteActor draggedActor = null;
 
-	private AtlasRegion configIcon;
-
 	private final SceneScreen sceneScreen;
-	
+
 	private InventoryUIStyle style;
-	
-	private ImageButton menuButton;
 
-	public InventoryUI(SceneScreen scr) {
-		style = scr.getUI().getSkin().get(InventoryUIStyle.class);		
+	private Button menuButton;
+
+	private final Vector2 orgPos = new Vector2();
+	private final Vector2 targetPos = new Vector2();
+
+	private final ScenePointer pointer;
+
+	private boolean singleAction = Config.getInstance().getProperty(Config.SINGLE_ACTION_INVENTORY, false);
+
+	public InventoryUI(SceneScreen scr, ScenePointer pointer) {
+		style = scr.getUI().getSkin().get(InventoryUIStyle.class);
 		sceneScreen = scr;
+		this.pointer = pointer;
 
-		String pos = Config.getProperty(Config.INVENTORY_POS_PROP, "down");
+		inventoryPos = InventoryPos.valueOf(
+				Config.getInstance().getProperty(Config.INVENTORY_POS_PROP, "DOWN").toUpperCase(Locale.ENGLISH));
 
-		if (pos.trim().equals("top"))
-			inventoryPos = TOP;
-		else if (pos.trim().equals("left"))
-			inventoryPos = LEFT;
-		else if (pos.trim().equals("right"))
-			inventoryPos = RIGHT;
-		else
-			inventoryPos = DOWN;
+		autosize = Config.getInstance().getProperty(Config.INVENTORY_AUTOSIZE_PROP, true);
 
 		addListener(new InputListener() {
 			@Override
-			public void touchUp(InputEvent event, float x, float y,
-					int pointer, int button) {
+			public void touchUp(InputEvent event, float x, float y, int pointer, int button) {
 
-				if (draggedActor != null) {
-					stopDragging(button);
-				} else if (configBbox.contains(x, y)) {
-					sceneScreen.showMenu();
+				if (pointer == 11) { // pointer > 10 comes from controller
+					touchedUp(x, y, ActionButton.LOOKAT);
+				} else if (pointer == 12) {
+					startDragging(x, y);
 				} else {
-					BaseActor actor = getItemAt(x, y);
 
-					if (actor != null) {
-						sceneScreen.actorClick(actor, button == 1);
-					} else {
-						hide();
-					}
+					ActionButton b = SceneGestureListener.mouseToAction(button);
+
+					touchedUp(x, y, b);
 				}
-				
+
 			}
 
 			@Override
@@ -105,15 +103,13 @@ public boolean mouseMoved(InputEvent event, float x, float y) {
 			}
 
 			@Override
-			public void touchDragged(InputEvent event, float x, float y,
-					int pointer) {
+			public void touchDragged(InputEvent event, float x, float y, int pointer) {
 				if (draggedActor == null)
 					startDragging(x, y);
 			}
 
 			@Override
-			public boolean touchDown(InputEvent event, float x, float y,
-					int pointer, int button) {
+			public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
 				return true;
 			}
 
@@ -122,198 +118,321 @@ public void exit(InputEvent event, float x, float y, int pointer,
 					com.badlogic.gdx.scenes.scene2d.Actor toActor) {
 
 				// EngineLogger.debug("EXIT EVENT: " + toActor);
-				if (!(toActor instanceof PieMenu)
-						&& !(toActor instanceof InventoryUI)
-						&& draggedActor != null)
+				if (!(toActor instanceof PieMenu) && !(toActor instanceof InventoryUI) && draggedActor != null)
 					hide();
 			}
 		});
-		
 
-		menuButton = new ImageButton(style.menuButtonStyle);
+		if (style.menuButtonStyle != null) {
+			menuButton = new Button(style.menuButtonStyle);
 
-		addActor(menuButton);
-		menuButton.addListener(new ChangeListener() {			
-			@Override
-			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
-				sceneScreen.getUI().setCurrentScreen(UI.Screens.MENU_SCREEN);
+			addActor(menuButton);
+			menuButton.addListener(new ChangeListener() {
+				@Override
+				public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
+					sceneScreen.getUI().setCurrentScreen(UI.Screens.MENU_SCREEN);
+				}
+			});
+
+			float iconSize = DPIUtils.getPrefButtonSize();
+
+			menuButton.setSize(iconSize, iconSize);
+		}
+	}
+
+	public void touchedUp(float x, float y, ActionButton button) {
+		if (draggedActor != null) {
+			stopDragging(button);
+			return;
+		}
+
+		InteractiveActor actor = getItemAt(x, y);
+		if (actor != null) {
+			if (singleAction) {
+				sceneScreen.runVerb(actor, "lookat", null);
+			} else {
+				sceneScreen.actorClick(actor, button);
 			}
-		});
+		} else {
+			hide();
+		}
 	}
 
 	public void show() {
 		if (!isVisible()) {
+			resize((int) getStage().getCamera().viewportWidth, (int) getStage().getCamera().viewportHeight);
 			setVisible(true);
-			setY(-getHeight());
+			setPosition(orgPos.x, orgPos.y);
+
+			addAction(Actions.sequence(Actions.moveTo(targetPos.x, targetPos.y, .1f), Actions.run(new Runnable() {
 
-			addAction(Actions
-					.moveTo(getX(), destY, .1f));
+				@Override
+				public void run() {
+					if (sceneScreen.getUI().getInputMode() == InputMode.GAMEPAD) {
+						cursorToInventoryActor(0);
+					}
+				}
+
+			})));
 		}
 	}
 
 	public void hide() {
-		if(isVisible())
-			addAction(Actions.sequence(Actions.moveTo(getX(), -getHeight(), .1f),
-				Actions.hide()));
+		if (isVisible())
+			addAction(Actions.sequence(Actions.moveTo(orgPos.x, orgPos.y, .1f), Actions.hide()));
 	}
 
 	public void resize(int width, int height) {
 
-		tileSize = (int)DPIUtils.getTouchMinSize() * 2;
-		margin = (int)DPIUtils.getMarginSize();
-		
-		float rowSpace = DPIUtils.getSpacing();
+		Inventory inventory = sceneScreen.getWorld().getInventory();
+
+		tileSize = (int) DPIUtils.getTouchMinSize() * 2;
+		margin = (int) DPIUtils.getMarginSize();
+
+		rowSpace = DPIUtils.getSpacing();
+
+		int capacity = 0;
+
+		do {
+
+			int w = (int) (width * .7f / tileSize) * tileSize;
+			int h = (int) (height * .7f / tileSize) * tileSize;
+
+			if (autosize) {
+				if (inventoryPos == InventoryPos.LEFT || inventoryPos == InventoryPos.RIGHT) {
+					int w2 = tileSize * ((inventory.getNumItems() - 1) / (h / tileSize) + 1);
+
+					if (w2 < w)
+						w = w2;
+				} else {
+
+					int h2 = tileSize * ((inventory.getNumItems() - 1) / (w / tileSize) + 1);
+
+					if (h2 < h)
+						h = h2;
+				}
+			}
 
-		int w = (int) (width * .8f / tileSize) * tileSize;
-		int h = (int) (height * .7f / tileSize) * tileSize;
+			cols = w / tileSize;
+			rows = h / tileSize;
+
+			setSize(w + (cols - 1) * rowSpace + margin * 2, h + (rows - 1) * rowSpace + margin * 2);
+
+			capacity = cols * rows;
+
+			if (inventory.getNumItems() > capacity) {
+				tileSize *= .8;
+			}
+
+		} while (inventory.getNumItems() > capacity);
+
+		if (inventory.getNumItems() > capacity)
+			EngineLogger.error("Items in inventory excees the UI capacity");
 
 		setVisible(false);
-		setSize(w + (w/tileSize - 1) * rowSpace + margin * 2 , h + (h/tileSize - 1) * rowSpace + margin * 2);
-		destY = ( height - getHeight()) / 2;
-		setX((width - getWidth()) / 2);
-		
-		float size = DPIUtils.getPrefButtonSize();
-		float iconSize = Math.max(size/2, DPIUtils.ICON_SIZE);
-		menuButton.setSize(size, size);
-		menuButton.getImageCell().maxSize(iconSize, iconSize);
-		menuButton.setPosition(getWidth()-menuButton.getWidth()/2, (getHeight() - menuButton.getHeight()) / 2);
+
+		if (inventoryPos == InventoryPos.TOP) {
+			orgPos.set((width - getWidth()) / 2, height + getHeight());
+			targetPos.set((width - getWidth()) / 2, height - getHeight() - DPIUtils.getSpacing());
+		} else if (inventoryPos == InventoryPos.DOWN) {
+			orgPos.set((width - getWidth()) / 2, -getHeight());
+			targetPos.set((width - getWidth()) / 2, DPIUtils.getSpacing());
+		} else if (inventoryPos == InventoryPos.LEFT) {
+			orgPos.set(-getWidth(), (height - getHeight()) / 2);
+			targetPos.set(DPIUtils.getSpacing(), (height - getHeight()) / 2); // TODO
+		} else if (inventoryPos == InventoryPos.RIGHT) {
+			orgPos.set(width + getWidth(), (height - getHeight()) / 2); // TODO
+			targetPos.set(width - getWidth() - DPIUtils.getSpacing(), (height - getHeight()) / 2); // TODO
+		} else {
+			orgPos.set((width - getWidth()) / 2, -getHeight());
+			targetPos.set((width - getWidth()) / 2, (height - getHeight()) / 2);
+		}
+
+		setX(orgPos.x);
+		setY(orgPos.y);
+
+		if (menuButton != null) {
+			menuButton.setPosition(getWidth() - menuButton.getWidth() / 2, (getHeight() - menuButton.getHeight()) / 2);
+			float iconSize = DPIUtils.getPrefButtonSize();
+
+			menuButton.setSize(iconSize, iconSize);
+		}
+	}
+
+	public void setStyle(String name) {
+		style = sceneScreen.getUI().getSkin().get(name == null ? "default" : name, InventoryUIStyle.class);
 	}
 
 	public void retrieveAssets(TextureAtlas atlas) {
-		configIcon = atlas.findRegion(MENU_BUTTON);
 	}
 
 	@Override
 	public void draw(Batch batch, float alpha) {
-		Inventory inventory = World.getInstance().getInventory();
+		Inventory inventory = sceneScreen.getWorld().getInventory();
 
 		if (!inventory.isVisible()) {
 			setVisible(false);
 			return;
 		}
 
-		
 		if (style.background != null) {
 			style.background.draw(batch, getX(), getY(), getWidth(), getHeight());
 		}
 
-		batch.draw(configIcon, configBbox.x, configBbox.y, configBbox.width,
-				configBbox.height);
-		
-		float rowSpace = DPIUtils.getSpacing();
-
-		int cols = (int) (getWidth() - margin) / (tileSize + (int)rowSpace);
-		int rows = (int) (getHeight() - margin) / (tileSize + (int)rowSpace) - 1;
-
-		int capacity = cols * (rows + 1);
-		if(inventory.getNumItems() >= capacity)
-			EngineLogger.error("Items in inventory excees the UI capacity");
-
 		// DRAW ITEMS
+		int capacity = cols * rows;
+
 		for (int i = 0; i < inventory.getNumItems() && i < capacity; i++) {
 
-			SpriteActor a = inventory.getItem(i);
-			SpriteRenderer r = a.getRenderer();
+			SpriteActor a = inventory.get(i);
+			ActorRenderer r = a.getRenderer();
 
-			float size = tileSize
-					/ (r.getHeight() > r.getWidth() ? r.getHeight() : r
-							.getWidth());
+			float size = (tileSize - rowSpace) / (r.getHeight() > r.getWidth() ? r.getHeight() : r.getWidth());
 
 			float x = i % cols;
-			float y = rows - i / cols;
+			float y = (rows - 1) - i / cols;
 
 			if (style.itemBackground != null) {
 				style.itemBackground.draw(batch, getX() + x * tileSize + x * rowSpace + margin,
 						getY() + y * tileSize + y * rowSpace + margin, tileSize, tileSize);
 			}
-			
-			r.draw((SpriteBatch) batch, getX() + x * tileSize + x * rowSpace+ tileSize / 2 + margin,
-					getY() + y * tileSize + y * rowSpace + margin, size);
+
+			r.draw((SpriteBatch) batch, getX() + x * tileSize + x * rowSpace + tileSize / 2 + margin,
+					getY() + (tileSize - r.getHeight() * size) / 2 + y * tileSize + y * rowSpace + margin, size, size,
+					0f, a.getTint());
 		}
-		
+
 		super.draw(batch, alpha);
 	}
 
+	public void cursorToInventoryActor(int i) {
+		float x = i % cols;
+		float y = (rows - 1) - i / cols;
+
+		Vector2 pos = new Vector2(x * tileSize + x * rowSpace + margin + tileSize / 2f,
+				y * tileSize + y * rowSpace + margin + tileSize / 2f);
+
+		localToScreenCoordinates(pos);
+
+		Gdx.input.setCursorPosition((int) pos.x, (int) pos.y);
+
+		getStage().mouseMoved(Gdx.input.getX(), Gdx.input.getY());
+	}
+
+	public int getIndexUnderCursor() {
+		Vector2 inputPos = new Vector2(Gdx.input.getX(), Gdx.input.getY());
+		getStage().screenToStageCoordinates(inputPos);
+
+		if (hit(inputPos.x, inputPos.y, false) == null)
+			return -1;
+
+		int col = (int) ((inputPos.x - getX() - margin) / (tileSize + rowSpace));
+		int row = (int) ((inputPos.y - getY() - margin) / (tileSize + rowSpace));
+
+		int i = row * cols + col;
+
+		EngineLogger.debug(">> COL: " + col + " ROW: " + row + " Idx: " + i);
+
+		return i;
+	}
+
 	public void cancelDragging() {
 		draggedActor = null;
-		sceneScreen.getUI().getPointer().drag(null);
+		pointer.drag(null);
 	}
 
 	private void startDragging(float x, float y) {
 		draggedActor = getItemAt(x, y);
 		if (draggedActor != null)
-			sceneScreen.getUI().getPointer().drag(draggedActor.getRenderer());
+			pointer.drag(draggedActor);
 	}
 
-	private final Vector3 mousepos = new Vector3();
+	public boolean isDragging() {
+		return draggedActor != null;
+	}
 
-	private void stopDragging(int button) {
-		World.getInstance().getSceneCamera()
-				.getInputUnProject(sceneScreen.getViewport(), mousepos);
+	private void stopDragging(ActionButton button) {
 
-		BaseActor targetActor = sceneScreen.getCurrentActor();
+		InteractiveActor targetActor = sceneScreen.getCurrentActor();
 
 		if (targetActor != null) {
-			if(targetActor != draggedActor)
+			if (targetActor != draggedActor)
 				use(targetActor, draggedActor);
+			else if (singleAction)
+				sceneScreen.runVerb(targetActor, "lookat", null);
 			else
-				sceneScreen.actorClick(targetActor, button == 1);
+				sceneScreen.actorClick(targetActor, button);
 		}
 
 		draggedActor = null;
-		sceneScreen.getUI().getPointer().drag(null);
+		pointer.drag(null);
 	}
 
-	private void use(BaseActor a1, BaseActor a2) {
-		if (a1.getVerb("use", a2.getId()) != null) {
-			sceneScreen.runVerb(a1, "use", a2.getId());
+	private void use(InteractiveActor targetActor, InteractiveActor invActor) {
+		// get best matched verb
+		Verb vtarget = targetActor.getVerb("use", invActor.getId());
+		Verb vinv = invActor.getVerb("use", targetActor.getId());
+		Verb bestMatch = vtarget;
+
+		if (bestMatch == null) {
+			bestMatch = vinv;
+		} else if (vtarget != null && vinv != null && targetActor.getId().equals(vinv.getTarget())
+				&& !invActor.getId().equals(vtarget.getTarget())) {
+			// if the two actors have "use" verbs, we choose the one with the
+			// target matches the actor id.
+			bestMatch = vinv;
+		}
+
+		if (vinv == bestMatch) {
+			sceneScreen.runVerb(invActor, "use", targetActor.getId());
 		} else {
-			sceneScreen.runVerb(a2, "use", a1.getId());
+			sceneScreen.runVerb(targetActor, "use", invActor.getId());
 		}
 	}
 
 	public SpriteActor getItemAt(float x, float y) {
-		if(x < margin || y < margin || x >= getWidth() - margin || y >= getHeight() - margin)
+		if (x < margin || y < margin || x >= getWidth() - margin || y >= getHeight() - margin)
 			return null;
 
-		Inventory inventory = World.getInstance().getInventory();
-		
-		float rowSpace = DPIUtils.getSpacing();
+		Inventory inventory = sceneScreen.getWorld().getInventory();
 
-		int cols = (int) (getWidth() - margin) / (tileSize + (int)rowSpace);
-		int rows = (int) (getHeight() - margin) / (tileSize + (int)rowSpace) - 1;
-
-		int i = (rows - ((int) (y - margin) / (tileSize + (int)rowSpace))) * cols + (int) ( x - margin) / (tileSize + (int)rowSpace);
+		int i = ((rows - 1) - ((int) (y - margin) / (tileSize + (int) rowSpace))) * cols
+				+ (int) (x - margin) / (tileSize + (int) rowSpace);
 
 		if (i >= 0 && i < inventory.getNumItems()) {
 			// EngineLogger.debug(" X: " + x + " Y:" + y + " DESC:" +
 			// inventory.getItem(i).getDesc());
-			return inventory.getItem(i);
+			return inventory.get(i);
 		}
 
 		return null;
 	}
 
-	public int getInventoryPos() {
+	public InventoryPos getInventoryPos() {
 		return inventoryPos;
 	}
-	
-	/** The style for the InventoryUI.
-	 * @author Rafael Garcia */
+
+	/**
+	 * The style for the InventoryUI.
+	 * 
+	 * @author Rafael Garcia
+	 */
 	static public class InventoryUIStyle {
 		/** Optional. */
-		public Drawable background;		
+		public Drawable background;
 		/** Optional. */
-		public Drawable itemBackground;		
-		public ImageButtonStyle menuButtonStyle;
+		public Drawable itemBackground;
+		public ButtonStyle menuButtonStyle;
+		public ButtonStyle inventoryButtonStyle;
 
-		public InventoryUIStyle () {
+		public InventoryUIStyle() {
 		}
 
-		public InventoryUIStyle (InventoryUIStyle style) {
+		public InventoryUIStyle(InventoryUIStyle style) {
 			background = style.background;
 			menuButtonStyle = style.menuButtonStyle;
 			itemBackground = style.itemBackground;
+			inventoryButtonStyle = style.inventoryButtonStyle;
 		}
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java b/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java
new file mode 100644
index 000000000..30b8da0fc
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/LoadSaveScreen.java
@@ -0,0 +1,576 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.ScreenAdapter;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.Texture.TextureFilter;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.InputListener;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.Button.ButtonStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.Container;
+import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
+import com.badlogic.gdx.scenes.scene2d.ui.Image;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Stack;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.SnapshotArray;
+import com.badlogic.gdx.utils.viewport.ScreenViewport;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.Text;
+import com.bladecoder.engine.model.TextManager;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.serialization.WorldSerialization;
+import com.bladecoder.engine.ui.UI.Screens;
+import com.bladecoder.engine.ui.defaults.ScreenControllerHandler;
+import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.EngineLogger;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+public class LoadSaveScreen extends ScreenAdapter implements BladeScreen {
+    private static final int ROW_SLOTS = 3;
+    private static final int COL_SLOTS = 2;
+
+    private UI ui;
+
+    private Stage stage;
+    private Texture bgTexFile = null;
+
+    private boolean loadScreenMode = true;
+
+    private int slotWidth = 0;
+    private int slotHeight = 0;
+
+    // texture list for final dispose
+    private final ArrayList<Texture> textureList = new ArrayList<>();
+
+    private Pointer pointer;
+
+    private ScreenControllerHandler controller;
+
+    public LoadSaveScreen() {
+    }
+
+    @Override
+    public void render(float delta) {
+        Gdx.gl.glClearColor(0, 0, 0, 1);
+        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+
+        stage.act(delta);
+        stage.draw();
+        controller.update(delta);
+    }
+
+    @Override
+    public void resize(int width, int height) {
+        stage.getViewport().update(width, height, true);
+        pointer.resize();
+    }
+
+    @Override
+    public void dispose() {
+        if (stage != null) {
+            stage.dispose();
+            stage = null;
+
+            if (bgTexFile != null) {
+                bgTexFile.dispose();
+            }
+
+            bgTexFile = null;
+
+            for (Texture t : textureList)
+                t.dispose();
+
+            textureList.clear();
+        }
+    }
+
+    @Override
+    public void show() {
+        float size = DPIUtils.getPrefButtonSize();
+        float pad = DPIUtils.getMarginSize();
+        final Skin skin = ui.getSkin();
+        final World world = ui.getWorld();
+
+        // loadScreenMode = ui.getScreen(Screens.LOAD_GAME_SCREEN) == this;
+        loadScreenMode = world.getCurrentScene() == null;
+
+        stage = new Stage(new ScreenViewport());
+
+        slotWidth = (int) (stage.getViewport().getWorldWidth() / (ROW_SLOTS + 1) - 2 * pad);
+        slotHeight = slotWidth * stage.getViewport().getScreenHeight() / stage.getViewport().getScreenWidth();
+
+        LoadSaveScreenStyle style = skin.get(LoadSaveScreenStyle.class);
+
+        Drawable bg = style.background;
+
+        if (bg == null && style.bgFile != null) {
+            bgTexFile = new Texture(EngineAssetManager.getInstance().getResAsset(style.bgFile));
+            bgTexFile.setFilter(TextureFilter.Linear, TextureFilter.Linear);
+
+            bg = new TextureRegionDrawable(new TextureRegion(bgTexFile));
+        }
+
+        Table table = new Table(skin);
+        table.setFillParent(true);
+        table.center();
+        table.pad(pad);
+
+        Label title = new Label(
+                loadScreenMode ? world.getI18N().getString("ui.load") : world.getI18N().getString("ui.save"), skin,
+                "title");
+
+        Button back = new Button(skin, "back");
+
+        back.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                ui.setCurrentScreen(Screens.MENU_SCREEN);
+            }
+        });
+
+        Table header = new Table();
+        // header.padBottom(pad);
+        Container<Button> cont = new Container<>(back);
+        cont.size(size);
+        header.add(cont);
+        header.add(title).fillX().expandX().left();
+        table.add(header).fillX().expandX().left();
+
+        if (bg != null)
+            table.setBackground(bg);
+
+        table.addListener(new InputListener() {
+            @Override
+            public boolean keyUp(InputEvent event, int keycode) {
+                if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK) {
+                    if (world.getCurrentScene() != null)
+                        ui.setCurrentScreen(Screens.SCENE_SCREEN);
+                    else
+                        ui.setCurrentScreen(Screens.MENU_SCREEN);
+                }
+
+                return true;
+            }
+        });
+
+        final PagedScrollPane scroll = new PagedScrollPane();
+        scroll.setFlingTime(0.1f);
+        scroll.setPageSpacing(0);
+
+        Table slots = new Table().pad(pad);
+        slots.defaults().pad(pad).size(slotWidth + pad, slotHeight + pad * 2).top();
+        int c = 0;
+
+        // Add "new slot" slot for save screen
+        if (!loadScreenMode) {
+            slots.add(getSlotButton(Long.toString(new Date().getTime()))).fill().expand();
+            c++;
+        }
+
+        final List<String> sl = getSlots();
+
+        Collections.sort(sl);
+
+        for (int j = sl.size() - 1; j >= 0; j--) {
+
+            String s = sl.get(j);
+
+            if (c % ROW_SLOTS == 0 && c % (ROW_SLOTS * COL_SLOTS) != 0)
+                slots.row();
+
+            if (c != 0 && c % (ROW_SLOTS * COL_SLOTS) == 0) {
+                scroll.addPage(slots);
+                slots = new Table().pad(pad);
+                slots.defaults().pad(pad).size(slotWidth + pad, slotHeight + pad * 2).top();
+            }
+
+            Button removeButton = new Button(skin, "delete_game");
+            removeButton.setName(s);
+            removeButton.addListener(removeClickListener);
+
+            Container<Button> container = new Container<>(removeButton);
+            container.size(DPIUtils.getPrefButtonSize() * .75f);
+            container.align(Align.topRight);
+
+            slots.stack(getSlotButton(s), container).fill().expand();
+
+            c++;
+        }
+
+        // Add last page
+        if (slots.getCells().size > 0)
+            scroll.addPage(slots);
+
+        table.row();
+
+        if (loadScreenMode && sl.size() == 0) {
+            Label lbl = new Label(world.getI18N().getString("ui.noSavedGames"), skin, "title");
+            lbl.setAlignment(Align.center);
+            lbl.setWrap(true);
+            table.add(lbl).expand().fill();
+        } else {
+            table.add(scroll).expand().fill();
+        }
+
+        table.pack();
+
+        stage.setKeyboardFocus(table);
+        stage.addActor(table);
+
+        pointer = new Pointer(ui);
+        stage.addActor(pointer);
+
+        Gdx.input.setInputProcessor(stage);
+
+        controller = new ScreenControllerHandler(ui, stage, stage.getViewport()) {
+            @Override
+            public void focusNext(PointerToNextType type) {
+                SnapshotArray<Actor> content = ((Table) scroll.getActor()).getChildren();
+
+                // find content cursor
+                int idx = -1;
+                for (int i = 0; i < content.size; i++) {
+                    Vector2 inputPos = new Vector2(Gdx.input.getX(), Gdx.input.getY());
+                    content.get(i).screenToLocalCoordinates(inputPos);
+                    if (content.get(i).hit(inputPos.x, inputPos.y, false) != null) {
+                        idx = i;
+                    }
+                }
+
+                // find the slot
+                Button b = getButtonUnderCursor(stage);
+                if (b != null && idx != -1) {
+                    int find = ((Table) content.get(idx)).getChildren()
+                            .indexOf(b.getParent() instanceof Stack ? b.getParent() : b, true);
+
+                    if (type == PointerToNextType.LEFT) {
+                        if (find == 0) {
+                            EngineLogger.debug(">>>Previous page!!");
+                            if (idx > 0) {
+                                idx--;
+                                scroll.scrollToPage(idx);
+
+                                find = ((Table) content.get(idx)).getChildren().size - 1;
+                            }
+                        } else if (find == -1) {
+                            find = 0;
+                        } else {
+                            find--;
+                        }
+                    } else if (type == PointerToNextType.RIGHT) {
+
+                        if (find == ((Table) content.get(idx)).getChildren().size - 1) {
+                            EngineLogger.debug(">>>Next page!!");
+                            if (idx < content.size - 1) {
+                                idx++;
+                                scroll.scrollToPage(idx);
+                                find = 0;
+                            }
+                        } else if (find == -1) {
+                            find = 0;
+                        } else {
+                            find++;
+                        }
+                    }
+
+                    cursorToActor(((Table) content.get(idx)).getChildren().get(find));
+                } else {
+                    super.focusNext(type);
+                }
+            }
+        };
+    }
+
+    private boolean slotExists(String slot) {
+        String filename = slot + WorldSerialization.GAMESTATE_EXT;
+        return ui.getWorld().savedGameExists(filename);
+    }
+
+    /**
+     * Creates a button to represent one slot
+     *
+     * @param slot
+     * @return The button to use for one slot
+     */
+    private Button getSlotButton(String slot) {
+        final Skin skin = ui.getSkin();
+        final Button button = new Button(new ButtonStyle());
+        final ButtonStyle style = button.getStyle();
+        style.up = style.down = skin.getDrawable("black");
+
+        String textLabel = ui.getWorld().getI18N().getString("ui.newSlot");
+        button.setSize(slotWidth, slotHeight);
+
+        if (slotExists(slot)) {
+            button.add(getScreenshot(slot)).maxSize(slotWidth * .95f, slotHeight * .95f);
+
+            try {
+                long l = Long.parseLong(slot);
+
+                Date d = new Date(l);
+                textLabel = (new SimpleDateFormat()).format(d);
+            } catch (Exception e) {
+                textLabel = slot;
+            }
+
+            button.addListener(loadClickListener);
+        } else {
+            Image fg = new Image(skin.getDrawable("plus"));
+            button.add(fg).maxSize(slotHeight / 2, slotHeight / 2);
+
+            button.addListener(saveClickListener);
+        }
+
+        button.row();
+
+        Label label = new Label(textLabel, skin);
+        label.setAlignment(Align.center);
+
+        button.add(label).fillX();
+
+        button.setName(slot);
+        return button;
+    }
+
+    private List<String> getSlots() {
+        final List<String> al = new ArrayList<>();
+
+        FileHandle[] list = EngineAssetManager.getInstance().getUserFolder().list();
+
+        for (FileHandle file : list)
+            if (file.name().endsWith(WorldSerialization.GAMESTATE_EXT)) {
+                String name = file.name().substring(0, file.name().indexOf(WorldSerialization.GAMESTATE_EXT));
+                if (!name.equals("default"))
+                    al.add(name);
+            }
+
+        // Add savedgames in '/tests' folder
+        if (EngineLogger.debugMode()) {
+            String[] list2 = EngineAssetManager.getInstance().listAssetFiles("tests");
+
+            for (String file : list2)
+                if (file.endsWith(WorldSerialization.GAMESTATE_EXT)) {
+                    String name = file.substring(0, file.indexOf(WorldSerialization.GAMESTATE_EXT));
+                    al.add(name);
+                }
+        }
+
+        return al;
+    }
+
+    private Image getScreenshot(String slot) {
+        String filename = slot + WorldSerialization.GAMESTATE_EXT + ".png";
+
+        FileHandle savedFile = null;
+
+        if (EngineAssetManager.getInstance().getUserFile(filename).exists())
+            savedFile = EngineAssetManager.getInstance().getUserFile(filename);
+        else if (EngineAssetManager.getInstance().assetExists("tests/" + filename))
+            savedFile = EngineAssetManager.getInstance().getAsset("tests/" + filename);
+        else {
+            Drawable d = ui.getSkin().getDrawable("black");
+
+            return new Image(d);
+        }
+
+        Texture t = new Texture(savedFile);
+
+        // add to the list for proper dispose when hide the screen
+        textureList.add(t);
+
+        return new Image(t);
+    }
+
+    private ClickListener loadClickListener = new ClickListener() {
+        @Override
+        public void clicked(InputEvent event, float x, float y) {
+            final World world = ui.getWorld();
+            final String filename = event.getListenerActor().getName() + WorldSerialization.GAMESTATE_EXT;
+
+            if (world.savedGameExists() || world.getCurrentScene() != null) {
+                Dialog d = new Dialog("", ui.getSkin()) {
+                    @Override
+                    protected void result(Object object) {
+                        if (((Boolean) object).booleanValue()) {
+                            try {
+                                // if (loadScreenMode) {
+                                world.loadGameState(filename);
+
+                                ui.setCurrentScreen(Screens.SCENE_SCREEN);
+
+                            } catch (IOException e) {
+                                EngineLogger.error(e.getMessage());
+                            }
+                        }
+                    }
+                };
+
+                d.pad(DPIUtils.getMarginSize());
+                d.getButtonTable().padTop(DPIUtils.getMarginSize());
+                d.getButtonTable().defaults().padLeft(DPIUtils.getMarginSize()).padRight(DPIUtils.getMarginSize());
+
+                Label l = new Label(world.getI18N().getString("ui.override_load"), ui.getSkin(), "ui-dialog");
+                l.setWrap(true);
+                l.setAlignment(Align.center);
+
+                d.getContentTable().add(l).prefWidth(Gdx.graphics.getWidth() * .7f);
+
+                d.button(world.getI18N().getString("ui.yes"), true,
+                        ui.getSkin().get("ui-dialog", TextButtonStyle.class));
+                d.button(world.getI18N().getString("ui.no"), false,
+                        ui.getSkin().get("ui-dialog", TextButtonStyle.class));
+                d.key(Keys.ENTER, true).key(Keys.ESCAPE, false);
+
+                d.show(stage);
+            } else {
+
+                try {
+                    // if (loadScreenMode) {
+                    world.loadGameState(filename);
+
+                    ui.setCurrentScreen(Screens.SCENE_SCREEN);
+
+                } catch (IOException e) {
+                    EngineLogger.error(e.getMessage());
+                }
+            }
+        }
+    };
+
+    private ClickListener removeClickListener = new ClickListener() {
+        @Override
+        public void clicked(InputEvent event, float x, float y) {
+            final Actor listenerActor = event.getListenerActor();
+
+            Dialog d = new Dialog("", ui.getSkin()) {
+                @Override
+                protected void result(Object object) {
+                    if (((Boolean) object).booleanValue()) {
+                        final World world = ui.getWorld();
+                        final String filename = listenerActor.getName() + WorldSerialization.GAMESTATE_EXT;
+
+                        try {
+                            world.removeGameState(filename);
+
+                            listenerActor.getParent().getParent().getParent()
+                                    .removeActor(listenerActor.getParent().getParent());
+
+                        } catch (IOException e) {
+                            EngineLogger.error(e.getMessage());
+                        }
+                    }
+                }
+            };
+
+            d.pad(DPIUtils.getMarginSize());
+            d.getButtonTable().padTop(DPIUtils.getMarginSize());
+            d.getButtonTable().defaults().padLeft(DPIUtils.getMarginSize()).padRight(DPIUtils.getMarginSize());
+
+            Label l = new Label(ui.getWorld().getI18N().getString("ui.remove"), ui.getSkin(), "ui-dialog");
+            l.setWrap(true);
+            l.setAlignment(Align.center);
+
+            d.getContentTable().add(l).prefWidth(Gdx.graphics.getWidth() * .7f);
+
+            d.button(ui.getWorld().getI18N().getString("ui.yes"), true,
+                    ui.getSkin().get("ui-dialog", TextButtonStyle.class));
+            d.button(ui.getWorld().getI18N().getString("ui.no"), false,
+                    ui.getSkin().get("ui-dialog", TextButtonStyle.class));
+            d.key(Keys.ENTER, true).key(Keys.ESCAPE, false);
+
+            d.show(stage);
+        }
+    };
+
+    private ClickListener saveClickListener = new ClickListener() {
+        @Override
+        public void clicked(InputEvent event, float x, float y) {
+            final World world = ui.getWorld();
+            final String filename = event.getListenerActor().getName() + WorldSerialization.GAMESTATE_EXT;
+
+            try {
+                world.getSerializer().saveGameState(filename, true);
+
+                world.getCurrentScene().getTextManager().addText("@ui.gamesaved", TextManager.POS_SUBTITLE,
+                        TextManager.POS_SUBTITLE, false, Text.Type.UI, null, null, null, null, null, null);
+
+                ui.setCurrentScreen(Screens.SCENE_SCREEN);
+
+            } catch (IOException e) {
+                EngineLogger.error(e.getMessage());
+            }
+        }
+    };
+
+    @Override
+    public void hide() {
+        dispose();
+    }
+
+    @Override
+    public void setUI(UI ui) {
+        this.ui = ui;
+    }
+
+    /**
+     * The style for the MenuScreen
+     */
+    public static class LoadSaveScreenStyle {
+        /**
+         * Optional.
+         */
+        public Drawable background;
+        /**
+         * if 'bg' not specified try to load the bgFile
+         */
+        public String bgFile;
+
+        public String textButtonStyle;
+
+        public LoadSaveScreenStyle() {
+        }
+
+        public LoadSaveScreenStyle(LoadSaveScreenStyle style) {
+            background = style.background;
+            bgFile = style.bgFile;
+            textButtonStyle = style.textButtonStyle;
+        }
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/LoadingScreen.java b/blade-engine/src/com/bladecoder/engine/ui/LoadingScreen.java
index 3b2eb1767..65cb4acdb 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/LoadingScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/LoadingScreen.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,82 +16,72 @@
 package com.bladecoder.engine.ui;
 
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.ScreenAdapter;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.utils.viewport.ScreenViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.model.World.AssetState;
+import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.ui.UI.Screens;
 import com.bladecoder.engine.util.RectangleRenderer;
 
-public class LoadingScreen implements BladeScreen {
-	private final static float INIT_TIME = 3f;
-	
+public class LoadingScreen extends ScreenAdapter implements BladeScreen {
+	private final static float INIT_TIME_SEG = 1f;
+
+
 	private int pos = 0;
 	private int numSquares = 3;
-	
+
 	private float x, y;
-	
+
 	private float squareWidth = 30f;
 	private float squareHeight = 30f;
 	private float margin = 10f;
-	
+
 	private float initTime = 0;
-	
+
 	private float delta = 0;
-	
+
 	private UI ui;
-	
+
 	private final Viewport viewport = new ScreenViewport();
-	
-	public LoadingScreen() {	
-	}
 
 	@Override
 	public void render(float delta) {
-		if(!World.getInstance().isDisposed()) {
-			World.getInstance().update(delta);
-		}
-
-		AssetState assetState = World.getInstance().getAssetState();
 
-		if (assetState == AssetState.LOADED) {
+		if (!EngineAssetManager.getInstance().isLoading()) {
 			ui.setCurrentScreen(Screens.SCENE_SCREEN);
 			return;
-		}		
-		
-		// Only show the screen when time > INIT_TIME
-		if(initTime < INIT_TIME) {
+		}
+
+		Gdx.gl.glClearColor(0, 0, 0, 1);
+		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+
+		// Only show the squares when time > INIT_TIME
+		if (initTime < INIT_TIME_SEG) {
 			initTime += delta;
 			return;
-		}			
-		
-		SpriteBatch batch = ui.getBatch();
-		
-		Gdx.gl.glClearColor(0, 0, 0, 1);			
-		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+		}
+
+		final SpriteBatch batch = ui.getBatch();
 
 		batch.setProjectionMatrix(viewport.getCamera().combined);
-		batch.begin();			
-				
+		batch.begin();
+
 		update(delta);
-		
-		for(int i=0; i < numSquares; i++) {
 
-			if(i == pos)
-				RectangleRenderer.draw(ui.getBatch(), x + i * (squareWidth + margin), y, squareWidth, squareHeight, Color.WHITE);
-			else
-				RectangleRenderer.draw(ui.getBatch(), x + i * (squareWidth + margin), y, squareWidth, squareHeight, Color.GRAY);
+		for (int i = 0; i < numSquares; i++) {
+			final Color color = i == pos ? Color.WHITE : Color.GRAY;
+			RectangleRenderer.draw(ui.getBatch(), x + i * (squareWidth + margin), y, squareWidth, squareHeight, color);
 		}
 		batch.end();
 	}
-	
+
 	private void update(float d) {
 		delta += d;
-		
-		if(delta > 0.4) {
+
+		if (delta > 0.4) {
 			pos = (pos + 1) % numSquares;
 			delta = 0;
 		}
@@ -100,14 +90,9 @@ private void update(float d) {
 	@Override
 	public void resize(int width, int height) {
 		viewport.update(width, height, true);
-		
-		x = (viewport.getWorldWidth() - (squareWidth * numSquares + margin * (numSquares -1))) / 2; 
-		y = (viewport.getWorldHeight() - squareHeight) / 2;
-	}
-
-	@Override
-	public void dispose() {
 
+		x = (viewport.getWorldWidth() - (squareWidth * numSquares + margin * (numSquares - 1))) / 2;
+		y = (viewport.getWorldHeight() - squareHeight) / 2;
 	}
 
 	@Override
@@ -117,24 +102,8 @@ public void show() {
 		delta = 0;
 	}
 
-	@Override
-	public void hide() {
-		
-	}
-
-	@Override
-	public void pause() {
-		
-	}
-
-	@Override
-	public void resume() {
-		
-	}
-
 	@Override
 	public void setUI(UI ui) {
 		this.ui = ui;
 	}
-	
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java b/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java
index afd58598f..7417d0f13 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/MenuScreen.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,178 +17,483 @@
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
+import com.badlogic.gdx.Input.Keys;
+import com.badlogic.gdx.ScreenAdapter;
+import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.Texture.TextureFilter;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.InputListener;
 import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.Cell;
+import com.badlogic.gdx.scenes.scene2d.ui.Dialog;
+import com.badlogic.gdx.scenes.scene2d.ui.Image;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
 import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.viewport.ScreenViewport;
+import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.ui.UI.Screens;
+import com.bladecoder.engine.ui.defaults.ScreenControllerHandler;
+import com.bladecoder.engine.util.Config;
 import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.EngineLogger;
 
-public class MenuScreen implements BladeScreen {
+public class MenuScreen extends ScreenAdapter implements BladeScreen {
+//	private final static float BUTTON_PADDING = DPIUtils.UI_SPACE;
 
-	public static final String BACK_COMMAND = "back";
-	public static final String QUIT_COMMAND = "quit";
-	public static final String RELOAD_COMMAND = "reload";
-	public static final String HELP_COMMAND = "help";
-	public static final String CREDITS_COMMAND = "credits";
+    private UI ui;
 
-	private static final float MARGIN = DPIUtils.UI_SPACE;
+    private Stage stage;
+    private Texture bgTexFile = null;
+    private Texture titleTexFile = null;
+    private Pointer pointer;
+    private Button credits;
+    private Button help;
+    private Button debug;
 
-	private UI ui;
+    private final Table menuButtonTable = new Table();
+    private final Table iconStackTable = new Table();
+
+    private Music music;
+
+    private ScreenControllerHandler controller;
+
+    public MenuScreen() {
+    }
+
+    @Override
+    public void render(float delta) {
+        Gdx.gl.glClearColor(0, 0, 0, 1);
+        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+
+        stage.act(delta);
+        stage.draw();
+        controller.update(delta);
+    }
 
-	private Stage stage;
+    @Override
+    public void resize(int width, int height) {
+        stage.getViewport().update(width, height, true);
+        pointer.resize();
 
-	private float buttonSize;
+        float size = DPIUtils.getPrefButtonSize();
+        credits.setSize(size, size);
+        help.setSize(size, size);
+        debug.setSize(size, size);
+    }
 
-	public MenuScreen() {
+    @Override
+    public void dispose() {
 
-	}
-
-	@Override
-	public void render(float delta) {
-		Gdx.gl.glClearColor(0, 0, 0, 1);
-		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-
-		stage.act(delta);
-		stage.draw();
-
-		ui.getBatch().setProjectionMatrix(stage.getViewport().getCamera().combined);
-		ui.getBatch().begin();
-		ui.getPointer().draw(ui.getBatch(), stage.getViewport());
-		ui.getBatch().end();
-	}
-
-	@Override
-	public void resize(int width, int height) {
-		stage.getViewport().update(width, height, true);
-	}
-
-	@Override
-	public void dispose() {
-		stage.dispose();
-		stage = null;
-	}
-
-	@Override
-	public void show() {
-		// int wWidth =
-		// EngineAssetManager.getInstance().getResolution().portraitWidth;
-		// int wHeight =
-		// EngineAssetManager.getInstance().getResolution().portraitHeight;
-		//
-		// stage = new Stage(new ExtendViewport(wWidth, wHeight/2));
-
-		stage = new Stage(new ScreenViewport());
-
-		buttonSize = DPIUtils.getPrefButtonSize() * 2f;
-
-		Table table = new Table();
-		table.setFillParent(true);
-		table.center();
-
-		table.addListener(new InputListener() {
-			@Override
-			public boolean keyUp(InputEvent event, int keycode) {
-				if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK) {
-					if (World.getInstance().getCurrentScene() == null)
-						World.getInstance().load();
-
-					ui.setCurrentScreen(Screens.SCENE_SCREEN);
-				}
-				
-				return true;
-			}
-		});
-
-		stage.setKeyboardFocus(table);
-
-		ImageButton back = new ImageButton(new TextureRegionDrawable(ui.getUIAtlas().findRegion(BACK_COMMAND)));
-
-		back.addListener(new ClickListener() {
-			public void clicked(InputEvent event, float x, float y) {
-				if (World.getInstance().getCurrentScene() == null)
-					World.getInstance().load();
-
-				ui.setCurrentScreen(Screens.SCENE_SCREEN);
-			}
-		});
-
-		table.add(back).pad(MARGIN);
-		back.getImageCell().minSize(buttonSize, buttonSize);
-		back.getImageCell().maxSize(buttonSize, buttonSize);
-
-		ImageButton reload = new ImageButton(new TextureRegionDrawable(ui.getUIAtlas().findRegion(RELOAD_COMMAND)));
-		reload.addListener(new ClickListener() {
-			public void clicked(InputEvent event, float x, float y) {
-				World.getInstance().newGame();
-				ui.setCurrentScreen(Screens.SCENE_SCREEN);
-			}
-		});
-
-		table.add(reload).pad(MARGIN);
-		reload.getImageCell().minSize(buttonSize, buttonSize);
-		reload.getImageCell().maxSize(buttonSize, buttonSize);
-
-		ImageButton help = new ImageButton(new TextureRegionDrawable(ui.getUIAtlas().findRegion(HELP_COMMAND)));
-		help.addListener(new ClickListener() {
-			public void clicked(InputEvent event, float x, float y) {
-				ui.setCurrentScreen(Screens.HELP_SCREEN);
-			}
-		});
-
-		table.add(help).pad(MARGIN);
-		help.getImageCell().minSize(buttonSize, buttonSize);
-		help.getImageCell().maxSize(buttonSize, buttonSize);
-
-		ImageButton credits = new ImageButton(new TextureRegionDrawable(ui.getUIAtlas().findRegion(CREDITS_COMMAND)));
-		credits.addListener(new ClickListener() {
-			public void clicked(InputEvent event, float x, float y) {
-				ui.setCurrentScreen(Screens.CREDIT_SCREEN);
-			}
-		});
-
-		table.add(credits).pad(MARGIN);
-		credits.getImageCell().minSize(buttonSize, buttonSize);
-		credits.getImageCell().maxSize(buttonSize, buttonSize);
-
-		ImageButton quit = new ImageButton(new TextureRegionDrawable(ui.getUIAtlas().findRegion(QUIT_COMMAND)));
-		quit.addListener(new ClickListener() {
-			public void clicked(InputEvent event, float x, float y) {
-				Gdx.app.exit();
-			}
-		});
-
-		table.add(quit).pad(MARGIN);
-		quit.getImageCell().minSize(buttonSize, buttonSize);
-		quit.getImageCell().maxSize(buttonSize, buttonSize);
-		table.pack();
-
-		stage.addActor(table);
-
-		Gdx.input.setInputProcessor(stage);
-	}
-
-	@Override
-	public void hide() {
-		dispose();
-	}
-
-	@Override
-	public void pause() {
-	}
-
-	@Override
-	public void resume() {
-	}
-
-	@Override
-	public void setUI(UI ui) {
-		this.ui = ui;
-	}
+        if (stage != null) {
+
+            stage.dispose();
+            stage = null;
+
+            if (bgTexFile != null) {
+                bgTexFile.dispose();
+                bgTexFile = null;
+            }
+
+            if (titleTexFile != null) {
+                titleTexFile.dispose();
+                titleTexFile = null;
+            }
+
+            if (music != null) {
+                music.stop();
+                music.dispose();
+                music = null;
+            }
+        }
+    }
+
+    @Override
+    public void show() {
+        stage = new Stage(new ScreenViewport());
+        controller = new ScreenControllerHandler(ui, stage, stage.getViewport());
+
+        final Skin skin = ui.getSkin();
+        final World world = ui.getWorld();
+
+        final MenuScreenStyle style = getStyle();
+        final BitmapFont f = skin.get(style.textButtonStyle, TextButtonStyle.class).font;
+        float buttonWidth = f.getCapHeight() * 15f;
+
+        // Image background = new Image(style.background);
+        Drawable bg = style.background;
+
+        float scale = 1;
+
+        if (bg == null && style.bgFile != null) {
+            bgTexFile = new Texture(EngineAssetManager.getInstance().getResAsset(style.bgFile));
+            bgTexFile.setFilter(TextureFilter.Linear, TextureFilter.Linear);
+
+            scale = (float) bgTexFile.getHeight() / (float) stage.getViewport().getScreenHeight();
+
+            int width = (int) (stage.getViewport().getScreenWidth() * scale);
+            int x0 = (bgTexFile.getWidth() - width) / 2;
+
+            bg = new TextureRegionDrawable(new TextureRegion(bgTexFile, x0, 0, width, bgTexFile.getHeight()));
+        }
+
+        menuButtonTable.clear();
+        if (bg != null)
+            menuButtonTable.setBackground(bg);
+
+        menuButtonTable.addListener(new InputListener() {
+            @Override
+            public boolean keyUp(InputEvent event, int keycode) {
+                if (keycode == Input.Keys.ESCAPE) {
+                    if (world.getCurrentScene() != null)
+                        ui.setCurrentScreen(Screens.SCENE_SCREEN);
+                } else if (keycode == Input.Keys.BACK) {
+                    Gdx.app.exit();
+                } else if (keycode == Input.Keys.Z) {
+                    controller.focusNext(ScreenControllerHandler.PointerToNextType.LEFT);
+                } else if (keycode == Input.Keys.X) {
+                    controller.focusNext(ScreenControllerHandler.PointerToNextType.RIGHT);
+                } else if (keycode == Keys.ENTER || keycode == Keys.Q) {
+                    controller.clickOnUI();
+                }
+
+                return true;
+            }
+        });
+
+        menuButtonTable.align(getAlign());
+        menuButtonTable.pad(DPIUtils.getMarginSize() * 2);
+        menuButtonTable.defaults().pad(DPIUtils.getSpacing()).width(buttonWidth).align(getAlign());
+//		menuButtonTable.debug();
+
+        stage.setKeyboardFocus(menuButtonTable);
+
+        if (style.showTitle && style.titleStyle != null) {
+
+            Label title = new Label(Config.getInstance().getProperty(Config.TITLE_PROP, "Adventure Blade Engine"), skin,
+                    style.titleStyle);
+
+            title.setAlignment(getAlign());
+
+            menuButtonTable.add(title).padBottom(DPIUtils.getMarginSize() * 2);
+            menuButtonTable.row();
+        }
+
+        if (style.titleFile != null) {
+            titleTexFile = new Texture(EngineAssetManager.getInstance().getResAsset(style.titleFile));
+            titleTexFile.setFilter(TextureFilter.Linear, TextureFilter.Linear);
+
+            Image img = new Image(titleTexFile);
+
+            menuButtonTable.add(img).width(titleTexFile.getWidth() / scale).height(titleTexFile.getHeight() / scale)
+                    .padBottom(DPIUtils.getMarginSize() * 2);
+            menuButtonTable.row();
+        }
+
+        if (world.savedGameExists() || world.getCurrentScene() != null) {
+            TextButton continueGame = new TextButton(world.getI18N().getString("ui.continue"), skin,
+                    style.textButtonStyle);
+            continueGame.getLabel().setAlignment(getAlign());
+
+            continueGame.addListener(new ClickListener() {
+                @Override
+                public void clicked(InputEvent event, float x, float y) {
+                    if (world.getCurrentScene() == null) {
+                        try {
+                            world.load();
+                        } catch (Exception e) {
+                            Gdx.app.exit();
+                        }
+                    }
+
+                    ui.setCurrentScreen(Screens.SCENE_SCREEN);
+                }
+            });
+
+            menuButtonTable.add(continueGame);
+            menuButtonTable.row();
+        }
+
+        TextButton newGame = new TextButton(world.getI18N().getString("ui.new"), skin, style.textButtonStyle);
+        newGame.getLabel().setAlignment(getAlign());
+        newGame.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                if (world.savedGameExists() || world.getCurrentScene() != null) {
+                    showConfirmDialog(skin, world);
+                } else {
+                    newGame(world);
+                }
+            }
+
+        });
+
+        menuButtonTable.add(newGame);
+        menuButtonTable.row();
+
+        TextButton loadGame = new TextButton(world.getI18N().getString("ui.load"), skin, style.textButtonStyle);
+        loadGame.getLabel().setAlignment(getAlign());
+        loadGame.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                ui.setCurrentScreen(Screens.LOAD_GAME_SCREEN);
+            }
+        });
+
+        menuButtonTable.add(loadGame);
+        menuButtonTable.row();
+
+        TextButton quit = new TextButton(world.getI18N().getString("ui.quit"), skin, style.textButtonStyle);
+        quit.getLabel().setAlignment(getAlign());
+        quit.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                Gdx.app.exit();
+            }
+        });
+
+        menuButtonTable.add(quit);
+        menuButtonTable.row();
+
+        menuButtonTable.pack();
+
+        stage.addActor(menuButtonTable);
+
+        // BOTTOM-RIGHT BUTTON STACK
+        credits = new AnimButton(skin, "credits");
+        credits.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                ui.setCurrentScreen(Screens.CREDIT_SCREEN);
+            }
+        });
+
+        help = new AnimButton(skin, "help");
+        help.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                ui.setCurrentScreen(Screens.HELP_SCREEN);
+            }
+        });
+
+        debug = new AnimButton(skin, "debug");
+        debug.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                DebugScreen debugScr = new DebugScreen();
+                debugScr.setUI(ui);
+                ui.setCurrentScreen(debugScr);
+            }
+        });
+
+        iconStackTable.clear();
+        iconStackTable.defaults().pad(DPIUtils.getSpacing()).size(DPIUtils.getPrefButtonSize(),
+                DPIUtils.getPrefButtonSize());
+        iconStackTable.pad(DPIUtils.getMarginSize() * 2);
+
+        if (EngineLogger.debugMode() && world.getCurrentScene() != null) {
+            iconStackTable.add(debug);
+            iconStackTable.row();
+        }
+
+        iconStackTable.add(help);
+        iconStackTable.row();
+        iconStackTable.add(credits);
+        iconStackTable.bottom().right();
+        iconStackTable.setFillParent(true);
+        iconStackTable.pack();
+        stage.addActor(iconStackTable);
+
+        Label version = new Label("v" + Config.getInstance().getProperty(Config.VERSION_PROP, " unspecified"), skin);
+        version.setPosition(DPIUtils.getMarginSize(), DPIUtils.getMarginSize());
+        version.addListener(new ClickListener() {
+            int count = 0;
+            long time = System.currentTimeMillis();
+
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                if (System.currentTimeMillis() - time < 500) {
+                    count++;
+                } else {
+                    count = 0;
+                }
+
+                time = System.currentTimeMillis();
+
+                if (count == 4) {
+                    EngineLogger.toggle();
+
+                    if (ui.getWorld().isDisposed())
+                        return;
+
+                    if (EngineLogger.debugMode()) {
+                        iconStackTable.row();
+                        iconStackTable.add(debug);
+                    } else {
+                        Cell<?> cell = iconStackTable.getCell(debug);
+                        iconStackTable.removeActor(debug);
+                        cell.reset();
+                    }
+                }
+            }
+        });
+
+        stage.addActor(version);
+
+        debug.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                DebugScreen debugScr = new DebugScreen();
+                debugScr.setUI(ui);
+                ui.setCurrentScreen(debugScr);
+            }
+        });
+
+        pointer = new Pointer(ui);
+        stage.addActor(pointer);
+
+        Gdx.input.setInputProcessor(stage);
+
+        if (style.musicFile != null) {
+            new Thread() {
+                @Override
+                public void run() {
+                    music = Gdx.audio.newMusic(EngineAssetManager.getInstance().getAsset(style.musicFile));
+                    music.setLooping(true);
+                    music.play();
+                }
+            }.start();
+        }
+    }
+
+    private void newGame(final World world) {
+        try {
+            world.newGame();
+            ui.setCurrentScreen(Screens.SCENE_SCREEN);
+        } catch (Exception e) {
+            EngineLogger.error("IN NEW GAME", e);
+            Gdx.app.exit();
+        }
+    }
+
+    private void showConfirmDialog(final Skin skin, final World world) {
+        Dialog d = new Dialog("", skin) {
+            @Override
+            protected void result(Object object) {
+                if (((Boolean) object).booleanValue()) {
+                    newGame(world);
+                }
+            }
+        };
+
+        d.pad(DPIUtils.getMarginSize());
+        d.getButtonTable().padTop(DPIUtils.getMarginSize());
+        d.getButtonTable().defaults().padLeft(DPIUtils.getMarginSize()).padRight(DPIUtils.getMarginSize());
+
+        Label l = new Label(world.getI18N().getString("ui.override"), ui.getSkin(), "ui-dialog");
+        l.setWrap(true);
+        l.setAlignment(Align.center);
+
+        d.getContentTable().add(l).prefWidth(Gdx.graphics.getWidth() * .7f);
+
+        d.button(world.getI18N().getString("ui.yes"), true, ui.getSkin().get("ui-dialog", TextButtonStyle.class));
+        d.button(world.getI18N().getString("ui.no"), false, ui.getSkin().get("ui-dialog", TextButtonStyle.class));
+        d.key(Keys.ENTER, true).key(Keys.ESCAPE, false);
+
+        d.show(stage);
+    }
+
+    protected Table getMenuButtonTable() {
+        return menuButtonTable;
+    }
+
+    protected Table getIconStackTable() {
+        return iconStackTable;
+    }
+
+    protected UI getUI() {
+        return ui;
+    }
+
+    protected MenuScreenStyle getStyle() {
+        return ui.getSkin().get(MenuScreenStyle.class);
+    }
+
+    private int getAlign() {
+        if (getStyle().align == null || "center".equals(getStyle().align))
+            return Align.center;
+
+        if ("top".equals(getStyle().align))
+            return Align.top;
+
+        if ("bottom".equals(getStyle().align))
+            return Align.bottom;
+
+        if ("left".equals(getStyle().align))
+            return Align.left;
+
+        if ("right".equals(getStyle().align))
+            return Align.right;
+
+        return Align.center;
+    }
+
+    @Override
+    public void hide() {
+        dispose();
+    }
+
+    @Override
+    public void setUI(UI ui) {
+        this.ui = ui;
+
+        menuButtonTable.setFillParent(true);
+        menuButtonTable.center();
+    }
+
+    /**
+     * The style for the MenuScreen
+     */
+    public static class MenuScreenStyle {
+        /**
+         * Optional.
+         */
+        public Drawable background;
+        /**
+         * if 'bg' not specified try to load the bgFile
+         */
+        public String bgFile;
+        public String titleFile;
+        public String textButtonStyle;
+        public String titleStyle;
+        public boolean showTitle;
+        public String musicFile;
+        public String align;
+
+        public MenuScreenStyle() {
+        }
+
+        public MenuScreenStyle(MenuScreenStyle style) {
+            background = style.background;
+            bgFile = style.bgFile;
+            titleFile = style.titleFile;
+            textButtonStyle = style.textButtonStyle;
+            showTitle = style.showTitle;
+            titleStyle = style.titleStyle;
+            musicFile = style.musicFile;
+            align = style.align;
+        }
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/MenuScreenTextButtons.java b/blade-engine/src/com/bladecoder/engine/ui/MenuScreenTextButtons.java
deleted file mode 100644
index 648dff7b5..000000000
--- a/blade-engine/src/com/bladecoder/engine/ui/MenuScreenTextButtons.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.ui;
-
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Input;
-import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.InputListener;
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.ui.Label;
-import com.badlogic.gdx.scenes.scene2d.ui.Table;
-import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
-import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
-import com.badlogic.gdx.utils.viewport.ScreenViewport;
-import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.ui.UI.Screens;
-import com.bladecoder.engine.util.Config;
-import com.bladecoder.engine.util.DPIUtils;
-import com.bladecoder.engine.util.EngineLogger;
-
-public class MenuScreenTextButtons implements BladeScreen {
-	private UI ui;
-
-	private Stage stage;
-
-	public MenuScreenTextButtons() {
-	}
-
-	@Override
-	public void render(float delta) {
-		Gdx.gl.glClearColor(0, 0, 0, 1);
-		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-
-		stage.act(delta);
-		stage.draw();
-
-		ui.getBatch().setProjectionMatrix(stage.getViewport().getCamera().combined);
-		ui.getBatch().begin();
-		ui.getPointer().draw(ui.getBatch(), stage.getViewport());
-		ui.getBatch().end();
-	}
-
-	@Override
-	public void resize(int width, int height) {
-		stage.getViewport().update(width, height, true);
-	}
-
-	@Override
-	public void dispose() {
-		stage.dispose();
-		stage = null;
-	}
-
-	@Override
-	public void show() {
-		// int wWidth =
-		// EngineAssetManager.getInstance().getResolution().portraitWidth;
-		// int wHeight =
-		// EngineAssetManager.getInstance().getResolution().portraitHeight;
-		//
-		// stage = new Stage(new ExtendViewport(wWidth, wHeight/2));
-
-		stage = new Stage(new ScreenViewport());
-
-		Table table = new Table();
-		table.setFillParent(true);
-		table.center();
-
-		table.addListener(new InputListener() {
-			@Override
-			public boolean keyUp(InputEvent event, int keycode) {
-				if (keycode == Input.Keys.ESCAPE || keycode == Input.Keys.BACK)
-					if (World.getInstance().getCurrentScene() != null)
-						ui.setCurrentScreen(Screens.SCENE_SCREEN);
-				
-				return true;
-			}
-		});
-
-		stage.setKeyboardFocus(table);
-
-		Label title = new Label(Config.getProperty(Config.TITLE_PROP, "Adventure Blade Engine"), ui.getSkin(), "title");
-
-		table.add(title).padBottom(DPIUtils.getMarginSize() * 2);
-
-		if (World.getInstance().savedGameExists()) {
-			TextButton continueGame = new TextButton("Continue", ui.getSkin(), "menu");
-
-			continueGame.addListener(new ClickListener() {
-				public void clicked(InputEvent event, float x, float y) {
-					if (World.getInstance().getCurrentScene() == null)
-						World.getInstance().load();
-
-					ui.setCurrentScreen(Screens.SCENE_SCREEN);
-				}
-			});
-
-			table.row();
-			table.add(continueGame);
-		}
-
-		TextButton newGame = new TextButton("New Game", ui.getSkin(), "menu");
-		newGame.addListener(new ClickListener() {
-			public void clicked(InputEvent event, float x, float y) {
-				World.getInstance().newGame();
-				ui.setCurrentScreen(Screens.SCENE_SCREEN);
-			}
-		});
-
-		table.row();
-		table.add(newGame);
-
-		TextButton help = new TextButton("Help", ui.getSkin(), "menu");
-		help.addListener(new ClickListener() {
-			public void clicked(InputEvent event, float x, float y) {
-				ui.setCurrentScreen(Screens.HELP_SCREEN);
-			}
-		});
-
-		table.row();
-		table.add(help);
-
-		TextButton credits = new TextButton("Credits", ui.getSkin(), "menu");
-		credits.addListener(new ClickListener() {
-			public void clicked(InputEvent event, float x, float y) {
-				ui.setCurrentScreen(Screens.CREDIT_SCREEN);
-			}
-		});
-
-		table.row();
-		table.add(credits);
-		
-		if(EngineLogger.debugMode()) {
-			TextButton debug = new TextButton("[RED]Debug[]", ui.getSkin(), "menu");
-			debug.addListener(new ClickListener() {
-				public void clicked(InputEvent event, float x, float y) {
-					DebugScreen debugScr = new DebugScreen();
-					debugScr.setUI(ui);
-					ui.setCurrentScreen(debugScr);
-				}
-			});
-
-			table.row();
-			table.add(debug);
-		}
-
-		TextButton quit = new TextButton("Quit Game", ui.getSkin(), "menu");
-		quit.addListener(new ClickListener() {
-			public void clicked(InputEvent event, float x, float y) {
-				World.getInstance().dispose();
-				Gdx.app.exit();
-			}
-		});
-
-		table.row();
-		table.add(quit);
-
-		table.pack();
-
-		stage.addActor(table);
-
-		Gdx.input.setInputProcessor(stage);
-	}
-
-	@Override
-	public void hide() {
-		dispose();
-	}
-
-	@Override
-	public void pause() {
-	}
-
-	@Override
-	public void resume() {
-	}
-
-	@Override
-	public void setUI(UI ui) {
-		this.ui = ui;
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/PagedScrollPane.java b/blade-engine/src/com/bladecoder/engine/ui/PagedScrollPane.java
new file mode 100644
index 000000000..c6e204a28
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/PagedScrollPane.java
@@ -0,0 +1,135 @@
+package com.bladecoder.engine.ui;
+
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Cell;
+import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.utils.Array;
+
+public class PagedScrollPane extends ScrollPane {
+
+	private boolean wasPanDragFling = false;
+
+	private Table content;
+
+	public PagedScrollPane() {
+		super(null);
+		setup();
+	}
+
+	public PagedScrollPane(Skin skin) {
+		super(null, skin);
+		setup();
+	}
+
+	public PagedScrollPane(Skin skin, String styleName) {
+		super(null, skin, styleName);
+		setup();
+	}
+
+	public PagedScrollPane(Actor widget, ScrollPaneStyle style) {
+		super(null, style);
+		setup();
+	}
+
+	private void setup() {
+		content = new Table();
+		content.defaults().space(50);
+		super.setActor(content);
+	}
+
+	public void addPages(Actor... pages) {
+		for (Actor page : pages) {
+			content.add(page).expandY().fillY();
+		}
+	}
+
+	public void addPage(Actor page) {
+		content.add(page).expandY().fillY();
+	}
+
+	@Override
+	public void act(float delta) {
+		super.act(delta);
+		if (wasPanDragFling && !isPanning() && !isDragging() && !isFlinging()) {
+			wasPanDragFling = false;
+			scrollToPage();
+		} else {
+			if (isPanning() || isDragging() || isFlinging()) {
+				wasPanDragFling = true;
+			}
+		}
+	}
+
+	@Override
+	public void setWidth(float width) {
+		super.setWidth(width);
+		if (content != null) {
+			for (Cell<?> cell : content.getCells()) {
+				cell.width(width);
+			}
+			content.invalidate();
+		}
+	}
+
+	public void setPageSpacing(float pageSpacing) {
+		if (content != null) {
+			content.defaults().space(pageSpacing);
+			for (Cell<?> cell : content.getCells()) {
+				cell.space(pageSpacing);
+			}
+			content.invalidate();
+		}
+	}
+
+	private void scrollToPage() {
+		final float width = getWidth();
+		final float scrollX = getScrollX();
+		final float maxX = getMaxX();
+
+		if (scrollX >= maxX || scrollX <= 0)
+			return;
+
+		Array<Actor> pages = content.getChildren();
+		float pageX = 0;
+		float pageWidth = 0;
+		if (pages.size > 0) {
+			for (Actor a : pages) {
+				pageX = a.getX();
+				pageWidth = a.getWidth();
+				if (scrollX < (pageX + pageWidth * 0.5)) {
+					break;
+				}
+			}
+			setScrollX(MathUtils.clamp(pageX - (width - pageWidth) / 2, 0, maxX));
+		}
+	}
+
+	public void scrollToPage(int page) {
+		final float width = getWidth();
+		final float scrollX = getScrollX();
+		final float maxX = getMaxX();
+
+//		if (scrollX >= maxX || scrollX <= 0)
+//			return;
+
+		Actor a = content.getChildren().get(page);
+		float pageX = 0;
+		float pageWidth = 0;
+
+		pageX = a.getX();
+		pageWidth = a.getWidth();
+//		if (scrollX < (pageX + pageWidth * 0.5)) {
+//			return;
+//		}
+
+		setScrollX(MathUtils.clamp(pageX - (width - pageWidth) / 2, 0, maxX));
+
+		updateVisualScroll();
+		invalidate();
+		layout();
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/PieMenu.java b/blade-engine/src/com/bladecoder/engine/ui/PieMenu.java
index cddbd8508..3ce95d0f3 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/PieMenu.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/PieMenu.java
@@ -18,13 +18,15 @@
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.actions.Actions;
-import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.bladecoder.engine.i18n.I18N;
-import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.ui.UI.InputMode;
+import com.bladecoder.engine.ui.defaults.ScreenControllerHandler;
 import com.bladecoder.engine.util.DPIUtils;
 import com.bladecoder.engine.util.RectangleRenderer;
 
@@ -32,109 +34,117 @@ public class PieMenu extends com.badlogic.gdx.scenes.scene2d.Group {
 
 	private BitmapFont font;
 
-	private ImageButton lookatButton;
-	private ImageButton talktoButton;
-	private ImageButton pickupButton;
+	private Button lookatButton;
+	private Button talktoButton;
+	private Button pickupButton;
 
 	private float x = 0, y = 0;
 
-	private BaseActor baseActor = null;
+	private InteractiveActor iActor = null;
 
 	private final SceneScreen sceneScreen;
-	
+
 	private int viewportWidth, viewportHeight;
 
+	private final GlyphLayout layout = new GlyphLayout();
+
+	private String desc = null;
+
 	public PieMenu(SceneScreen scr) {
 		sceneScreen = scr;
 		font = scr.getUI().getSkin().getFont("desc");
-				
-		lookatButton = new ImageButton(scr.getUI().getSkin(), "pie_lookat");
+
+		lookatButton = new AnimButton(scr.getUI().getSkin(), "pie_lookat");
 		addActor(lookatButton);
-		lookatButton.addListener(new ChangeListener() {			
+		lookatButton.addListener(new ChangeListener() {
 			@Override
 			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
-				if (baseActor != null) {
-					sceneScreen.runVerb(baseActor, "lookat", null);
+				if (iActor != null && iActor.canInteract()) {
+					sceneScreen.runVerb(iActor, "lookat", null);
 				}
 
 				hide();
 			}
 		});
-		
-		talktoButton = new ImageButton(scr.getUI().getSkin(), "pie_talkto");
+
+		talktoButton = new AnimButton(scr.getUI().getSkin(), "pie_talkto");
 		addActor(talktoButton);
-		talktoButton.addListener(new ChangeListener() {			
+		talktoButton.addListener(new ChangeListener() {
 			@Override
 			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
-				if (baseActor != null) {
-					sceneScreen.runVerb(baseActor, "talkto", null);
+				if (iActor != null && iActor.canInteract()) {
+					sceneScreen.runVerb(iActor, "talkto", null);
 				}
 
 				hide();
 			}
 		});
-		
-		pickupButton = new ImageButton(scr.getUI().getSkin(), "pie_pickup");
+
+		pickupButton = new AnimButton(scr.getUI().getSkin(), "pie_pickup");
 		addActor(pickupButton);
-		pickupButton.addListener(new ChangeListener() {			
+		pickupButton.addListener(new ChangeListener() {
 			@Override
 			public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
-				if (baseActor != null) {
-					sceneScreen.runVerb(baseActor, "pickup", null);
+				if (iActor != null) {
+					sceneScreen.runVerb(iActor, "pickup", null);
 				}
 
 				hide();
 			}
 		});
-		
-//		addListener(new InputListener() {
-//			@Override
-//			public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
-//				hide();
-//				
-//				return false;
-//			}
-//		});
 	}
 
 	@Override
 	public void draw(Batch batch, float alpha) {
 
+		// check if the interactive or visible property has change and hide it.
+		if (!iActor.canInteract()) {
+			hide();
+			return;
+		}
+
 		super.draw(batch, alpha);
 
 		// DRAW TARGET DESCRIPTION
-		String desc = baseActor.getDesc();
+		String desc = iActor.getDesc();
 
 		if (desc != null) {
-
-			if (desc.charAt(0) == '@')
-				desc = I18N.getString(desc.substring(1));
-					
-			TextBounds b = font.getBounds(desc);
 			float margin = DPIUtils.UI_SPACE;
 
-			float textX = x - b.width / 2;
-			float textY = y - b.height - DPIUtils.UI_SPACE;
+			float textX = x - layout.width / 2;
+			float textY = y - layout.height - DPIUtils.UI_SPACE;
 
 			if (textX < 0)
 				textX = 0;
 
-			RectangleRenderer.draw(batch, textX - margin, textY - b.height - margin,
-					b.width + margin*2, b.height + margin*2, Color.BLACK);
-			font.draw(batch, desc, textX, textY);
+			RectangleRenderer.draw(batch, textX - margin, textY - layout.height - margin, layout.width + margin * 2,
+					layout.height + margin * 2, Color.BLACK);
+			font.draw(batch, layout, textX, textY);
 		}
 	}
 
 	public void hide() {
 		setVisible(false);
-		baseActor = null;
+		iActor = null;
 	}
 
-	public void show(BaseActor a, float x, float y) {
+	public void show(InteractiveActor a, float x, float y) {
 		setVisible(true);
 		this.x = x;
 		this.y = y;
-		baseActor = a;
+		iActor = a;
+
+		// DRAW TARGET DESCRIPTION
+		desc = iActor.getDesc();
+
+		if (desc != null) {
+
+			if (desc.charAt(0) == I18N.PREFIX)
+				desc = sceneScreen.getWorld().getI18N().getString(desc.substring(1));
+
+			layout.setText(font, desc);
+		}
+
 		Actor rightButton;
 
 		if (a.getVerb("talkto") != null) {
@@ -146,48 +156,51 @@ public void show(BaseActor a, float x, float y) {
 			pickupButton.setVisible(true);
 			rightButton = pickupButton;
 		}
-		
+
 		float margin = DPIUtils.getMarginSize();
-		
+
 		// FITS TO SCREEN
-		if(x < lookatButton.getWidth() + margin)
+		if (x < lookatButton.getWidth() + margin)
 			this.x = lookatButton.getWidth() + margin;
-		else if(x > viewportWidth - lookatButton.getWidth() - margin)
+		else if (x > viewportWidth - lookatButton.getWidth() - margin)
 			this.x = viewportWidth - lookatButton.getWidth() - margin;
-		
-		if(y < margin)
+
+		if (y < margin)
 			this.y = margin;
-		else if(y > viewportHeight - lookatButton.getHeight() - margin)
+		else if (y > viewportHeight - lookatButton.getHeight() - margin)
 			this.y = viewportHeight - lookatButton.getHeight() - margin;
-		
-		//lookatButton.setPosition(this.x - lookatButton.getWidth() - margin / 2, this.y + margin);
+
+		// lookatButton.setPosition(this.x - lookatButton.getWidth() - margin / 2,
+		// this.y + margin);
 		lookatButton.setPosition(this.x - lookatButton.getWidth() / 2, this.y - lookatButton.getHeight() / 2);
-		lookatButton.addAction(Actions
-				.moveTo(this.x - lookatButton.getWidth() - margin / 2, this.y + margin, .1f));
-		
+		lookatButton.addAction(
+				Actions.sequence(Actions.moveTo(this.x - lookatButton.getWidth() - margin / 2, this.y + margin, .1f),
+						Actions.run(new Runnable() {
 
-//		rightButton.setPosition(this.x + margin / 2, this.y + margin);
+							@Override
+							public void run() {
+								if (sceneScreen.getUI().getInputMode() == InputMode.GAMEPAD) {
+									ScreenControllerHandler.cursorToActor(lookatButton);
+								}
+							}
+
+						})));
+
+		// rightButton.setPosition(this.x + margin / 2, this.y + margin);
 		rightButton.setPosition(this.x - lookatButton.getWidth() / 2, this.y - lookatButton.getHeight() / 2);
-		rightButton.addAction(Actions
-				.moveTo(this.x + margin / 2, this.y + margin, .1f));
+		rightButton.addAction(Actions.moveTo(this.x + margin / 2, this.y + margin, .1f));
 
 	}
 
 	public void resize(int width, int height) {
 		viewportWidth = width;
 		viewportHeight = height;
-		
+
 		setBounds(0, 0, width, height);
 
 		float size = DPIUtils.getPrefButtonSize();
-		float iconSize = Math.max(size/2, DPIUtils.ICON_SIZE);
+		lookatButton.setSize(size, size);
 		talktoButton.setSize(size, size);
-		talktoButton.getImageCell().maxSize(iconSize, iconSize);
-
 		pickupButton.setSize(size, size);
-		pickupButton.getImageCell().maxSize(iconSize, iconSize);
-		
-		lookatButton.setSize(size, size);
-		lookatButton.getImageCell().maxSize(iconSize, iconSize);
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/PieMenu2.java b/blade-engine/src/com/bladecoder/engine/ui/PieMenu2.java
new file mode 100644
index 000000000..5d033ac7f
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/PieMenu2.java
@@ -0,0 +1,183 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.actions.Actions;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton.ImageButtonStyle;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.RectangleRenderer;
+
+public class PieMenu2 extends com.badlogic.gdx.scenes.scene2d.Group {
+
+	private final static int NUM_VERBS = 10;
+
+	private BitmapFont font;
+
+	private Button[] buttons;
+	private Vector2[] endPositions;
+
+	private float x = 0, y = 0;
+
+	private float distance = 100;
+	private float minAngle = 0, maxAngle = 360, startAngle = 0;
+
+	private InteractiveActor iActor = null;
+
+	private final SceneScreen sceneScreen;
+
+	private int viewportWidth, viewportHeight;
+
+	private final GlyphLayout layout = new GlyphLayout();
+
+	private String desc = null;
+
+	public PieMenu2(SceneScreen scr) {
+		sceneScreen = scr;
+		font = scr.getUI().getSkin().getFont("desc");
+		buttons = new Button[NUM_VERBS];
+		endPositions = new Vector2[NUM_VERBS];
+
+		for (int i = 0; i < NUM_VERBS; i++) {
+			buttons[i] = new Button(scr.getUI().getSkin(), "pie_lookat");
+			endPositions[i] = new Vector2();
+			addActor(buttons[i]);
+
+			buttons[i].addListener(new ChangeListener() {
+				@Override
+				public void changed(ChangeEvent event, com.badlogic.gdx.scenes.scene2d.Actor actor) {
+					if (iActor != null) {
+						sceneScreen.runVerb(iActor, "lookat", null);
+					}
+
+					hide();
+				}
+			});
+		}
+	}
+
+	@Override
+	public void draw(Batch batch, float alpha) {
+
+		super.draw(batch, alpha);
+
+		// DRAW TARGET DESCRIPTION
+		String desc = iActor.getDesc();
+
+		if (desc != null) {
+			float margin = DPIUtils.UI_SPACE;
+
+			float textX = x - layout.width / 2;
+			float textY = y - layout.height - DPIUtils.UI_SPACE;
+
+			if (textX < 0)
+				textX = 0;
+
+			RectangleRenderer.draw(batch, textX - margin, textY - layout.height - margin, layout.width + margin * 2,
+					layout.height + margin * 2, Color.BLACK);
+			font.draw(batch, layout, textX, textY);
+		}
+	}
+
+	public void hide() {
+		setVisible(false);
+		iActor = null;
+	}
+
+	public void show(InteractiveActor a, float x, float y) {
+		setVisible(true);
+		this.x = x;
+		this.y = y;
+		iActor = a;
+
+		// DRAW TARGET DESCRIPTION
+		desc = iActor.getDesc();
+
+		if (desc != null) {
+
+			if (desc.charAt(0) == I18N.PREFIX)
+				desc = sceneScreen.getWorld().getI18N().getString(desc.substring(1));
+
+			layout.setText(font, desc);
+		}
+
+		float margin = DPIUtils.getMarginSize();
+
+		// FITS TO SCREEN
+		if (x < distance + buttons[0].getWidth() / 2 + margin)
+			this.x = distance + buttons[0].getWidth() / 2 + margin;
+		else if (x > viewportWidth - distance - buttons[0].getWidth() / 2 - margin)
+			this.x = viewportWidth - distance - buttons[0].getWidth() / 2 - margin;
+
+		if (y < distance + buttons[0].getHeight() / 2 + margin)
+			this.y = distance + buttons[0].getHeight() / 2 + margin;
+		else if (y > viewportHeight - distance - buttons[0].getHeight() / 2 - margin)
+			this.y = viewportHeight - distance - buttons[0].getHeight() / 2 - margin;
+
+		float offsetAngle = ((maxAngle - minAngle)) / (NUM_VERBS - 1);
+		float angle = startAngle;
+
+		for (int i = 0; i < NUM_VERBS; i++) {
+
+			endPositions[i].x = (float) (Math.cos(Math.toRadians(angle))) * distance + this.x;
+			endPositions[i].y = (float) (Math.sin(Math.toRadians(angle))) * distance + this.y;
+
+			buttons[i].setPosition(this.x - buttons[i].getWidth() / 2, this.y - buttons[i].getHeight() / 2);
+			buttons[i].addAction(Actions.moveTo(endPositions[i].x - buttons[i].getWidth() / 2,
+					endPositions[i].y - buttons[i].getWidth() / 2, .1f));
+
+			angle += offsetAngle;
+		}
+
+	}
+
+	public void resize(int width, int height) {
+		viewportWidth = width;
+		viewportHeight = height;
+
+		setBounds(0, 0, width, height);
+	}
+
+	/**
+	 * The style for the PieMenu2.
+	 * 
+	 * @author Rafael Garcia
+	 */
+	static public class PieMenu2Style {
+		public ImageButtonStyle buttonStyle;
+		public float distance;
+		public float minAngle, maxAngle, startAngle;
+
+		public PieMenu2Style() {
+		}
+
+		public PieMenu2Style(PieMenu2Style style) {
+			buttonStyle = style.buttonStyle;
+			distance = style.distance;
+			minAngle = style.minAngle;
+			maxAngle = style.maxAngle;
+			startAngle = style.startAngle;
+		}
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/Pointer.java b/blade-engine/src/com/bladecoder/engine/ui/Pointer.java
index e29e62228..51e7e0549 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/Pointer.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/Pointer.java
@@ -16,140 +16,82 @@
 package com.bladecoder.engine.ui;
 
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Input.Peripheral;
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Touchable;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import com.bladecoder.engine.i18n.I18N;
-import com.bladecoder.engine.model.SpriteRenderer;
+import com.bladecoder.engine.ui.UI.InputMode;
 import com.bladecoder.engine.util.DPIUtils;
-import com.bladecoder.engine.util.RectangleRenderer;
 
-public class Pointer {
-	private static final String LEAVE_ICON = "leave";
+/**
+ * WARNING!!! This is a *struct* in C# so we have to use assign instead of '='
+ * operator. And always create the object, null value is not allowed.
+ * 
+ */
+public class Pointer extends Actor {
 	private static final String POINTER_ICON = "pointer";
-	private static final String HOTSPOT_ICON = "hotspotpointer";
-	
-	private static final Color DRAG_NOT_HOTSPOT_COLOR = new Color(.5f, 0.5f, 0.5f, 1f);
-
-	private BitmapFont font;
-
-	private String desc = null;
 
-	private TextureRegion leaveIcon;
-	private TextureRegion pointerIcon;
-	private TextureRegion hotspotIcon;
-	private TextureRegion currentIcon;
-	private SpriteRenderer draggingRenderer;
+	private Drawable pointerIcon;
 
 	private final Vector2 mousepos = new Vector2();
-	
+
 	private float pointerScale;
-//	private Skin skin;
-
-	public Pointer(Skin skin) {
-//		this.skin = skin;
-		font = skin.getFont("desc");
-		pointerIcon = skin.getAtlas().findRegion(POINTER_ICON);
-		leaveIcon = skin.getAtlas().findRegion(LEAVE_ICON);
-		hotspotIcon = skin.getAtlas().findRegion(HOTSPOT_ICON);
-		reset();
-	}
 
-	public void reset() {
-		setDefaultIcon();
-		draggingRenderer = null;
-	}
-	
-	public void drag(SpriteRenderer r) {
-		draggingRenderer = r;
-	}
+	private UI ui;
 
-	public void setDefaultIcon() {
-		currentIcon = pointerIcon;
-		desc = null;
-	}
+	public Pointer(UI ui) {
+		this.ui = ui;
+		pointerIcon = ui.getSkin().getDrawable(POINTER_ICON);
+		setTouchable(Touchable.disabled);
 
-	public void setLeaveIcon() {
-		currentIcon = leaveIcon;
+		resize();
+		show();
 	}
 
-	public void setHotspotIcon() {
-		currentIcon = hotspotIcon;
-	}
+	private void getInputUnproject(Viewport v, Vector2 out) {
+		out.set(Gdx.input.getX(), Gdx.input.getY());
 
-	public void setIcon(TextureRegion r) {
-		currentIcon = r;
+		v.unproject(out);
 	}
 
-	public void setDesc(String s) {
-		desc = s;
+	@Override
+	public void act(float delta) {
 
-		if (desc != null && desc.charAt(0) == '@')
-			desc = I18N.getString(desc.substring(1));
-	}
+		if (pointerIcon instanceof AnimationDrawable)
+			((AnimationDrawable) pointerIcon).act(delta);
 
-	private void getInputUnproject(Viewport v, Vector2 out) {
-		out.set(Gdx.input.getX(), Gdx.input.getY());
+		super.act(delta);
 
-		v.unproject(out);
+		if (getStage().getActors().get(getStage().getActors().size - 1) != this)
+			toFront();
 	}
 
-	public void draw(SpriteBatch batch, Viewport v) {
+	@Override
+	public void draw(Batch batch, float alpha) {
 
-		getInputUnproject(v, mousepos);
+		getInputUnproject(getStage().getViewport(), mousepos);
 
-		// DRAW TARGET DESCRIPTION
-		if (desc != null) {
-			TextBounds b = font.getBounds(desc);
-			float margin = DPIUtils.UI_SPACE;
+		setPosition(mousepos.x - getWidth() / 2, mousepos.y - getHeight() / 2);
 
-			float textX = mousepos.x - b.width / 2;
-			float textY = mousepos.y + b.height + DPIUtils.UI_SPACE + DPIUtils.getTouchMinSize();
-
-			if (textX < 0)
-				textX = 0;
+		pointerIcon.draw(batch, getX(), getY(), getWidth(), getHeight());
+	}
 
-			RectangleRenderer.draw(batch, textX - margin, textY - b.height - margin,
-					b.width + margin*2, b.height + margin*2, Color.BLACK);
-			font.draw(batch, desc, textX, textY);
-		}
+	public void resize() {
+		pointerScale = DPIUtils.getTouchMinSize() / pointerIcon.getMinHeight() * .8f;
+		setSize(pointerIcon.getMinWidth() * pointerScale, pointerIcon.getMinHeight() * pointerScale);
+	}
 
-		if (draggingRenderer == null) {
-			if (!Gdx.input.isPeripheralAvailable(Peripheral.MultitouchScreen)
-					|| currentIcon == leaveIcon) {
-
-				batch.draw(currentIcon,
-						mousepos.x - currentIcon.getRegionWidth() * pointerScale
-								/ 2, mousepos.y - currentIcon.getRegionHeight()
-								* pointerScale / 2, currentIcon.getRegionWidth()
-								* pointerScale, currentIcon.getRegionHeight()
-								* pointerScale);
-			}
+	public void show() {
+		if (ui.getInputMode() == InputMode.TOUCHPANEL) {
+			setVisible(false);
 		} else {
-			float h = (draggingRenderer.getHeight() > draggingRenderer.getWidth()? draggingRenderer.getHeight():draggingRenderer.getWidth());
-			float size =  DPIUtils.getTouchMinSize() / h * 1.8f;
-	         
-	        if(currentIcon != hotspotIcon) {
-	        	batch.setColor(DRAG_NOT_HOTSPOT_COLOR);
-	        }
-	     	
-	        draggingRenderer.draw(batch, mousepos.x,
-	        		mousepos.y - draggingRenderer.getHeight() * size / 2, size);
-	        
-	        if(currentIcon != hotspotIcon) {
-	        	batch.setColor(Color.WHITE);
-	        }	
+			setVisible(true);
 		}
 	}
 
-	public void resize(int width, int height) {
-		pointerScale = DPIUtils.getTouchMinSize() / pointerIcon.getRegionHeight() * .8f;
+	public void hide() {
+		setVisible(false);
 	}
-
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/Recorder.java b/blade-engine/src/com/bladecoder/engine/ui/Recorder.java
index 49e33ad1a..db44fc46c 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/Recorder.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/Recorder.java
@@ -19,15 +19,13 @@
 import java.io.Writer;
 import java.util.ArrayList;
 
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Json;
 import com.bladecoder.engine.assets.EngineAssetManager;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.Dialog;
+import com.bladecoder.engine.model.InteractiveActor;
 import com.bladecoder.engine.model.Scene;
 import com.bladecoder.engine.model.World;
 import com.bladecoder.engine.util.EngineLogger;
@@ -40,19 +38,31 @@
  * @author rgarcia
  */
 public class Recorder {
-	private static final String RECORD_FILENAME = "verbs.rec";
-	private static final String GAMESTATE_FILENAME = "gamestate.rec";
+	private static final String DEFAULT_RECORD_FILENAME = "record";
+	public static final String RECORD_EXT = ".verbs.rec";
+	public static final String GAMESTATE_REC_EXT = ".gamestate.rec";
 	private static final float WAITING_TIME = .5f;
 
-	private ArrayList<TimeVerb> list = new ArrayList<TimeVerb>();
+	private ArrayList<TimeVerb> list = new ArrayList<>();
 	private boolean playing = false;
 	private boolean recording = false;
 	private float time;
 	private int pos;
+	private String fileName = DEFAULT_RECORD_FILENAME;
+	private final World w;
+
+	// TO TEST SAVEGAME FEATURE
+	private static final boolean TEST_SAVEGAME = false;
+	private static final int SAVE_EACH_SECONDS = 10;
+	private int oldt = 0;
+
+	public Recorder(World w) {
+		this.w = w;
+	}
 
 	public void update(float delta) {
 
-		if (World.getInstance().isPaused())
+		if (w.isPaused())
 			return;
 
 		if (recording) {
@@ -67,30 +77,65 @@ public void update(float delta) {
 
 			TimeVerb v = list.get(pos);
 
-			Scene s = World.getInstance().getCurrentScene();
+			Scene s = w.getCurrentScene();
 
 			StringBuilder stringBuilder = new StringBuilder();
-			stringBuilder.append("RECORDER - ");
+			stringBuilder.append("RECORDER (").append(pos).append(") - ");
+
+			if (TEST_SAVEGAME) {
+				int t = (int) (w.getTimeOfGame() / 1000f);
+				// save and load game every 5 seconds
+				if (t % SAVE_EACH_SECONDS == 0 && oldt != t) {
+					oldt = t;
+					EngineLogger.debug(">> TESTING: SAVING AND LOADING GAMESTATE..." + t / SAVE_EACH_SECONDS);
+					try {
+						w.saveGameState();
+						w.loadGameState();
+						return;
+					} catch (Exception e) {
+						EngineLogger.error("PLAYING ERROR: Error saving/loading gamestate.", e);
+					}
+				}
+			}
+
+			// check preconditions
+			if (!playing || v.time > time || w.inCutMode())
+				return;
 
-			// while (playing && v.time < time) {
-			if (playing && v.time < time) {
-				if (v.verb == null) {
-					if (v.pos == null) { // DIALOG OPTION
-						Dialog d = World.getInstance().getCurrentDialog();
-						d.selectOption(v.dialogOption);
+			if (v.verb == null) {
+				if (v.pos == null) { // DIALOG OPTION
+					if (!w.hasDialogOptions() || w.getDialogOptions().size() <= v.dialogOption) {
+						EngineLogger.error("PLAYING ERROR: No dialog options to select. Size: "
+								+ (w.hasDialogOptions() ? w.getDialogOptions().size() : 0) + " select: "
+								+ v.dialogOption);
+					} else {
+						w.selectDialogOption(v.dialogOption);
 
 						stringBuilder.append(" SELECT DIALOG OPTION: ").append(v.dialogOption);
-					} else { // GOTO
-						s.getPlayer().goTo(v.pos, null);
+					}
+				} else { // GOTO
+					s.getPlayer().goTo(v.pos, null, false);
+
+					stringBuilder.append(" GOTO ").append(v.pos.x).append(',').append(v.pos.y);
+				}
+			} else {
 
-						stringBuilder.append(" GOTO ").append(v.pos.x).append(',').append(v.pos.y);
+				stringBuilder.append(v.verb);
+
+				if (v.verb.equals("SAVEGAME")) {
+					// SPECIAL VERB TO SAVE THE GAME
+					stringBuilder.append(v.target);
+					try {
+						w.getSerializer().saveGameState(v.target, true);
+					} catch (IOException e) {
+						EngineLogger.error("Couldn't save game: " + v.target + " : " + e.getMessage());
 					}
+				} else if(v.actorId == null) {
+					s.runVerb(v.verb);
 				} else {
-
-					BaseActor a = s.getActor(v.actorId, true);
+					InteractiveActor a = (InteractiveActor) s.getActor(v.actorId, true);
 
 					if (a != null) {
-						stringBuilder.append(v.verb);
 						stringBuilder.append(' ').append(v.actorId);
 
 						if (v.target != null) {
@@ -101,17 +146,12 @@ public void update(float delta) {
 					} else
 						EngineLogger.error("PLAYING ERROR: BaseActor not found: " + v.actorId);
 				}
+			}
 
-				EngineLogger.debug(stringBuilder.toString());
+			EngineLogger.debug(stringBuilder.toString());
 
-				time = 0;
-				pos++;
-				if (pos >= list.size()) {
-					setPlaying(false);
-				} else {
-					v = list.get(pos);
-				}
-			}
+			time = 0;
+			pos++;
 		}
 	}
 
@@ -136,9 +176,7 @@ public void add(int dialogOption) {
 			time += WAITING_TIME;
 			v.time = time;
 
-			Dialog d = World.getInstance().getCurrentDialog();
-
-			if (d != null) {
+			if (w.hasDialogOptions()) {
 				v.dialogOption = dialogOption;
 			}
 
@@ -171,7 +209,11 @@ public void setRecording(boolean recording) {
 
 		if (recording) {
 			EngineLogger.debug("RECORDING...");
-			World.getInstance().saveGameState(GAMESTATE_FILENAME);
+			try {
+				w.getSerializer().saveGameState(fileName + GAMESTATE_REC_EXT, false);
+			} catch (IOException e) {
+				EngineLogger.error(e.getMessage());
+			}
 		} else
 			save();
 	}
@@ -181,7 +223,10 @@ public boolean isPlaying() {
 	}
 
 	public void setPlaying(boolean p) {
-		EngineLogger.debug("PLAYING...");
+		if (p)
+			EngineLogger.debug("PLAYING...");
+		else
+			EngineLogger.debug("STOP PLAYING...");
 
 		this.playing = p;
 		this.recording = false;
@@ -192,7 +237,7 @@ public void setPlaying(boolean p) {
 	public void draw(SpriteBatch batch) {
 		if (recording && ((int) time) % 2 == 0) {
 			// RectangleRenderer.draw(batch, 10,
-			// World.getInstance().getCamera().getViewport().commandHeight - 30,
+			// w.getCamera().getViewport().commandHeight - 30,
 			// 20, 20, Color.RED);
 
 			// TODO: Provisional. Pass viewport to get height
@@ -209,40 +254,43 @@ static class TimeVerb {
 		Vector2 pos;
 	}
 
-	public void load() {
-		load(null);
+	public String getFileName() {
+		return fileName;
 	}
 
-	@SuppressWarnings("unchecked")
-	public void load(String name) {
-		String gameStateFileName;
-		String recordFileName;
-
-		if (name != null) {
-			gameStateFileName = name + "." + GAMESTATE_FILENAME;
-			recordFileName = name + "." + RECORD_FILENAME;
+	public void setFilename(String name) {
+		if (name != null && !name.trim().isEmpty()) {
+			fileName = name;
 		} else {
-			gameStateFileName = GAMESTATE_FILENAME;
-			recordFileName = RECORD_FILENAME;
+			fileName = DEFAULT_RECORD_FILENAME;
 		}
+	}
+
+	@SuppressWarnings("unchecked")
+	public void load() {
+		String gameStateFileName = fileName + GAMESTATE_REC_EXT;
+		String recordFileName = fileName + RECORD_EXT;
 
 		FileHandle verbsFile = EngineAssetManager.getInstance().getUserFile(recordFileName);
 
 		if (!verbsFile.exists())
-			verbsFile = Gdx.files.internal("tests/" + recordFileName);
+			verbsFile = EngineAssetManager.getInstance().getAsset("tests/" + recordFileName);
 
 		if (verbsFile.exists()) {
 			// LOAD GAME STATE IF EXISTS
-			FileHandle gameStateFile = EngineAssetManager.getInstance().getUserFile(
-					gameStateFileName);
+			FileHandle gameStateFile = EngineAssetManager.getInstance().getUserFile(gameStateFileName);
 
 			if (!gameStateFile.exists())
-				gameStateFile = Gdx.files.internal("tests/" + gameStateFileName);
+				gameStateFile = EngineAssetManager.getInstance().getAsset("tests/" + gameStateFileName);
 
 			if (gameStateFile.exists())
-				World.getInstance().loadGameState(gameStateFile);
+				try {
+					w.getSerializer().loadGameState(gameStateFile);
+				} catch (IOException e) {
+					EngineLogger.error(e.getMessage());
+				}
 			else
-				EngineLogger.error("LOADING RECORD: no saved file exists");
+				EngineLogger.debug("LOADING RECORD: no saved file exists");
 
 			// LOAD VERBS
 			list = new Json().fromJson(ArrayList.class, TimeVerb.class, verbsFile.reader("UTF-8"));
@@ -255,10 +303,11 @@ public void save() {
 
 		Json json = new Json();
 
-		String s = json.prettyPrint(list);
+		// String s = json.prettyPrint(list);
+		String s = json.toJson(list, ArrayList.class, TimeVerb.class);
+		s = json.prettyPrint(s);
 
-		Writer w = EngineAssetManager.getInstance().getUserFile(RECORD_FILENAME)
-				.writer(false, "UTF-8");
+		Writer w = EngineAssetManager.getInstance().getUserFile(fileName + RECORD_EXT).writer(false, "UTF-8");
 
 		try {
 			w.write(s);
diff --git a/blade-engine/src/com/bladecoder/engine/ui/SceneExtendViewport.java b/blade-engine/src/com/bladecoder/engine/ui/SceneExtendViewport.java
index 7d17a5897..56009906b 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/SceneExtendViewport.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/SceneExtendViewport.java
@@ -15,14 +15,24 @@
  ******************************************************************************/
 package com.bladecoder.engine.ui;
 
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.graphics.glutils.HdpiUtils;
+import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.utils.Scaling;
 import com.badlogic.gdx.utils.viewport.Viewport;
 import com.bladecoder.engine.util.EngineLogger;
 
+/**
+ * This is a Custom ExtendViewport:
+ * 
+ *   - The camera uses screen coordinates. This is used to draw fonts and UI 1:1
+ *   - The world dimensions is used only to calculate the dimensions of the viewport
+ *   - The dimensions of the viewport is calculated to extend the world between 4:3 and 16:9
+ * 
+ * @author rgarcia
+ */
 public class SceneExtendViewport extends Viewport {
 	private float minWorldWidth, minWorldHeight;
 	private float maxWorldWidth, maxWorldHeight;
@@ -31,48 +41,47 @@ public class SceneExtendViewport extends Viewport {
 	public SceneExtendViewport() {
 		setCamera(new OrthographicCamera());
 	}
-
+	
 	@Override
-	public void update(int screenWidth, int screenHeight, boolean centerCamera) {
+	public void update (int screenWidth, int screenHeight, boolean centerCamera) {
 		// Fit min size to the screen.
-		super.setWorldSize(minWorldWidth, minWorldHeight);		
-		Vector2 scaled = Scaling.fit.apply(getWorldWidth(), getWorldHeight(),
-				screenWidth, screenHeight);
+		float worldWidth = minWorldWidth;
+		float worldHeight = minWorldHeight;
+		Vector2 scaled = Scaling.fit.apply(worldWidth, worldHeight, screenWidth, screenHeight);
 
 		// Extend in the short direction.
-		setScreenWidth(Math.round(scaled.x));
-		setScreenHeight(Math.round(scaled.y));
-		
-		if (getScreenWidth() < screenWidth) {
-			float toViewportSpace = getScreenHeight() / getWorldHeight();
-			float toWorldSpace = getWorldHeight() / getScreenHeight();
-			float lengthen = (screenWidth - getScreenWidth()) * toWorldSpace;
-			if (maxWorldWidth > 0)
-				lengthen = Math.min(lengthen, maxWorldWidth - minWorldWidth);
-			setWorldWidth(getWorldWidth() + lengthen);
-			setScreenWidth(getScreenWidth() + Math.round(lengthen * toViewportSpace));
-		} else if (getScreenHeight() < screenHeight) {
-			float toViewportSpace = getScreenWidth() / getWorldWidth();
-			float toWorldSpace = getWorldWidth() / getScreenWidth();
-			float lengthen = (screenHeight - getScreenHeight()) * toWorldSpace;
-			if (maxWorldHeight > 0)
-				lengthen = Math.min(lengthen, maxWorldHeight - minWorldHeight);
-			setWorldHeight(getWorldHeight() + lengthen);
-			setScreenHeight(getScreenHeight() + Math.round(lengthen * toViewportSpace));
+		int viewportWidth = Math.round(scaled.x);
+		int viewportHeight = Math.round(scaled.y);
+		if (viewportWidth < screenWidth) {
+			float toViewportSpace = viewportHeight / worldHeight;
+			float toWorldSpace = worldHeight / viewportHeight;
+			float lengthen = (screenWidth - viewportWidth) * toWorldSpace;
+			if (maxWorldWidth > 0) lengthen = Math.min(lengthen, maxWorldWidth - minWorldWidth);
+			worldWidth += lengthen;
+			viewportWidth += Math.round(lengthen * toViewportSpace);
+		} else if (viewportHeight < screenHeight) {
+			float toViewportSpace = viewportWidth / worldWidth;
+			float toWorldSpace = worldWidth / viewportWidth;
+			float lengthen = (screenHeight - viewportHeight) * toWorldSpace;
+			if (maxWorldHeight > 0) lengthen = Math.min(lengthen, maxWorldHeight - minWorldHeight);
+			worldHeight += lengthen;
+			viewportHeight += Math.round(lengthen * toViewportSpace);
 		}
 
-		// Center
-		setScreenX((screenWidth - getScreenWidth()) / 2);
-		setScreenY((screenHeight - getScreenHeight()) / 2);
+		super.setWorldSize(worldWidth, worldHeight);
 
-		apply(centerCamera);
+		// Center.
+		setScreenBounds((screenWidth - viewportWidth) / 2, (screenHeight - viewportHeight) / 2, viewportWidth, viewportHeight);
 
+		apply(centerCamera);
+		
 		EngineLogger.debug("SCREEN VIEWPORT: " + getScreenWidth() + "x" + getScreenHeight());
+		EngineLogger.debug("SCREEN WORLD: " + getWorldWidth() + "x" + getWorldHeight());
 	}
-	
+
 	@Override
-	public void apply (boolean centerCamera) {
-		Gdx.gl.glViewport(getScreenX(), getScreenY(), getScreenWidth(), getScreenHeight());
+	public void apply(boolean centerCamera) {
+		HdpiUtils.glViewport(getScreenX(), getScreenY(), getScreenWidth(), getScreenHeight());
 		getCamera().viewportWidth = getScreenWidth();
 		getCamera().viewportHeight = getScreenHeight();
 		if (centerCamera)
@@ -84,39 +93,22 @@ public void apply (boolean centerCamera) {
 	public void setWorldSize(float worldWidth, float worldHeight) {
 		super.setWorldSize(worldWidth, worldHeight);
 
-		// The minimum aspect is 16:9, the maximum is the world aspect
-		minWorldWidth = worldWidth;
+		// The minimum height aspect is 4:3, the maximum is the world aspect
+		minWorldWidth = Math.min(worldHeight * 4f / 3f, worldWidth);
+
+		// The minimum width aspect is 16:9, the maximum is the world aspect
 		minWorldHeight = Math.min(worldWidth * 9f / 16f, worldHeight);
 
 		maxWorldWidth = worldWidth;
 		maxWorldHeight = worldHeight;
 	}
 
-	public void getInputUnProject(Vector2 out) {
-		out.set(Gdx.input.getX(), Gdx.input.getY());
-
-		unproject(out);
-	}
-
-	public void getInputUnProject(Vector3 out) {
-		out.set(Gdx.input.getX(), Gdx.input.getY(), 0);
-
-		unproject(out);
-	}
-
 	@Override
 	public Vector2 unproject(Vector2 out) {
 		super.unproject(out);
-
-		if (out.x >= getScreenWidth())
-			out.x = getScreenWidth() - 1;
-		else if (out.x < 0)
-			out.x = 0;
-
-		if (out.y >= getScreenHeight())
-			out.y = getScreenHeight() - 1;
-		else if (out.y < 0)
-			out.y = 0;
+		
+		out.x = MathUtils.clamp(out.x, 0, getScreenWidth() - 1);
+		out.y = MathUtils.clamp(out.y, 0, getScreenHeight() - 1);
 
 		return out;
 	}
@@ -125,15 +117,8 @@ else if (out.y < 0)
 	public Vector3 unproject(Vector3 out) {
 		super.unproject(out);
 
-		if (out.x >= getScreenWidth())
-			out.x = getScreenWidth() - 1;
-		else if (out.x < 0)
-			out.x = 0;
-
-		if (out.y >=  getScreenHeight())
-			out.y =  getScreenHeight() - 1;
-		else if (out.y < 0)
-			out.y = 0;
+		out.x = MathUtils.clamp(out.x, 0, getScreenWidth() - 1);
+		out.y = MathUtils.clamp(out.y, 0, getScreenHeight() - 1);
 
 		return out;
 	}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/SceneFitViewport.java b/blade-engine/src/com/bladecoder/engine/ui/SceneFitViewport.java
index b9256a802..cb1fdd27c 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/SceneFitViewport.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/SceneFitViewport.java
@@ -15,13 +15,23 @@
  ******************************************************************************/
 package com.bladecoder.engine.ui;
 
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.OrthographicCamera;
+import com.badlogic.gdx.graphics.glutils.HdpiUtils;
+import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.utils.Scaling;
 import com.badlogic.gdx.utils.viewport.Viewport;
 
+
+/**
+ * This is a Custom FitViewport with the next differences with the libgdx FitViewport
+ * 
+ *   - The camera uses screen coordinates. This is used to draw fonts and UI 1:1
+ *   - The world dimensions is used only to calculate the dimensions of the viewport
+ * 
+ * @author rgarcia
+ */
 public class SceneFitViewport extends Viewport {
 
 	/** Creates a new viewport using a new {@link OrthographicCamera}. */
@@ -42,58 +52,31 @@ public void update (int screenWidth, int screenHeight, boolean centerCamera) {
 	
 	@Override
 	public void apply (boolean centerCamera) {
-		Gdx.gl.glViewport(getScreenX(), getScreenY(), getScreenWidth(), getScreenHeight());
+		HdpiUtils.glViewport(getScreenX(), getScreenY(), getScreenWidth(), getScreenHeight());
 		getCamera().viewportWidth = getScreenWidth();
 		getCamera().viewportHeight = getScreenHeight();
 		if (centerCamera)
 			getCamera().position.set(getScreenWidth() / 2, getScreenHeight() / 2, 0);
 		getCamera().update();
 	}
-
-
-	public void getInputUnProject(Vector2 out) {
-		out.set(Gdx.input.getX(), Gdx.input.getY());
-
-		unproject(out);
-	}
-	
-	public void getInputUnProject(Vector3 out) {
-		out.set(Gdx.input.getX(), Gdx.input.getY(), 0);
-
-		unproject(out);	
-	}
 	
 	@Override
 	public Vector2 unproject(Vector2 out) {
 		super.unproject(out);
 		
-		if (out.x >= getScreenWidth())
-			out.x = getScreenWidth() - 1;
-		else if (out.x < 0)
-			out.x = 0;
+		out.x = MathUtils.clamp(out.x, 0, getScreenWidth() - 1);
+		out.y = MathUtils.clamp(out.y, 0, getScreenHeight() - 1);
 
-		if (out.y >= getScreenHeight())
-			out.y = getScreenHeight() - 1;
-		else if (out.y < 0)
-			out.y = 0;
-		
 		return out;
 	}
-	
+
 	@Override
 	public Vector3 unproject(Vector3 out) {
 		super.unproject(out);
-		
-		if (out.x >= getScreenWidth())
-			out.x = getScreenWidth() - 1;
-		else if (out.x < 0)
-			out.x = 0;
 
-		if (out.y >= getScreenHeight())
-			out.y = getScreenHeight() - 1;
-		else if (out.y < 0)
-			out.y = 0;
-		
+		out.x = MathUtils.clamp(out.x, 0, getScreenWidth() - 1);
+		out.y = MathUtils.clamp(out.y, 0, getScreenHeight() - 1);
+
 		return out;
-	}	
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/SceneScreen.java b/blade-engine/src/com/bladecoder/engine/ui/SceneScreen.java
index 152b1e0cf..5f1939756 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/SceneScreen.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/SceneScreen.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,721 +15,28 @@
  ******************************************************************************/
 package com.bladecoder.engine.ui;
 
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.Input;
-import com.badlogic.gdx.InputMultiplexer;
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
-import com.badlogic.gdx.input.GestureDetector;
-import com.badlogic.gdx.math.Polygon;
-import com.badlogic.gdx.math.Rectangle;
-import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.math.Vector3;
-import com.badlogic.gdx.scenes.scene2d.Stage;
-import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
 import com.badlogic.gdx.utils.viewport.Viewport;
-import com.bladecoder.engine.i18n.I18N;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.model.Transition;
+import com.bladecoder.engine.model.InteractiveActor;
 import com.bladecoder.engine.model.World;
-import com.bladecoder.engine.model.World.AssetState;
-import com.bladecoder.engine.ui.UI.Screens;
-import com.bladecoder.engine.util.Config;
-import com.bladecoder.engine.util.DPIUtils;
-import com.bladecoder.engine.util.EngineLogger;
-import com.bladecoder.engine.util.RectangleRenderer;
 
-public class SceneScreen implements BladeScreen {
-
-	private UI ui;
-
-	private Stage stage;
-
-	private PieMenu pie;
-	private InventoryUI inventoryUI;
-	private InventoryButton inventoryButton;
-	private DialogUI dialogUI;
-	private TextManagerUI textManagerUI;
-	private ShapeRenderer renderer;
-
-	private boolean pieMode;
-
-	private final Recorder recorder = new Recorder();
-	private InputMultiplexer multiplexer = new InputMultiplexer();
-
-	// private final SceneFitViewport viewport = new SceneFitViewport();
-	private final SceneExtendViewport viewport = new SceneExtendViewport();
-
-	private final Vector3 unprojectTmp = new Vector3();
-	private final Vector2 unproject2Tmp = new Vector2();
-
-	// BaseActor under the cursor
-	private BaseActor currentActor = null;
-
-	private boolean drawHotspots = false;
-	private final boolean showDesc = Config.getProperty(Config.SHOW_DESC_PROP, true);
-	
-	private float speed = 1.0f;
-
-	private static enum UIStates {
-		SCENE_MODE, CUT_MODE, PLAY_MODE, PAUSE_MODE, INVENTORY_MODE, DIALOG_MODE
-	};
-
-	private UIStates state = UIStates.SCENE_MODE;
-
-	private final GestureDetector inputProcessor = new GestureDetector(new GestureDetector.GestureListener() {
-		@Override
-		public boolean touchDown(float x, float y, int pointer, int button) {
-			return true;
-		}
-
-		@Override
-		public boolean tap(float x, float y, int count, int button) {
-			EngineLogger.debug("Event TAP button: " + button);
-
-			World w = World.getInstance();
-
-			if (state == UIStates.PAUSE_MODE || state == UIStates.PLAY_MODE)
-				return true;
-			
-			if(pie.isVisible())
-				pie.hide();
-
-			if (drawHotspots)
-				drawHotspots = false;
-			else {
-				viewport.getInputUnProject(unprojectTmp);
-
-				if (w.inCutMode() && !recorder.isRecording()) {
-					w.getTextManager().next();
-				} else if (state == UIStates.INVENTORY_MODE) {
-					inventoryUI.hide();
-				} else if (state == UIStates.SCENE_MODE) {
-					sceneClick(button == 1);
-				}
-			}
-
-			return true;
-		}
-
-		@Override
-		public boolean longPress(float x, float y) {
-			EngineLogger.debug("Event LONG PRESS");
-
-			if (state == UIStates.SCENE_MODE) {
-				drawHotspots = true;
-			}
-
-			return false;
-		}
-
-		@Override
-		public boolean pan(float x, float y, float deltaX, float deltaY) {
-			return true;
-		}
-
-		@Override
-		public boolean panStop(float x, float y, int pointer, int button) {
-			return true;
-		}
-
-		@Override
-		public boolean fling(float velocityX, float velocityY, int button) {
-			return false;
-		}
-
-		@Override
-		public boolean zoom(float initialDistance, float distance) {
-			return false;
-		}
-
-		@Override
-		public boolean pinch(Vector2 initialPointer1, Vector2 initialPointer2, Vector2 pointer1, Vector2 pointer2) {
-			return false;
-		}
-	}) {
-		@Override
-		public boolean keyUp(int keycode) {
-			switch (keycode) {
-			case Input.Keys.ESCAPE:
-			case Input.Keys.BACK:
-			case Input.Keys.MENU:
-				showMenu();
-				break;
-			}
-
-			return true;
-		}
-
-		@Override
-		public boolean keyTyped(char character) {
-			switch (character) {
-
-			case 'd':
-				EngineLogger.toggle();
-				break;
-			case '1':
-				EngineLogger.setDebugLevel(EngineLogger.DEBUG0);
-				break;
-			case '2':
-				EngineLogger.setDebugLevel(EngineLogger.DEBUG1);
-				break;
-			case '3':
-				EngineLogger.setDebugLevel(EngineLogger.DEBUG2);
-				break;
-			case 'f':
-				// ui.toggleFullScreen();
-				break;
-			case 's':
-				World.getInstance().saveGameState();
-				break;
-			case 'r':
-				World.getInstance().newGame();
-				break;
-			case 'l':
-				World.getInstance().loadGameState();
-				break;
-			case '.':
-				if (getRecorder().isRecording())
-					getRecorder().setRecording(false);
-				else
-					getRecorder().setRecording(true);
-				break;
-			case ',':
-				if (getRecorder().isPlaying())
-					getRecorder().setPlaying(false);
-				else {
-					getRecorder().load();
-					getRecorder().setPlaying(true);
-				}
-				break;
-			case 'p':
-				if (World.getInstance().isPaused()) {
-					World.getInstance().resume();
-				} else {
-					World.getInstance().pause();
-				}
-				break;
-			}
-
-			return false;
-		}
-		
-		@Override
-		public boolean scrolled (int amount) {
-			if(amount > 0 && inventoryUI.isVisible())
-				inventoryUI.hide();
-			else if(amount < 0 && !inventoryUI.isVisible())
-				inventoryUI.show();
-			
-			return true;
-		}
-	};
-
-	public SceneScreen() {
-
-	}
-
-	public UI getUI() {
-		return ui;
-	}
-
-	public Recorder getRecorder() {
-		return recorder;
-	}
-
-	private void setUIState(UIStates s) {
-		if (state == s)
-			return;
-
-		switch (s) {
-		case PAUSE_MODE:
-		case PLAY_MODE:
-		case CUT_MODE:
-			if (pieMode && pie.isVisible())
-				pie.hide();
-
-			if (inventoryUI.isVisible())
-				inventoryUI.hide();
-
-			if (inventoryButton.isVisible())
-				inventoryButton.setVisible(false);
-
-			if (dialogUI.isVisible())
-				dialogUI.setVisible(false);
-
-			inventoryUI.cancelDragging();
-			ui.getPointer().reset();
-			break;
-		case DIALOG_MODE:
-			if (pieMode && pie.isVisible())
-				pie.hide();
-
-			if (inventoryUI.isVisible())
-				inventoryUI.hide();
-
-			if (inventoryButton.isVisible())
-				inventoryButton.setVisible(false);
-
-			if (!dialogUI.isVisible())
-				dialogUI.setVisible(true);
-
-			inventoryUI.cancelDragging();
-			break;
-		case INVENTORY_MODE:
-			if (pieMode && pie.isVisible())
-				pie.hide();
-
-			if (!inventoryUI.isVisible())
-				inventoryUI.show();
-
-			if (!inventoryButton.isVisible())
-				inventoryButton.setVisible(true);
-
-			if (!dialogUI.isVisible())
-				dialogUI.setVisible(true);
-			break;
-		case SCENE_MODE:
-			if (pieMode && pie.isVisible())
-				pie.hide();
-
-			if (inventoryUI.isVisible())
-				inventoryUI.hide();
-
-			if (dialogUI.isVisible())
-				dialogUI.setVisible(false);
-			break;
-		}
-
-		state = s;
-	}
-	
-	/**
-	 * Sets the game speed. Can be used to fastfordward
-	 * 
-	 * @param s The multiplier speed. ej. 2.0
-	 */
-	public void setSpeed(float s) {
-		speed = s;
-	}
-	
-	public float getSpeed() {
-		return speed;
-	}	
-
-	private void update(float delta) {
-		World w = World.getInstance();
-		currentActor = null;
-
-		if (!World.getInstance().isDisposed()) {
-			World.getInstance().update(delta * speed);
-		}
-
-		AssetState assetState = World.getInstance().getAssetState();
-
-		if (assetState != AssetState.LOADED) {
-			ui.setCurrentScreen(Screens.LOADING_SCREEN);
-			return;
-		}
-
-		// CHECK FOR STATE CHANGES
-		switch (state) {
-		case CUT_MODE:
-			if (!w.inCutMode())
-				setUIState(UIStates.SCENE_MODE);
-			break;
-		case DIALOG_MODE:
-			if (w.getCurrentDialog() == null)
-				setUIState(UIStates.SCENE_MODE);
-			break;
-		case INVENTORY_MODE:
-			if (!inventoryUI.isVisible())
-				setUIState(UIStates.SCENE_MODE);
-			break;
-		case PAUSE_MODE:
-			if (!w.isPaused())
-				setUIState(UIStates.SCENE_MODE);
-			break;
-		case PLAY_MODE:
-			if (!recorder.isPlaying())
-				setUIState(UIStates.SCENE_MODE);
-			break;
-		case SCENE_MODE:
-			if (w.isPaused())
-				setUIState(UIStates.PAUSE_MODE);
-			else if (w.inCutMode())
-				setUIState(UIStates.CUT_MODE);
-			else if (recorder.isPlaying())
-				setUIState(UIStates.PLAY_MODE);
-			else if (inventoryUI.isVisible())
-				setUIState(UIStates.INVENTORY_MODE);
-			else if (w.getCurrentDialog() != null)
-				setUIState(UIStates.DIALOG_MODE);
-			break;
-		}
-
-		stage.act(delta);
-
-		if (state == UIStates.PAUSE_MODE)
-			return;
-
-		recorder.update(delta * speed);
-
-		if (state == UIStates.INVENTORY_MODE) {
-			unproject2Tmp.set(Gdx.input.getX(), Gdx.input.getY());
-			inventoryUI.screenToLocalCoordinates(unproject2Tmp);
-			currentActor = inventoryUI.getItemAt(unproject2Tmp.x, unproject2Tmp.y);
-		} else if (state == UIStates.SCENE_MODE) {
-			w.getSceneCamera().getInputUnProject(viewport, unprojectTmp);
-
-			currentActor = w.getCurrentScene().getActorAt(unprojectTmp.x, unprojectTmp.y);
-
-			if (!w.getInventory().isVisible() && inventoryButton.isVisible())
-				inventoryButton.setVisible(false);
-			else if (w.getInventory().isVisible() && !inventoryButton.isVisible())
-				inventoryButton.setVisible(true);
-		}
-
-		if (!pie.isVisible()) {
-			if (currentActor != null) {
-
-				if (showDesc)
-					ui.getPointer().setDesc(currentActor.getDesc());
-
-				if (currentActor.getVerb("leave") != null)
-					ui.getPointer().setLeaveIcon();
-				else
-					ui.getPointer().setHotspotIcon();
-			} else {
-				ui.getPointer().setDefaultIcon();
-			}
-		}
-	}
-
-	@Override
-	public void render(float delta) {
-		World w = World.getInstance();
-
-		update(delta);
-
-		if (w.getAssetState() != AssetState.LOADED)
-			return;
-
-		SpriteBatch batch = ui.getBatch();
-
-		Gdx.gl.glClearColor(0, 0, 0, 1);
-		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
-
-		// WORLD CAMERA
-		w.draw();
-
-		// DRAW DEBUG BBOXES
-		if (EngineLogger.debugMode() && EngineLogger.getDebugLevel() == EngineLogger.DEBUG1) {
-			renderer.setProjectionMatrix(w.getSceneCamera().combined);
-			w.getCurrentScene().drawBBoxLines(renderer);
-			renderer.end();
-		}
-
-		// STAGE
-		stage.draw();
-
-		// SCREEN CAMERA
-		batch.setProjectionMatrix(viewport.getCamera().combined);
-		batch.begin();
-
-		// DRAW DEBUG STRING
-		if (EngineLogger.debugMode()) {
-			w.getSceneCamera().getInputUnProject(viewport, unprojectTmp);
-
-			StringBuilder sb = new StringBuilder();
-			sb.append("Mouse ( ");
-			sb.append((int) unprojectTmp.x);
-			sb.append(", ");
-			sb.append((int) unprojectTmp.y);
-			sb.append(") FPS:");
-			sb.append(Gdx.graphics.getFramesPerSecond());
-			sb.append(" Density:");
-			sb.append(Gdx.graphics.getDensity());
-			sb.append(" UI Multiplier:");
-			sb.append(DPIUtils.getSizeMultiplier());
-
-			if (w.getCurrentScene().getPlayer() != null) {
-				sb.append(" Depth Scale: ");
-				sb.append(w.getCurrentScene().getFakeDepthScale(unprojectTmp.y));
-			}
-
-			String strDebug = sb.toString();
-
-			TextBounds b = ui.getSkin().getFont("debug").getBounds(strDebug);
-			RectangleRenderer.draw(batch, 0, viewport.getScreenHeight() - b.height - 10, b.width, b.height + 10,
-					Color.BLACK);
-			ui.getSkin().getFont("debug").draw(batch, strDebug, 0, viewport.getScreenHeight());
-
-			// Draw actor states when debug
-			if (EngineLogger.getDebugLevel() == EngineLogger.DEBUG1) {
-
-				for (BaseActor a : w.getCurrentScene().getActors().values()) {
-					Rectangle r = a.getBBox().getBoundingRectangle();
-					sb.setLength(0);
-					sb.append(a.getId());
-					if (a.getState() != null)
-						sb.append(".").append(a.getState());
-
-					unprojectTmp.set(r.getX(), r.getY(), 0);
-					w.getSceneCamera().scene2screen(viewport, unprojectTmp);
-					ui.getSkin().getFont("debug").draw(batch, sb.toString(), unprojectTmp.x, unprojectTmp.y);
-				}
-
-			}
-		}
-
-		if (!World.getInstance().inCutMode() && !recorder.isPlaying()) {
-			ui.getPointer().draw(batch, viewport);
-		}
-
-		Transition t = World.getInstance().getCurrentScene().getTransition();
-
-		if (t != null) {
-			t.draw(batch, viewport.getScreenWidth(), viewport.getScreenHeight());
-		}
-
-		recorder.draw(batch);
-
-		if (drawHotspots)
-			drawHotspots(batch);
-
-		batch.end();
+public interface SceneScreen extends BladeScreen {
+	public enum ActionButton {
+		LOOKAT, ACTION, INVENTORY, NONE
 	}
 
-	private void drawHotspots(SpriteBatch batch) {
-
-		for (BaseActor a : World.getInstance().getCurrentScene().getActors().values()) {
-			if (a == World.getInstance().getCurrentScene().getPlayer() || !a.hasInteraction() || !a.isVisible())
-				continue;
-
-			Polygon p = a.getBBox();
-
-			if (p == null) {
-				EngineLogger.error("ERROR DRAWING HOTSPOT FOR: " + a.getId());
-			}
+	UI getUI();
 
-			Rectangle r = a.getBBox().getBoundingRectangle();
+	World getWorld();
 
-			unprojectTmp.set(r.getX() + r.getWidth() / 2, r.getY() + r.getHeight() / 2, 0);
-			World.getInstance().getSceneCamera().scene2screen(viewport, unprojectTmp);
+	Viewport getViewport();
 
-			if (!showDesc || a.getDesc() == null) {
-				Drawable drawable = getUI().getSkin().getDrawable("circle");
-				batch.setColor(Color.RED);
-				float size = DPIUtils.ICON_SIZE * DPIUtils.getSizeMultiplier();
-				
-				drawable.draw(batch, unprojectTmp.x - size/2,
-						unprojectTmp.y - size/2, size,size);
-				batch.setColor(Color.WHITE);
-			} else {
-				BitmapFont font = getUI().getSkin().getFont("desc");
-				String desc = a.getDesc();
-				if (desc.charAt(0) == '@')
-					desc = I18N.getString(desc.substring(1));
+	InteractiveActor getCurrentActor();
 
-				TextBounds b = font.getBounds(desc);
+	void actorClick(InteractiveActor actor, ActionButton button);
 
-				float textX = unprojectTmp.x - b.width / 2;
-				float textY = unprojectTmp.y + b.height;
-
-				RectangleRenderer
-						.draw(batch, textX - 8, textY - b.height - 8, b.width + 16, b.height + 16, Color.BLACK);
-				font.draw(batch, desc, textX, textY);
-			}
-		}
-	}
-
-	@Override
-	public void resize(int width, int height) {
-
-		if (!World.getInstance().isDisposed()) {
-			viewport.setWorldSize(World.getInstance().getWidth(), World.getInstance().getHeight());
-			viewport.update(width, height, true);
-			World.getInstance().resize(viewport.getWorldWidth(), viewport.getWorldHeight());
-		} else {
-			viewport.setWorldSize(width, height);
-			viewport.update(width, height, true);
-		}
-
-		pie.resize(viewport.getScreenWidth(), viewport.getScreenHeight());
-		inventoryUI.resize(viewport.getScreenWidth(), viewport.getScreenHeight());
-		textManagerUI.resize(viewport.getScreenWidth(), viewport.getScreenHeight());
-		inventoryButton.resize(viewport.getScreenWidth(), viewport.getScreenHeight());
-	}
-
-	public void dispose() {
-		renderer.dispose();
-		stage.dispose();
-	}
-
-	private void retrieveAssets(TextureAtlas atlas) {
-		renderer = new ShapeRenderer();
-		inventoryUI.retrieveAssets(atlas);
-	}
-
-	private void sceneClick(boolean lookat) {
-		World w = World.getInstance();
-
-		w.getSceneCamera().getInputUnProject(viewport, unprojectTmp);
-
-		Scene s = w.getCurrentScene();
-
-		if (currentActor != null) {
-
-			if (EngineLogger.debugMode()) {
-				EngineLogger.debug(currentActor.toString());
-			}
-
-			actorClick(currentActor, lookat);
-		} else if (s.getPlayer() != null) {
-			if (s.getPlayer().getVerb("goto") != null) {
-				runVerb(s.getPlayer(), "goto", null);
-			} else {
-				Vector2 pos = new Vector2(unprojectTmp.x, unprojectTmp.y);
-
-				if (recorder.isRecording()) {
-					recorder.add(pos);
-				}
-
-				s.getPlayer().goTo(pos, null);
-			}
-		}
-	}
+	void runVerb(InteractiveActor a, String verb, String target);
 
-	public void actorClick(BaseActor a, boolean lookat) {
+	float getSpeed();
 
-		if (a.getVerb("leave") != null) {
-			runVerb(a, "leave", null);
-		} else if (!pieMode) {
-			String verb = "lookat";
-
-			if (!lookat) {
-				verb = a.getVerb("talkto") != null ? "talkto" : "pickup";
-			}
-
-			runVerb(a, verb, null);
-		} else {
-			viewport.getInputUnProject(unprojectTmp);
-			pie.show(a, unprojectTmp.x, unprojectTmp.y);
-			ui.getPointer().reset();
-		}
-	}
-
-	/**
-	 * Run actor verb and handles recording
-	 * 
-	 * @param a
-	 * @param verb
-	 * @param target
-	 */
-	public void runVerb(BaseActor a, String verb, String target) {
-		if (inventoryUI.isVisible())
-			inventoryUI.hide();
-
-		if (recorder.isRecording()) {
-			recorder.add(a.getId(), verb, target);
-		}
-
-		a.runVerb(verb, target);
-	}
-
-	public void showMenu() {
-		ui.setCurrentScreen(Screens.MENU_SCREEN);
-	}
-
-	private void resetUI() {
-
-		if (pie.isVisible()) {
-			pie.hide();
-		}
-
-		ui.getPointer().reset();
-
-		currentActor = null;
-	}
-
-	public InventoryUI getInventoryUI() {
-		return inventoryUI;
-	}
-
-	@Override
-	public void show() {
-		retrieveAssets(ui.getUIAtlas());
-
-		stage = new Stage(viewport);
-		stage.addActor(textManagerUI);
-		stage.addActor(dialogUI);
-		stage.addActor(inventoryUI);
-		stage.addActor(inventoryButton);
-		stage.addActor(pie);
-
-		multiplexer = new InputMultiplexer();
-		multiplexer.addProcessor(stage);
-		multiplexer.addProcessor(inputProcessor);
-		Gdx.input.setInputProcessor(multiplexer);
-
-		if (World.getInstance().isDisposed()) {
-			try {
-				World.getInstance().load();
-			} catch (Exception e) {
-				EngineLogger.error("ERROR LOADING GAME", e);
-
-				dispose();
-				Gdx.app.exit();
-			}
-		}
-
-		World.getInstance().resume();
-	}
-
-	@Override
-	public void hide() {
-		World.getInstance().pause();
-		resetUI();
-		dispose();
-	}
-
-	@Override
-	public void pause() {
-		World.getInstance().pause();
-	}
-
-	@Override
-	public void resume() {
-		World.getInstance().resume();
-	}
-
-	public Viewport getViewport() {
-		return viewport;
-	}
-
-	public BaseActor getCurrentActor() {
-		return currentActor;
-	}
-
-	@Override
-	public void setUI(UI ui) {
-		this.ui = ui;
-
-		pie = new PieMenu(this);
-		textManagerUI = new TextManagerUI(this);
-		inventoryUI = new InventoryUI(this);
-		inventoryButton = new InventoryButton(ui.getSkin(), inventoryUI);
-		dialogUI = new DialogUI(this);
-
-		this.pieMode = ui.isPieMode();
-
-		pie.setVisible(false);
-	}
+	void setSpeed(float speed);
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/TesterBot.java b/blade-engine/src/com/bladecoder/engine/ui/TesterBot.java
new file mode 100644
index 000000000..819e9ec9c
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/TesterBot.java
@@ -0,0 +1,313 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.math.Vector2;
+import com.bladecoder.engine.model.AnimationRenderer;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.Config;
+import com.bladecoder.engine.util.EngineLogger;
+
+/**
+ * Bot for testing a game. The bot will execute random actions in the scene.
+ * 
+ * @author rgarcia
+ */
+public class TesterBot {
+	/** time between actions in secons */
+	private float maxWaitInverval = 1f;
+	private float waitInverval = 0f;
+	private float deltaTime = 0f;
+
+	/** Min. time to stay in scene before leave */
+	private float inSceneTime = 20;
+	private float inSceneTimeDelta = 0f;
+
+	private Vector2 gotoVector = new Vector2();
+
+	private boolean enabled = false;
+	private boolean runLeaveVerbs = true;
+	private boolean runGoto = false;
+	private boolean passTexts = true;
+	private boolean waitWhenWalking = true;
+
+	private final ArrayList<String> excludeList = new ArrayList<>();
+
+	private final boolean inventoryAction;
+	private final World w;
+
+	public TesterBot(World w) {
+		this.w = w;
+		inventoryAction = !Config.getInstance().getProperty(Config.SINGLE_ACTION_INVENTORY, false);
+	}
+
+	public void update(float d) {
+
+		if (!enabled)
+			return;
+
+		deltaTime += d;
+		inSceneTimeDelta += d;
+
+		if (w.inCutMode() && isPassTexts())
+			w.getCurrentScene().getTextManager().next();
+
+		if (deltaTime > waitInverval && !w.inCutMode()) {
+			deltaTime = 0;
+			waitInverval = MathUtils.random(maxWaitInverval);
+
+			boolean isWalking = false;
+			SpriteActor player = w.getCurrentScene().getPlayer();
+			if (player != null) {
+				if (((AnimationRenderer) player.getRenderer()).getCurrentAnimationId()
+						.startsWith(CharacterActor.DEFAULT_WALK_ANIM))
+					isWalking = true;
+			}
+
+			if (isWaitWhenWalking() && isWalking)
+				return;
+
+			Scene s = w.getCurrentScene();
+
+			if (!w.hasDialogOptions()) {
+
+				// Select actor or goto
+				boolean chooseActor = MathUtils.randomBoolean(.75f);
+
+				if (!isRunGoto() || chooseActor) {
+
+					// Select scene or actor inventory
+					boolean chooseSceneActor = MathUtils.randomBoolean();
+
+					if (chooseSceneActor && s.getActors().size() > 0) {
+						// SCENE ACTOR
+						int pos = MathUtils.random(s.getActors().size() - 1);
+						BaseActor a = (BaseActor) (s.getActors().values().toArray()[pos]);
+
+						if (!(a instanceof InteractiveActor))
+							return;
+
+						InteractiveActor scnActor = (InteractiveActor) a;
+
+						if (excludeList.contains(scnActor.getId()) || !scnActor.canInteract())
+							return;
+
+						String verb;
+
+						if (scnActor.getVerb(Verb.LEAVE_VERB) != null) {
+							verb = Verb.LEAVE_VERB;
+						} else if (MathUtils.randomBoolean(0.33f)) {
+							// LOOKAT
+							verb = Verb.LOOKAT_VERB;
+						} else {
+							// ACTION
+							verb = scnActor.getVerb(Verb.TALKTO_VERB) != null ? Verb.TALKTO_VERB : Verb.PICKUP_VERB;
+						}
+
+						if (!(verb.equals(Verb.LEAVE_VERB) && (!runLeaveVerbs || inSceneTime > inSceneTimeDelta))) {
+							EngineLogger.debug("<TESTERBOT>: " + scnActor.getId() + "::" + verb);
+							scnActor.runVerb(verb);
+
+							if (verb.equals(Verb.LEAVE_VERB))
+								inSceneTimeDelta = 0;
+						}
+					} else if (w.getInventory().getNumItems() > 0 && w.getInventory().isVisible()) {
+						// INVENTORY ACTOR
+						int pos = MathUtils.random(w.getInventory().getNumItems() - 1);
+						SpriteActor invActor = w.getInventory().get(pos);
+
+						if (excludeList.contains(invActor.getId()))
+							return;
+
+						// Select lookat, action or use
+						int choosedVerb = MathUtils.random(3);
+
+						if (choosedVerb == 0) {
+							EngineLogger.debug("<TESTERBOT> INVENTORY: " + invActor.getId() + "::" + Verb.LOOKAT_VERB);
+							invActor.runVerb(Verb.LOOKAT_VERB);
+						} else if (choosedVerb == 1 && inventoryAction) {
+							EngineLogger.debug("<TESTERBOT> INVENTORY: " + invActor.getId() + "::" + Verb.PICKUP_VERB);
+							invActor.runVerb(Verb.PICKUP_VERB);
+						} else { // 2 and 3
+
+							InteractiveActor targetActor = null;
+
+							if (w.getInventory().getNumItems() > 1 && MathUtils.randomBoolean(0.33f)) {
+								// CHOOSE TARGET FROM INVENTORY
+								int pos2 = MathUtils.random(w.getInventory().getNumItems() - 1);
+
+								if (pos2 == pos)
+									pos2 = (pos2 + 1) % w.getInventory().getNumItems();
+
+								targetActor = w.getInventory().get(pos2);
+
+								if (excludeList.contains(targetActor.getId()))
+									return;
+
+								EngineLogger.debug("<TESTERBOT> INVENTORY: " + invActor.getId() + "::" + Verb.USE_VERB
+										+ "::" + targetActor.getId());
+
+								if (invActor.getVerb(Verb.USE_VERB, targetActor.getId()) != null)
+									invActor.runVerb(Verb.USE_VERB, targetActor.getId());
+								else
+									targetActor.runVerb(Verb.USE_VERB, invActor.getId());
+							} else {
+								int pos2 = MathUtils.random(s.getActors().size() - 1);
+
+								if (!(s.getActors().values().toArray()[pos2] instanceof InteractiveActor))
+									return;
+
+								targetActor = (InteractiveActor) (s.getActors().values().toArray()[pos2]);
+
+								if (!excludeList.contains(targetActor.getId()) && targetActor.isVisible()
+										&& targetActor.canInteract()) {
+									EngineLogger.debug("<TESTERBOT> INVENTORY: " + invActor.getId() + "::"
+											+ Verb.USE_VERB + "::" + targetActor.getId());
+
+									if (invActor.getVerb(Verb.USE_VERB, targetActor.getId()) != null)
+										invActor.runVerb(Verb.USE_VERB, targetActor.getId());
+									else
+										targetActor.runVerb(Verb.USE_VERB, invActor.getId());
+								}
+							}
+						}
+					}
+
+				} else if (s.getPlayer() != null) {
+					gotoVector.x = MathUtils.random() * w.getCurrentScene().getCamera().getScrollingWidth();
+					gotoVector.y = MathUtils.random() * w.getCurrentScene().getCamera().getScrollingHeight();
+
+					if (s.getPlayer().getVerb(Verb.GOTO_VERB) != null) {
+						EngineLogger.debug("<TESTERBOT> GOTO: GOTO VERB");
+						s.getPlayer().runVerb(Verb.GOTO_VERB);
+					} else {
+						EngineLogger.debug("<TESTERBOT> GOTO: " + gotoVector);
+						s.getPlayer().goTo(gotoVector, null, false);
+					}
+				}
+			} else {
+				// DIALOG MODE
+				List<String> visibleOptions = w.getDialogOptions();
+
+				if (visibleOptions.size() > 0) {
+					int pos = MathUtils.random(visibleOptions.size() - 1);
+					EngineLogger.debug("<TESTERBOT> SELECT OPTION: " + pos);
+					w.selectDialogOption(pos);
+				}
+			}
+		}
+	}
+
+	public void draw(SpriteBatch batch) {
+		if (enabled) {
+			// TODO draw bot icon
+		}
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+
+		if (enabled)
+			EngineLogger.debug("<TESTERBOT> BOT ENABLED...");
+		else
+			EngineLogger.debug("<TESTERBOT> BOT DISABLED...");
+	}
+
+	public boolean isRunLeaveVerbs() {
+		return runLeaveVerbs;
+	}
+
+	public void setRunLeaveVerbs(boolean runLeaveVerbs) {
+		this.runLeaveVerbs = runLeaveVerbs;
+	}
+
+	public boolean isRunGoto() {
+		return runGoto;
+	}
+
+	public void setRunGoto(boolean runGoto) {
+		this.runGoto = runGoto;
+	}
+
+	public float getMaxWaitInverval() {
+		return maxWaitInverval;
+	}
+
+	public void setMaxWaitInverval(float maxWaitInverval) {
+		this.maxWaitInverval = maxWaitInverval;
+	}
+
+	public float getInSceneTime() {
+		return inSceneTime;
+	}
+
+	public void setInSceneTime(float inSceneTime) {
+		this.inSceneTime = inSceneTime;
+	}
+
+	public boolean isPassTexts() {
+		return passTexts;
+	}
+
+	public void setPassTexts(boolean passTexts) {
+		this.passTexts = passTexts;
+	}
+
+	public boolean isWaitWhenWalking() {
+		return waitWhenWalking;
+	}
+
+	public void setWaitWhenWalking(boolean waitWhenWalking) {
+		this.waitWhenWalking = waitWhenWalking;
+	}
+
+	public String getExcludeList() {
+		StringBuilder s = new StringBuilder();
+
+		for (int i = 0; i < excludeList.size(); i++) {
+			s.append(excludeList.get(i));
+
+			if (i < excludeList.size() - 1)
+				s.append(',');
+		}
+
+		return s.toString();
+	}
+
+	public void setExcludeList(String l) {
+		String[] split = l.split(",");
+
+		excludeList.clear();
+
+		for (int i = 0; i < split.length; i++)
+			excludeList.add(split[i].trim());
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/TextManagerUI.java b/blade-engine/src/com/bladecoder/engine/ui/TextManagerUI.java
index 053a24423..09f7ed9de 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/TextManagerUI.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/TextManagerUI.java
@@ -15,134 +15,191 @@
  ******************************************************************************/
 package com.bladecoder.engine.ui;
 
-import com.bladecoder.engine.ui.SceneScreen;
-
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
-import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
 import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.Touchable;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.ObjectMap;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.CharacterActor;
 import com.bladecoder.engine.model.Text;
 import com.bladecoder.engine.model.TextManager;
 import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.util.Config;
 import com.bladecoder.engine.util.DPIUtils;
-import com.bladecoder.engine.util.TextUtils;
+import com.bladecoder.engine.util.EngineLogger;
 
 /**
  * TextManagerUI draws texts and dialogs on screen.
  * 
- * For now, only one subtitle is displayed in the screen.
+ * For now, only one subtitle is displayed in the screen at a time.
  * 
  * @author rgarcia
  * 
  */
-public class TextManagerUI extends Actor {
+public class TextManagerUI extends Actor implements ITextManagerUI {
 	private static final float PADDING = DPIUtils.getMarginSize();
 
-	private float maxRectangleWidth;
-	private float maxTalkWidth;
-
-	private SceneScreen sceneScreen;
 	private final Vector3 unprojectTmp = new Vector3();
 
+	private ObjectMap<String, TextManagerUIStyle> styles;
+	private Text text;
+	private final GlyphLayout layout = new GlyphLayout();
+
+	private float fontX = 0;
+
+	private AtlasRegion charIcon = null;
+
 	private TextManagerUIStyle style;
-	private Text subtitle;
-	private TextBounds b = null;
 
-	public TextManagerUI(SceneScreen sceneScreen) {
-		this.sceneScreen = sceneScreen;
+	private float maxWidth;
+	private final World world;
+
+	public TextManagerUI(Skin skin, World w) {
+		this.world = w;
 		setTouchable(Touchable.disabled);
-		style = sceneScreen.getUI().getSkin().get(TextManagerUIStyle.class);
+		styles = skin.getAll(TextManagerUIStyle.class);
+
+		for (TextManagerUIStyle style : styles.values()) {
+			style.font.getData().markupEnabled = true;
+		}
+
 		setVisible(false);
 	}
 
 	@Override
-	public void act(float delta) {
-		super.act(delta);
+	public void setText(Text t) {
+		text = t;
+
+		if (t == null && isVisible()) {
+			setVisible(false);
+		} else if (t != null && !isVisible()) {
+			setVisible(true);
+		}
+
+		if (isVisible()) {
+			style = getStyle(text);
+			Color color = text.color != null ? text.color : style.defaultColor;
 
-		Text currentSubtitle = World.getInstance().getTextManager().getCurrentSubtitle();
+			if (color == null)
+				color = Color.BLACK;
+
+			maxWidth = Math.min(getStage().getViewport().getScreenWidth() - PADDING * 4, style.font.getXHeight()
+					* (text.type == Text.Type.TALK ? style.maxTalkCharWidth : style.maxCharWidth));
+
+			layout.setText(style.font, text.str, color, maxWidth, Align.center, true);
+			setSize(layout.width + PADDING * 2, layout.height + PADDING * 2);
+
+			calcPos();
+		}
+	}
+
+	private void calcPos() {
+		float posx = text.x;
+		float posy = text.y;
+
+		unprojectTmp.set(posx, posy, 0);
+		world.getSceneCamera().scene2screen(getStage().getViewport(), unprojectTmp);
+
+		if (posx == TextManager.POS_CENTER || posx == TextManager.POS_SUBTITLE) {
+			posx = getStage().getViewport().getScreenWidth() / 2;
+			fontX = getStage().getViewport().getScreenWidth() / 2;
+		} else {
+			posx = unprojectTmp.x;
+			fontX = posx + (layout.width - maxWidth) / 2;
+		}
+
+		if (posy == TextManager.POS_CENTER) {
+			posy = (getStage().getViewport().getScreenHeight() - layout.height) / 2;
+		} else if (posy == TextManager.POS_SUBTITLE) {
+			posy = getStage().getViewport().getScreenHeight() * style.subtitlePosPercent - layout.height;
+
+			if (posy < 0) {
+				posy = PADDING;
+			}
+		} else {
+			posy = unprojectTmp.y;
 
-		if (subtitle != currentSubtitle) {
-			subtitle = currentSubtitle;
+			if (text.type != Text.Type.TALK) {
+				posy -= layout.height;
+			}
+		}
 
-			if (currentSubtitle == null && isVisible()) {
-				setVisible(false);
-			} else if (currentSubtitle != null && !isVisible()) {
-				setVisible(true);
+		// CHAR ICON CALCS
+		if (text.type == Text.Type.SUBTITLE
+				&& !Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, "").equals("")
+				&& text.actorId != null) {
+			charIcon = EngineAssetManager.getInstance()
+					.getRegion(Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, null), text.actorId);
+
+			if (charIcon != null) {
+				float scale = getStage().getViewport().getScreenHeight() / (float) world.getHeight();
+				float iconPosY = getStage().getViewport().getScreenHeight() - charIcon.getRegionHeight() * scale
+						- DPIUtils.getMarginSize();
+				posy = Math.min(posy, iconPosY);
 			}
+		} else {
+			charIcon = null;
+		}
 
-			if (isVisible()) {
-				float posx = currentSubtitle.x;
-				float posy = currentSubtitle.y;
-
-				unprojectTmp.set(posx, posy, 0);
-				World.getInstance().getSceneCamera().scene2screen(sceneScreen.getViewport(), unprojectTmp);
-
-				if (posx == TextManager.POS_CENTER || posx == TextManager.POS_SUBTITLE)
-					posx = TextUtils.getCenterX(style.font, currentSubtitle.str, maxRectangleWidth, (int) sceneScreen
-							.getViewport().getScreenWidth());
-				else
-					posx = unprojectTmp.x;
-
-				if (posy == TextManager.POS_CENTER)
-					posy = TextUtils.getCenterY(style.font, currentSubtitle.str, maxRectangleWidth, (int) sceneScreen
-							.getViewport().getScreenHeight());
-				else if (posy == TextManager.POS_SUBTITLE)
-					posy = TextUtils.getSubtitleY(style.font, currentSubtitle.str, maxRectangleWidth, (int) sceneScreen
-							.getViewport().getScreenHeight());
-				else
-					posy = unprojectTmp.y;
-
-				setPosition(posx - PADDING, posy - PADDING);
-
-				if (currentSubtitle.type == Text.Type.TALK) {
-					b = style.font.getWrappedBounds(currentSubtitle.str, maxTalkWidth);
-
-					if (style.talkBubble != null) {
-						setY(getY() + DPIUtils.getTouchMinSize() / 3 + PADDING);
-					}
-					
-					setX(getX() - (b.width) / 2);
-
-				} else {
-					b = style.font.getWrappedBounds(currentSubtitle.str, maxRectangleWidth);
-				}
-
-				setSize(b.width + PADDING * 2, b.height + PADDING * 2);
-
-				style.font.setMarkupEnabled(true);
-				style.font.setColor(currentSubtitle.color);
-				
-				// check if the text exits the screen
-				if (getX() < 0) {
-					setX(0);
-				} else if (getX() + getWidth() > sceneScreen.getViewport().getScreenWidth()) {
-					setX(sceneScreen.getViewport().getScreenWidth() - getWidth());
-				}
-
-				if (getY() + getHeight() > sceneScreen.getViewport().getScreenHeight()) {
-					setY(sceneScreen.getViewport().getScreenHeight() - getHeight());
-				}
+		setPosition(posx - PADDING, posy - PADDING);
+
+		if (text.type == Text.Type.TALK) {
+			if (style.talkBubble != null) {
+				float bubbleHeight = DPIUtils.getTouchMinSize() * style.bubbleSize * .25f;
+				setY(getY() + bubbleHeight + PADDING + DPIUtils.getSpacing());
+			} else {
+				setY(getY() + PADDING + DPIUtils.getSpacing());
 			}
 		}
 
+		setX(getX() - layout.width / 2);
+
+		fontX = posx - maxWidth / 2;
+
+		// check if the text exits the screen
+		if (getX() < 0 && getX() > -getWidth()) {
+			setX(0 + PADDING);
+			fontX = getX() + PADDING + (layout.width - maxWidth) / 2;
+		} else if (getX() + getWidth() > getStage().getViewport().getScreenWidth()
+				&& getX() + getWidth() < getStage().getViewport().getScreenWidth() + getWidth()) {
+			setX(getStage().getViewport().getScreenWidth() - getWidth() - PADDING);
+			fontX = getStage().getViewport().getScreenWidth() - layout.width / 2 - PADDING * 2 - maxWidth / 2;
+		}
+
+		if (getY() + getHeight() > getStage().getViewport().getScreenHeight()) {
+			setY(getStage().getViewport().getScreenHeight() - getHeight() - PADDING);
+		}
 	}
 
 	@Override
 	public void draw(Batch batch, float alpha) {
 
-		if (subtitle.type == Text.Type.TALK) {
+		if (text.type == Text.Type.TALK) {
+
+			// When the type is TALK we recalc the pos because of scrolling
+			calcPos();
+
+			if (getX() < 0 || getX() > getStage().getViewport().getScreenWidth())
+				return;
+
 			if (style.talkBubble != null) {
-				float scale = DPIUtils.getTouchMinSize() / 2 / style.talkBubble.getMinHeight();
-				float bubbleX = getX() + (getWidth()  - style.talkBubble.getMinWidth() * scale)/ 2;
-				float bubbleY = getY() - style.talkBubble.getMinHeight() * scale + 2;
+				float scale = DPIUtils.getTouchMinSize() * style.bubbleSize * .25f / style.talkBubble.getMinHeight();
+
+				float bubbleX = unprojectTmp.x - style.talkBubble.getMinWidth() * scale * .5f + style.bubbledx;
+				// check screen exit
+				bubbleX = Math.max(bubbleX, getX() + PADDING - style.talkBubble.getMinWidth() * scale / 2);
+				bubbleX = Math.min(bubbleX,
+						getX() + getWidth() - PADDING - style.talkBubble.getMinWidth() * scale * .5f);
+				float bubbleY = getY() - style.talkBubble.getMinHeight() * scale + style.bubbledy;
 
-//				style.talkBubble.draw(batch, bubbleX, bubbleY, style.talkBubble.getMinWidth() * scale,
-//						style.talkBubble.getMinHeight() * scale);
-				
 				style.talkBubble.draw(batch, bubbleX, bubbleY, style.talkBubble.getMinWidth() * scale,
 						style.talkBubble.getMinHeight() * scale);
 			}
@@ -151,19 +208,42 @@ public void draw(Batch batch, float alpha) {
 				style.talkBackground.draw(batch, getX(), getY(), getWidth(), getHeight());
 			}
 
-		} else if (subtitle.type == Text.Type.RECTANGLE) {
+		} else if (text.type == Text.Type.SUBTITLE) {
 			if (style.rectBackground != null) {
 				style.rectBackground.draw(batch, getX(), getY(), getWidth(), getHeight());
 			}
+
+			if (charIcon != null) {
+				float scale = getStage().getViewport().getScreenHeight() / (float) world.getHeight();
+				batch.draw(charIcon, getX() - charIcon.getRegionWidth() * scale, getY(),
+						charIcon.getRegionWidth() * scale, charIcon.getRegionHeight() * scale);
+			}
+
 		}
 
-		style.font.drawWrapped(batch, subtitle.str, getX() + PADDING, getY() + PADDING + b.height,
-				getWidth() - PADDING * 2, HAlignment.CENTER);
+		style.font.draw(batch, layout, fontX, getY() + PADDING + layout.height);
 	}
 
-	public void resize(int width, int height) {
-		maxRectangleWidth = width / 1.7f;
-		maxTalkWidth = width / 3;
+	private TextManagerUIStyle getStyle(Text text) {
+		String key = "default";
+
+		if (text != null && text.style != null && !text.style.isEmpty()) {
+			key = text.style;
+		} else if (text.actorId != null) {
+			CharacterActor a = (CharacterActor) world.getCurrentScene().getActor(text.actorId, false);
+
+			if (a != null && a.getTextStyle() != null)
+				key = a.getTextStyle();
+		}
+
+		TextManagerUIStyle s = styles.get(key);
+
+		if (s == null) {
+			EngineLogger.error("TextManagerUIStyle not found: " + key);
+			return styles.get("default");
+		}
+
+		return s;
 	}
 
 	/** The style for the TextManagerUI */
@@ -173,6 +253,13 @@ static public class TextManagerUIStyle {
 		public Drawable talkBackground;
 		public Drawable talkBubble;
 		public BitmapFont font;
+		public Color defaultColor;
+		public float subtitlePosPercent = 0.90f;
+		public float bubbleSize = 1f;
+		public float bubbledx = 0;
+		public float bubbledy = 0;
+		public int maxCharWidth = 80;
+		public int maxTalkCharWidth = 35;
 
 		public TextManagerUIStyle() {
 		}
@@ -182,6 +269,13 @@ public TextManagerUIStyle(TextManagerUIStyle style) {
 			talkBackground = style.talkBackground;
 			talkBubble = style.talkBubble;
 			font = style.font;
+			defaultColor = style.defaultColor;
+			subtitlePosPercent = style.subtitlePosPercent;
+			bubbleSize = style.bubbleSize;
+			bubbledx = style.bubbledx;
+			bubbledy = style.bubbledy;
+			maxCharWidth = style.maxCharWidth;
+			maxTalkCharWidth = style.maxTalkCharWidth;
 		}
 	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/UI.java b/blade-engine/src/com/bladecoder/engine/ui/UI.java
index a33243396..0b90e93d3 100644
--- a/blade-engine/src/com/bladecoder/engine/ui/UI.java
+++ b/blade-engine/src/com/bladecoder/engine/ui/UI.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
  * Copyright 2014 Rafael Garcia Moreno.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,17 +15,11 @@
  ******************************************************************************/
 package com.bladecoder.engine.ui;
 
-import com.bladecoder.engine.ui.BladeSkin;
-import com.bladecoder.engine.ui.CreditsScreen;
-import com.bladecoder.engine.ui.HelpScreen;
-import com.bladecoder.engine.ui.InitScreen;
-import com.bladecoder.engine.ui.LoadingScreen;
-import com.bladecoder.engine.ui.MenuScreenTextButtons;
-import com.bladecoder.engine.ui.Pointer;
-import com.bladecoder.engine.ui.SceneScreen;
 import com.badlogic.gdx.Application.ApplicationType;
 import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
 import com.badlogic.gdx.Input.Peripheral;
+import com.badlogic.gdx.controllers.Controllers;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
@@ -33,192 +27,246 @@
 import com.badlogic.gdx.utils.reflect.ClassReflection;
 import com.bladecoder.engine.assets.EngineAssetManager;
 import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.ui.defaults.DefaultSceneScreen;
+import com.bladecoder.engine.ui.retro.VerbUI;
 import com.bladecoder.engine.util.Config;
 import com.bladecoder.engine.util.EngineLogger;
 import com.bladecoder.engine.util.RectangleRenderer;
-import com.bladecoder.engine.util.Utils3D;
 
 public class UI {
 
-	private static final String SKIN_FILENAME = "ui/ui.json";
-
-	private boolean fullscreen = false;
-	private Pointer pointer;
-
-	private BladeScreen screen;
-
-	private boolean pieMode;
-
-	private SpriteBatch batch;
-	private Skin skin;
-
-	public static enum Screens {
-		INIT_SCREEN, SCENE_SCREEN, LOADING_SCREEN, MENU_SCREEN, HELP_SCREEN, CREDIT_SCREEN
-	};
-	
-	private final BladeScreen screens[];
-
-	public UI() {
-		batch = new SpriteBatch();
-		
-		screens = new BladeScreen[Screens.values().length];
-
-		Gdx.input.setCatchBackKey(true);
-		Gdx.input.setCatchMenuKey(true);
-
-		if (Gdx.input.isPeripheralAvailable(Peripheral.MultitouchScreen))
-			setPieMode(true);
-		else {
-			setPieMode(Config.getProperty(Config.PIE_MODE_DESKTOP_PROP, false));
-		}
-		
-		World.getInstance().loadXMLWorld();
-		loadAssets();
-		
-		screens[Screens.INIT_SCREEN.ordinal()] = getCustomScreenInstance(Config.INIT_SCREEN_CLASS_PROP, InitScreen.class);
-		screens[Screens.SCENE_SCREEN.ordinal()] = new SceneScreen();
-		screens[Screens.LOADING_SCREEN.ordinal()] = new LoadingScreen();
-		screens[Screens.MENU_SCREEN.ordinal()] = getCustomScreenInstance(Config.MENU_SCREEN_CLASS_PROP, MenuScreenTextButtons.class);
-		screens[Screens.HELP_SCREEN.ordinal()] = getCustomScreenInstance(Config.HELP_SCREEN_CLASS_PROP, HelpScreen.class);
-		screens[Screens.CREDIT_SCREEN.ordinal()] =  getCustomScreenInstance(Config.CREDIT_SCREEN_CLASS_PROP, CreditsScreen.class);
-		
-		for(BladeScreen s:screens)
-			s.setUI(this);
-
-		setCurrentScreen(Screens.INIT_SCREEN);
-	}
-	
-	private BladeScreen getCustomScreenInstance(String prop, Class<?> defaultClass) {
-		String clsName = Config.getProperty(prop, null);
-		Class<?> instanceClass = defaultClass;
-		
-		if( clsName != null  && !clsName.isEmpty()) {
-			try {
-				instanceClass = ClassReflection.forName(clsName);
-				return (BladeScreen)ClassReflection.newInstance(instanceClass);
-			} catch (Exception e) {
-				EngineLogger.error("Error instancing screen. " + e.getMessage());
-				instanceClass = defaultClass;
-			}
-		} 
-		
-		try {
-			return (BladeScreen)ClassReflection.newInstance(instanceClass);
-		} catch (Exception e) {
-			EngineLogger.error("Error instancing screen", e);
-		}
-		
-		return null;
-	}
-	
-	public BladeScreen getScreen(Screens state) {
-		return screens[state.ordinal()];
-	}
-	
-	public void setScreen(Screens state, BladeScreen s) {
-		screens[state.ordinal()] = s;
-	}
-	
-	public SpriteBatch getBatch() {
-		return batch;
-	}
-	
-	public Pointer getPointer() {
-		return pointer;
-	}
-
-	public BladeScreen getCurrentScreen() {
-		return screen;
-	}
-
-	public void setCurrentScreen(Screens s) {				
-		setCurrentScreen(screens[s.ordinal()]);
-	}
-	
-	public void setCurrentScreen(BladeScreen s) {
-
-		if (screen != null) {
-			screen.hide();
-		}
-		
-		screen = s;
-
-		screen.show();
-			
-		resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
-	}
-	
-	public TextureAtlas getUIAtlas() {
-		return skin.getAtlas();
-	}
-	
-	public Skin getSkin() {
-		return skin;
-	}
-
-	private void setPieMode(boolean m) {
-		pieMode = m;
-	}
-	
-	public boolean isPieMode() {
-		return pieMode;
-	}
-
-	public void render() {
-		// for long processing frames, limit delta to 1/30f to avoid skipping animations 
-		float delta = Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f);
-
-		screen.render(delta);
-	}
-
-	private void loadAssets() {
-		FileHandle skinFile = EngineAssetManager.getInstance().getAsset(SKIN_FILENAME);
-		TextureAtlas atlas = new TextureAtlas(EngineAssetManager.getInstance().getResAsset(
-				SKIN_FILENAME.substring(0,SKIN_FILENAME.lastIndexOf('.')) + ".atlas"));
-		skin = new BladeSkin(skinFile, atlas);
-		pointer = new Pointer(skin);
-	}
-
-	public void resize(int width, int height) {
-		pointer.resize(width, height);
-
-		if (screen != null)
-			screen.resize(width, height);
-	}
-
-	public void toggleFullScreen() {
-		if (!fullscreen) {
-			Gdx.graphics.setDisplayMode(Gdx.graphics.getDesktopDisplayMode());
-			fullscreen = true;
-		} else {
-			Gdx.graphics.setDisplayMode(World.getInstance().getWidth(), World
-					.getInstance().getHeight(), false);
-			fullscreen = false;
-		}
-	}
-
-	public void dispose() {
-		screen.hide();
-		batch.dispose();
-		skin.dispose();
-		
-		RectangleRenderer.dispose();
-		Utils3D.dispose();
-		EngineAssetManager.getInstance().dispose();
-	}
-	
-	public void resume() {
-		if(Gdx.app.getType() != ApplicationType.Desktop) {
-			// RESTORE GL CONTEXT
-			RectangleRenderer.dispose();
-		}
-		
-		if(screen != null)
-			screen.resume();
-	}
-	
-	public void pause() {
-		if(screen != null)
-			screen.pause();
-	}
+    public enum Screens {
+        INIT_SCREEN, SCENE_SCREEN, LOADING_SCREEN, MENU_SCREEN, HELP_SCREEN, CREDIT_SCREEN, LOAD_GAME_SCREEN,
+        SAVE_GAME_SCREEN
+    }
+
+    public enum InputMode {
+        GAMEPAD, MOUSE, TOUCHPANEL
+    }
+
+    private static final String SKIN_FILENAME = "ui/ui.json";
+
+    private final Recorder recorder;
+    private final TesterBot testerBot;
+
+    private boolean fullscreen = false;
+
+    private BladeScreen screen;
+
+    private SpriteBatch batch;
+    private Skin skin;
+    private final World w;
+    private InputMode inputMode;
+
+    private final BladeScreen screens[];
+
+    public UI(World w) {
+        this.w = w;
+        recorder = new Recorder(w);
+        testerBot = new TesterBot(w);
+
+        batch = new SpriteBatch();
+
+        screens = new BladeScreen[Screens.values().length];
+
+        Gdx.input.setCatchKey(Input.Keys.MENU, true);
+        Gdx.input.setCatchKey(Input.Keys.BACK, true);
+
+        loadAssets();
+
+        if (Controllers.getControllers().size > 0) {
+            inputMode = InputMode.GAMEPAD;
+        } else if (Gdx.input.isPeripheralAvailable(Peripheral.MultitouchScreen)) {
+            inputMode = InputMode.TOUCHPANEL;
+        } else {
+            inputMode = InputMode.MOUSE;
+        }
+
+        screens[Screens.INIT_SCREEN.ordinal()] = getCustomScreenInstance(Screens.INIT_SCREEN.toString(),
+                InitScreen.class);
+        screens[Screens.SCENE_SCREEN.ordinal()] = getCustomScreenInstance(Screens.SCENE_SCREEN.toString(),
+                DefaultSceneScreen.class);
+        screens[Screens.LOADING_SCREEN.ordinal()] = getCustomScreenInstance(Screens.LOADING_SCREEN.toString(),
+                LoadingScreen.class);
+        screens[Screens.MENU_SCREEN.ordinal()] = getCustomScreenInstance(Screens.MENU_SCREEN.toString(),
+                MenuScreen.class);
+        screens[Screens.HELP_SCREEN.ordinal()] = getCustomScreenInstance(Screens.HELP_SCREEN.toString(),
+                HelpScreen.class);
+        screens[Screens.CREDIT_SCREEN.ordinal()] = getCustomScreenInstance(Screens.CREDIT_SCREEN.toString(),
+                CreditsScreen.class);
+        screens[Screens.LOAD_GAME_SCREEN.ordinal()] = getCustomScreenInstance(Screens.LOAD_GAME_SCREEN.toString(),
+                LoadSaveScreen.class);
+        screens[Screens.SAVE_GAME_SCREEN.ordinal()] = getCustomScreenInstance(Screens.SAVE_GAME_SCREEN.toString(),
+                LoadSaveScreen.class);
+
+        for (BladeScreen s : screens)
+            s.setUI(this);
+
+        setCurrentScreen(Screens.INIT_SCREEN);
+    }
+
+    public World getWorld() {
+        return w;
+    }
+
+    public Recorder getRecorder() {
+        return recorder;
+    }
+
+    public TesterBot getTesterBot() {
+        return testerBot;
+    }
+
+    private BladeScreen getCustomScreenInstance(String prop, Class<?> defaultClass) {
+        String clsName = Config.getInstance().getProperty(prop, null);
+        Class<?> instanceClass = defaultClass;
+
+        if (clsName != null && !clsName.isEmpty()) {
+            try {
+                instanceClass = ClassReflection.forName(clsName);
+                return (BladeScreen) ClassReflection.newInstance(instanceClass);
+            } catch (Exception e) {
+                EngineLogger.error("Error instancing screen. " + e.getMessage());
+                // FIXME: Probably we just want to fail in this case, instead of creating a
+                // different screen than the one expected?
+                instanceClass = defaultClass;
+            }
+        }
+
+        try {
+            return (BladeScreen) ClassReflection.newInstance(instanceClass);
+        } catch (Exception e) {
+            EngineLogger.error("Error instancing screen", e);
+        }
+
+        return null;
+    }
+
+    public BladeScreen getScreen(Screens state) {
+        return screens[state.ordinal()];
+    }
+
+    public void setScreen(Screens state, BladeScreen s) {
+        screens[state.ordinal()] = s;
+    }
+
+    public InputMode getInputMode() {
+        return inputMode;
+    }
+
+    public void setInputMode(InputMode inputMode) {
+        this.inputMode = inputMode;
+    }
+
+    public SpriteBatch getBatch() {
+        return batch;
+    }
+
+    public BladeScreen getCurrentScreen() {
+        return screen;
+    }
+
+    public void setCurrentScreen(Screens s) {
+        EngineLogger.debug("Setting SCREEN: " + s.name());
+        setCurrentScreen(screens[s.ordinal()]);
+    }
+
+    public void setCurrentScreen(BladeScreen s) {
+
+        if (screen != null) {
+            screen.hide();
+        }
+
+        screen = s;
+
+        screen.show();
+
+        resize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+    }
+
+    public TextureAtlas getUIAtlas() {
+        return skin.getAtlas();
+    }
+
+    public Skin getSkin() {
+        return skin;
+    }
+
+    public void render() {
+        // for long processing frames, limit delta to 1/30f to avoid skipping animations
+        float delta = Math.min(Gdx.graphics.getDeltaTime(), 1 / 30f);
+
+        screen.render(delta);
+    }
+
+    private void loadAssets() {
+        FileHandle skinFile = EngineAssetManager.getInstance().getAsset(SKIN_FILENAME);
+        TextureAtlas atlas = new TextureAtlas(EngineAssetManager.getInstance()
+                .getResAsset(SKIN_FILENAME.substring(0, SKIN_FILENAME.lastIndexOf('.')) + ".atlas"));
+        skin = new BladeSkin(atlas);
+
+        ((BladeSkin) skin).addStyleTag(VerbUI.VerbUIStyle.class);
+        ((BladeSkin) skin).addStyleTag(TextManagerUI.TextManagerUIStyle.class);
+        ((BladeSkin) skin).addStyleTag(DialogUI.DialogUIStyle.class);
+        ((BladeSkin) skin).addStyleTag(InventoryUI.InventoryUIStyle.class);
+        ((BladeSkin) skin).addStyleTag(CreditsScreen.CreditScreenStyle.class);
+        ((BladeSkin) skin).addStyleTag(LoadSaveScreen.LoadSaveScreenStyle.class);
+        ((BladeSkin) skin).addStyleTag(MenuScreen.MenuScreenStyle.class);
+
+        skin.load(skinFile);
+
+        if (!Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, "").equals("")) {
+            EngineAssetManager.getInstance()
+                    .loadAtlas(Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, null));
+            EngineAssetManager.getInstance().finishLoading();
+        }
+    }
+
+    public void resize(int width, int height) {
+        if (screen != null)
+            screen.resize(width, height);
+    }
+
+    public void toggleFullScreen() {
+        if (!fullscreen) {
+            Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
+            fullscreen = true;
+        } else {
+            Gdx.graphics.setWindowedMode(w.getWidth(), w.getHeight());
+            fullscreen = false;
+        }
+    }
+
+    public void dispose() {
+        screen.hide();
+        batch.dispose();
+        skin.dispose();
+
+        RectangleRenderer.dispose();
+
+        if (!Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, "").equals(""))
+            EngineAssetManager.getInstance()
+                    .disposeAtlas(Config.getInstance().getProperty(Config.CHARACTER_ICON_ATLAS, null));
+
+        // DISPOSE ALL SCREENS
+        for (BladeScreen s : screens)
+            s.dispose();
+
+        EngineAssetManager.getInstance().dispose();
+    }
+
+    public void resume() {
+        if (Gdx.app.getType() != ApplicationType.Desktop) {
+            // RESTORE GL CONTEXT
+            RectangleRenderer.dispose();
+        }
+
+        if (screen != null)
+            screen.resume();
+    }
+
+    public void pause() {
+        if (screen != null)
+            screen.pause();
+    }
 }
diff --git a/blade-engine/src/com/bladecoder/engine/ui/defaults/DefaultSceneScreen.java b/blade-engine/src/com/bladecoder/engine/ui/defaults/DefaultSceneScreen.java
new file mode 100644
index 000000000..92b83ab46
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/defaults/DefaultSceneScreen.java
@@ -0,0 +1,744 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui.defaults;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.InputMultiplexer;
+import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
+import com.badlogic.gdx.input.GestureDetector;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.utils.GdxRuntimeException;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.CharacterActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.TextManager;
+import com.bladecoder.engine.model.Transition;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.model.World.AssetState;
+import com.bladecoder.engine.model.WorldListener;
+import com.bladecoder.engine.ui.*;
+import com.bladecoder.engine.ui.UI.InputMode;
+import com.bladecoder.engine.ui.UI.Screens;
+import com.bladecoder.engine.util.Config;
+import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engine.util.UIUtils;
+
+import java.util.Locale;
+
+public class DefaultSceneScreen implements SceneScreen {
+    private final static float LOADING_WAIT_TIME_MS = 400f;
+    private static final float MIN_TEXT_SCREEN_TIME = 0.3f;
+
+    private UI ui;
+
+    private Stage stage;
+
+    private PieMenu pie;
+    private InventoryUI inventoryUI;
+    private Actor dialogUI;
+    private Actor textManagerUI;
+    private ShapeRenderer renderer;
+
+    private InventoryButton inventoryButton;
+    private Button menuButton;
+
+    private DebugDrawer debugDrawer;
+    private HotspotsDrawer hotspotsDrawer;
+
+    public static enum UIModes {
+        TWO_BUTTONS, PIE, SINGLE_CLICK
+    }
+
+    ;
+
+    private UIModes uiMode = UIModes.TWO_BUTTONS;
+
+    private Recorder recorder;
+    private TesterBot testerBot;
+
+    private final Viewport viewport;
+
+    private final Vector3 unprojectTmp = new Vector3();
+    private final Vector2 unproject2Tmp = new Vector2();
+
+    // Actor under the cursor
+    private InteractiveActor currentActor = null;
+
+    // Called by the input handlers to show/hide the hotspots.
+    private boolean drawHotspots = false;
+    // Configuration to enable/disable the 'drawHotspot' feature.
+    private boolean showHotspotsFeature = true;
+
+    private final boolean showDesc;
+    private final boolean fastLeave;
+
+    private float speed = 1.0f;
+
+    private ScenePointer pointer;
+
+    private boolean uiEnabled = true;
+
+    private GestureDetector inputProcessor;
+    private SceneControllerHandler sceneController;
+
+    private final WorldListener worldListener = new SceneWorldListener(this);
+
+    public DefaultSceneScreen() {
+        viewport = Config.getInstance().getProperty(Config.EXTEND_VIEWPORT_PROP, false) ? new SceneExtendViewport()
+                : new SceneFitViewport();
+        showDesc = Config.getInstance().getProperty(Config.SHOW_DESC_PROP, true);
+        fastLeave = Config.getInstance().getProperty(Config.FAST_LEAVE, false);
+        showHotspotsFeature = Config.getInstance().getProperty(Config.SHOW_HOTSPOTS, true);
+    }
+
+    @Override
+    public UI getUI() {
+        return ui;
+    }
+
+    @Override
+    public World getWorld() {
+        return ui.getWorld();
+    }
+
+    public boolean isUiEnabled() {
+        return uiEnabled;
+    }
+
+    public PieMenu getPie() {
+        return pie;
+    }
+
+    public InventoryButton getInventoryButton() {
+        return inventoryButton;
+    }
+
+    public boolean getDrawHotspots() {
+        return drawHotspots;
+    }
+
+    public void setDrawHotspots(boolean drawHotspots) {
+        this.drawHotspots = drawHotspots && showHotspotsFeature;
+    }
+
+    public void setShowHotspotsFeature(boolean v) {
+        showHotspotsFeature = v;
+    }
+
+    public UIModes getUIMode() {
+        return uiMode;
+    }
+
+    void updateUI() {
+        World w = getWorld();
+
+        if (w.getAssetState() == null || w.getAssetState() == AssetState.LOAD_ASSETS
+                || w.getAssetState() == AssetState.LOAD_ASSETS_AND_INIT_SCENE)
+            return;
+
+        if (uiMode == UIModes.PIE && pie.isVisible())
+            pie.hide();
+
+        currentActor = null;
+        pointer.reset();
+
+        if (w.isPaused() || w.inCutMode() || testerBot.isEnabled() || recorder.isPlaying()) {
+            // DISABLE UI
+            inventoryUI.hide();
+            inventoryButton.setVisible(false);
+            dialogUI.setVisible(false);
+
+            inventoryUI.cancelDragging();
+            uiEnabled = false;
+
+            EngineLogger.debug("Updating UI: DISABLED.");
+        } else {
+            if (getWorld().hasDialogOptions()) {
+                inventoryUI.hide();
+                inventoryButton.setVisible(false);
+                dialogUI.setVisible(true);
+                inventoryUI.cancelDragging();
+                EngineLogger.debug("Updating UI: DIALOG OPTIONS.");
+            } else {
+                inventoryUI.hide();
+                dialogUI.setVisible(false);
+                inventoryButton.setVisible(w.getInventory().isVisible());
+                EngineLogger.debug("Updating UI: ENABLED.");
+            }
+
+            uiEnabled = true;
+        }
+    }
+
+    /**
+     * Sets the game speed. Can be used to fastfordward
+     *
+     * @param s The multiplier speed. ej. 2.0
+     */
+    @Override
+    public void setSpeed(float s) {
+        speed = s;
+    }
+
+    @Override
+    public float getSpeed() {
+        return speed;
+    }
+
+    private void update(float delta) {
+        final World world = getWorld();
+        float deltaScaled = delta * speed;
+
+        if (!world.isDisposed()) {
+            world.update(deltaScaled);
+
+            // if the game ends returns
+            if (world.isDisposed())
+                return;
+        }
+
+        if (world.getAssetState() != AssetState.LOADED) {
+
+            // TRY TO LOAD THE ASSETS FOR LOADING_WAIT_TIME_MS TO AVOID
+            // BLACK/LOADING SCREEN
+            long t0 = System.currentTimeMillis();
+            long t = t0;
+            while (EngineAssetManager.getInstance().isLoading() && t - t0 < LOADING_WAIT_TIME_MS) {
+                t = System.currentTimeMillis();
+            }
+
+            if (!EngineAssetManager.getInstance().isFinished()) {
+                // Sets loading screen if resources are not loaded yet
+                ui.setCurrentScreen(Screens.LOADING_SCREEN);
+            } else {
+                updateUI();
+
+                world.resize(viewport.getWorldWidth(), viewport.getWorldHeight());
+
+                // update() to retrieve assets and exec init verb
+                world.update(0);
+            }
+
+            return;
+        }
+
+        stage.act(delta);
+        pointer.update(delta);
+
+        if (drawHotspots) {
+            Drawable hotspotDrawable = getUI().getSkin().getDrawable(Verb.LEAVE_VERB);
+            Drawable leaveDrawable = getUI().getSkin().getDrawable("hotspot");
+
+            if (hotspotDrawable != null && hotspotDrawable instanceof AnimationDrawable)
+                ((AnimationDrawable) hotspotDrawable).act(delta);
+
+            if (leaveDrawable != null && leaveDrawable instanceof AnimationDrawable)
+                ((AnimationDrawable) leaveDrawable).act(delta);
+        }
+
+        if (world.isPaused())
+            return;
+
+        recorder.update(deltaScaled);
+        testerBot.update(deltaScaled);
+
+        InteractiveActor actorUnderCursor = null;
+
+        if (!uiEnabled || world.hasDialogOptions()) {
+            return;
+        }
+
+        if (inventoryUI.isVisible()) {
+            unproject2Tmp.set(Gdx.input.getX(), Gdx.input.getY());
+            inventoryUI.screenToLocalCoordinates(unproject2Tmp);
+            actorUnderCursor = inventoryUI.getItemAt(unproject2Tmp.x, unproject2Tmp.y);
+        } else {
+            actorUnderCursor = getActorUnderCursor();
+        }
+
+        // UPDATE POINTER
+        if (!pie.isVisible() && actorUnderCursor != currentActor) {
+            currentActor = actorUnderCursor;
+
+            updatePointer();
+        } else if (pie.isVisible()) {
+            currentActor = actorUnderCursor;
+        }
+    }
+
+    private void updatePointer() {
+        if (currentActor == null) {
+            pointer.setDefaultIcon();
+            return;
+        }
+
+        if (showDesc)
+            pointer.setDesc(currentActor.getDesc());
+
+        Verb leaveVerb = currentActor.getVerb(Verb.LEAVE_VERB);
+
+        Drawable r = null;
+
+        if (leaveVerb != null) {
+            if ((r = getDrawable(leaveVerb.getIcon())) != null) {
+                pointer.setIcon(r);
+
+            } else {
+                pointer.setLeaveIcon(UIUtils.calcLeaveArrowRotation(viewport, currentActor));
+            }
+        } else {
+            Verb actionVerb = currentActor.getVerb(Verb.ACTION_VERB);
+
+            if (actionVerb != null && (r = getDrawable(actionVerb.getIcon())) != null) {
+                pointer.setIcon(r);
+            } else {
+                pointer.setHotspotIcon();
+            }
+        }
+    }
+
+    private Drawable getDrawable(String name) {
+        if (name == null)
+            return null;
+
+        try {
+            return getUI().getSkin().getDrawable(name);
+        } catch (GdxRuntimeException e) {
+            return null;
+        }
+    }
+
+    private InteractiveActor getActorUnderCursor() {
+        final float tolerance;
+
+        if (inventoryUI.isDragging())
+            tolerance = DPIUtils.getTouchMinSize();
+        else if (ui.getInputMode() == InputMode.TOUCHPANEL)
+            tolerance = DPIUtils.getTouchMinSize() / 2;
+        else
+            tolerance = 0;
+
+        return getWorld().getInteractiveActorAtInput(viewport, tolerance);
+    }
+
+    @Override
+    public void render(float delta) {
+        final World world = getWorld();
+
+        update(delta);
+
+        if (world.getAssetState() != AssetState.LOADED) {
+            return;
+        }
+
+        SpriteBatch batch = ui.getBatch();
+
+        Gdx.gl.glClearColor(0, 0, 0, 1);
+        Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+
+        // WORLD CAMERA
+        world.draw();
+
+        // DRAW DEBUG BBOXES
+        if (EngineLogger.debugMode() && EngineLogger.getDebugLevel() == EngineLogger.DEBUG1) {
+            renderer.setProjectionMatrix(world.getSceneCamera().combined);
+            world.getCurrentScene().drawBBoxLines(renderer);
+            renderer.end();
+        }
+
+        // STAGE
+        stage.draw();
+
+        // SCREEN CAMERA
+        batch.setProjectionMatrix(viewport.getCamera().combined);
+        batch.begin();
+
+        if (!world.inCutMode() && !recorder.isPlaying() && !testerBot.isEnabled()) {
+            pointer.draw(batch, viewport);
+        }
+
+        Transition t = world.getTransition();
+
+        t.draw(batch, viewport.getScreenWidth(), viewport.getScreenHeight());
+
+        recorder.draw(batch);
+        testerBot.draw(batch);
+
+        if (drawHotspots)
+            hotspotsDrawer.draw(batch, showDesc);
+
+        // DRAW DEBUG STRING
+        if (EngineLogger.debugMode()) {
+            debugDrawer.draw(batch);
+        }
+
+        batch.end();
+
+        sceneController.update(delta);
+    }
+
+    @Override
+    public void resize(int width, int height) {
+        final World world = getWorld();
+        if (!world.isDisposed()) {
+            viewport.setWorldSize(world.getWidth(), world.getHeight());
+            viewport.update(width, height, true);
+            world.resize(viewport.getWorldWidth(), viewport.getWorldHeight());
+        } else {
+            viewport.setWorldSize(width, height);
+            viewport.update(width, height, true);
+        }
+
+        updateUI();
+
+        pie.resize(viewport.getScreenWidth(), viewport.getScreenHeight());
+        inventoryUI.resize(viewport.getScreenWidth(), viewport.getScreenHeight());
+        inventoryButton.resize(width, height);
+        pointer.resize(width, height);
+
+        float size = DPIUtils.getPrefButtonSize();
+        float margin = DPIUtils.getMarginSize();
+
+        menuButton.setSize(size, size);
+        menuButton.setPosition(stage.getViewport().getScreenWidth() - menuButton.getWidth() - margin,
+                stage.getViewport().getScreenHeight() - menuButton.getHeight() - margin);
+    }
+
+    @Override
+    public void dispose() {
+        renderer.dispose();
+        stage.dispose();
+    }
+
+    private void retrieveAssets(TextureAtlas atlas) {
+        renderer = new ShapeRenderer();
+        inventoryUI.retrieveAssets(atlas);
+    }
+
+    void sceneClick(ActionButton button, int count) {
+        World w = getWorld();
+
+        w.getSceneCamera().getInputUnProject(viewport, unprojectTmp);
+
+        Scene s = w.getCurrentScene();
+        CharacterActor player = s.getPlayer();
+
+        currentActor = getActorUnderCursor();
+
+        if (currentActor != null) {
+
+            if (EngineLogger.debugMode()) {
+                EngineLogger.debug(currentActor.toString());
+            }
+
+            // DOUBLE CLICK: Fastwalk when leaving scene.
+            if (count > 1) {
+                if (count == 2 && fastLeave && !recorder.isRecording() && player != null
+                        && currentActor.getVerb(Verb.LEAVE_VERB) != null) {
+
+                    player.fastWalk();
+                }
+
+                return;
+            }
+
+            actorClick(currentActor, button);
+        } else if (player != null && count < 2) {
+
+            // -- GOTO HANDLING --
+            // - if the PLAYER has a 'goto' verb, run it
+            // - else if the SCENE has a 'goto' verb, run it
+            // - else run PLAYER goto method
+            if (s.getPlayer().getVerb(Verb.GOTO_VERB) != null) {
+                runVerb(s.getPlayer(), Verb.GOTO_VERB, null);
+            } else if (s.getVerb(Verb.GOTO_VERB) != null) {
+                if (recorder.isRecording()) {
+                    recorder.add(null, Verb.GOTO_VERB, null);
+                }
+
+                s.runVerb(Verb.GOTO_VERB);
+            } else {
+                Vector2 pos = new Vector2(unprojectTmp.x, unprojectTmp.y);
+
+                if (recorder.isRecording()) {
+                    recorder.add(pos);
+                }
+
+                player.goTo(pos, null, false);
+            }
+        }
+    }
+
+    @Override
+    public void actorClick(InteractiveActor a, ActionButton button) {
+        final boolean lookatButton = button == ActionButton.LOOKAT;
+
+        if (a.getVerb(Verb.LEAVE_VERB) != null) {
+            runVerb(a, Verb.LEAVE_VERB, null);
+        } else if (a.getVerb(Verb.ACTION_VERB) != null) {
+            runVerb(a, Verb.ACTION_VERB, null);
+        } else if (uiMode == UIModes.SINGLE_CLICK) {
+            // SINGLE CLICK UI
+            // Preference TALKTO, ACTION, PICKUP, LOOKAT
+            String verb = Verb.TALKTO_VERB;
+
+            if (a.getVerb(verb) == null)
+                verb = Verb.PICKUP_VERB;
+
+            if (a.getVerb(verb) == null)
+                verb = Verb.LOOKAT_VERB;
+
+            runVerb(a, verb, null);
+        } else if (uiMode == UIModes.TWO_BUTTONS || ui.getInputMode() == InputMode.GAMEPAD) {
+            String verb = Verb.LOOKAT_VERB;
+
+            if (!lookatButton) {
+                verb = a.getVerb(Verb.TALKTO_VERB) != null ? Verb.TALKTO_VERB : Verb.PICKUP_VERB;
+            }
+
+            runVerb(a, verb, null);
+        } else if (uiMode == UIModes.PIE) {
+            getInputUnProject(unprojectTmp);
+            pie.show(a, unprojectTmp.x, unprojectTmp.y);
+            pointer.reset();
+        }
+    }
+
+    private void getInputUnProject(Vector3 out) {
+        out.set(Gdx.input.getX(), Gdx.input.getY(), 0);
+
+        viewport.unproject(out);
+    }
+
+    /**
+     * Run actor verb and handles recording
+     *
+     * @param a
+     * @param verb
+     * @param target
+     */
+    @Override
+    public void runVerb(InteractiveActor a, String verb, String target) {
+        if (recorder.isRecording()) {
+            recorder.add(a.getId(), verb, target);
+        }
+
+        a.runVerb(verb, target);
+    }
+
+    void showMenu() {
+        pause();
+        ui.setCurrentScreen(Screens.MENU_SCREEN);
+    }
+
+    public InventoryUI getInventoryUI() {
+        return inventoryUI;
+    }
+
+    public Actor getTextManagerUI() {
+        return textManagerUI;
+    }
+
+    public Actor getDialogUI() {
+        return dialogUI;
+    }
+
+    public void setTextManagerUI(Actor a) {
+        if (a instanceof ITextManagerUI) {
+            textManagerUI.remove();
+            textManagerUI = a;
+            stage.addActor(textManagerUI);
+        } else {
+            EngineLogger.error("ERROR setTextManagerUI: actor is not a ITextManagerUI");
+
+            dispose();
+            Gdx.app.exit();
+        }
+    }
+
+    public void setDialogUI(Actor a) {
+        dialogUI.remove();
+        dialogUI = a;
+        stage.addActor(dialogUI);
+    }
+
+    public Stage getStage() {
+        return stage;
+    }
+
+    public Button getMenuButton() {
+        return menuButton;
+    }
+
+    @Override
+    public void show() {
+        final InputMultiplexer multiplexer = new InputMultiplexer();
+        multiplexer.addProcessor(stage);
+        multiplexer.addProcessor(inputProcessor);
+        Gdx.input.setInputProcessor(multiplexer);
+
+        if (getWorld().isDisposed()) {
+            try {
+                getWorld().load();
+            } catch (Exception e) {
+                EngineLogger.error("ERROR LOADING GAME", e);
+
+                dispose();
+                Gdx.app.exit();
+            }
+        }
+
+        getWorld().setListener(worldListener);
+        getWorld().resume();
+    }
+
+    @Override
+    public void hide() {
+        getWorld().pause();
+    }
+
+    @Override
+    public void pause() {
+        getWorld().pause();
+    }
+
+    @Override
+    public void resume() {
+        getWorld().resume();
+
+        // resets the error when continue
+        if (EngineLogger.lastError != null && EngineLogger.debugMode()) {
+            EngineLogger.lastError = null;
+            EngineLogger.lastException = null;
+        }
+    }
+
+    @Override
+    public Viewport getViewport() {
+        return viewport;
+    }
+
+    @Override
+    public InteractiveActor getCurrentActor() {
+        return currentActor;
+    }
+
+    @Override
+    public void setUI(final UI ui) {
+        this.ui = ui;
+
+        recorder = ui.getRecorder();
+        testerBot = ui.getTesterBot();
+
+        stage = new Stage(viewport);
+        sceneController = new SceneControllerHandler(this);
+        inputProcessor = new SceneGestureDetector(this, sceneController);
+
+        pie = new PieMenu(this);
+        textManagerUI = new TextManagerUI(ui.getSkin(), getWorld());
+        menuButton = new AnimButton(ui.getSkin(), "menu");
+        dialogUI = new DialogUI(ui, ui.getRecorder());
+        pointer = new ScenePointer(ui);
+        inventoryUI = new InventoryUI(this, pointer);
+        inventoryButton = new InventoryButton(ui.getSkin(), getWorld(), inventoryUI);
+
+        uiMode = UIModes
+                .valueOf(Config.getInstance().getProperty(Config.UI_MODE, "TWO_BUTTONS").toUpperCase(Locale.ENGLISH));
+
+        if (ui.getInputMode() == InputMode.TOUCHPANEL && uiMode == UIModes.TWO_BUTTONS) {
+            uiMode = UIModes.PIE;
+        }
+
+        pie.setVisible(false);
+
+        menuButton.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                ui.setCurrentScreen(Screens.MENU_SCREEN);
+            }
+        });
+
+        retrieveAssets(ui.getUIAtlas());
+
+        stage.addActor(textManagerUI);
+        stage.addActor(dialogUI);
+        stage.addActor(inventoryButton);
+        stage.addActor(menuButton);
+        stage.addActor(inventoryUI);
+        stage.addActor(pie);
+
+        debugDrawer = new DebugDrawer(getWorld(), ui.getSkin(), viewport);
+        hotspotsDrawer = new HotspotsDrawer(ui, viewport);
+    }
+
+    /**
+     * Process a tap in the scene.
+     */
+    public void tap(ActionButton button, int count) {
+
+        World w = getWorld();
+
+        if (w.getAssetState() != AssetState.LOADED || w.isPaused() || getUI().getRecorder().isPlaying()
+                || getUI().getTesterBot().isEnabled())
+            return;
+
+        if (getPie().isVisible()) {
+            getPie().hide();
+        }
+
+        if (getDrawHotspots()) {
+            setDrawHotspots(false);
+            return;
+        }
+
+        if (w.inCutMode() || (!TextManager.AUTO_HIDE_TEXTS && getTextManagerUI().isVisible())) {
+
+            if (getUI().getRecorder().isRecording())
+                return;
+
+            // don't hide text if it wasn't visible at least by x seconds
+            if (w.getCurrentScene().getTextManager().getInScreenTime() < MIN_TEXT_SCREEN_TIME)
+                return;
+
+            w.getCurrentScene().getTextManager().next();
+        } else if (getInventoryUI().isVisible()) {
+            getInventoryUI().hide();
+        } else if (!w.hasDialogOptions()) {
+            if (button == ActionButton.INVENTORY) {
+                // Show inventory with the middle button
+                if (!getInventoryUI().isVisible()) {
+                    getInventoryUI().show();
+                }
+            } else {
+                sceneClick(button, count);
+            }
+        }
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneControllerHandler.java b/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneControllerHandler.java
new file mode 100644
index 000000000..d480cc84f
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneControllerHandler.java
@@ -0,0 +1,215 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui.defaults;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.controllers.Controller;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.bladecoder.engine.assets.EngineAssetManager;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.ui.DialogUI;
+import com.bladecoder.engine.ui.InventoryUI;
+import com.bladecoder.engine.ui.SceneScreen.ActionButton;
+import com.bladecoder.engine.util.EngineLogger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SceneControllerHandler extends ScreenControllerHandler {
+
+    private DefaultSceneScreen dsc;
+
+    public SceneControllerHandler(DefaultSceneScreen dsc) {
+        super(dsc.getUI(), dsc.getStage(), dsc.getViewport());
+        this.dsc = dsc;
+    }
+
+    @Override
+    protected boolean buttonUp(Controller controller, int buttonCode) {
+
+        int x = Gdx.input.getX();
+        int y = Gdx.input.getY();
+
+        if (dsc.getInventoryUI().isDragging()
+                && (buttonCode == controller.getMapping().buttonA || buttonCode == controller.getMapping().buttonB)) {
+            dsc.getInventoryUI().touchedUp(x, y, ActionButton.LOOKAT);
+            return true;
+        }
+
+        if (super.buttonUp(controller, buttonCode)) {
+            EngineLogger.debug("> Controller button handled by Stage.");
+            return true;
+        }
+
+        if (buttonCode == controller.getMapping().buttonA) {
+            dsc.tap(ActionButton.LOOKAT, 1);
+        } else if (buttonCode == controller.getMapping().buttonB) {
+            dsc.tap(ActionButton.ACTION, 1);
+        } else if (buttonCode == controller.getMapping().buttonY) {
+            dsc.tap(ActionButton.INVENTORY, 1);
+        } else if (buttonCode == controller.getMapping().buttonX) {
+            if (dsc.getInventoryUI().isVisible()) {
+                dsc.getInventoryUI().hide();
+            } else if (dsc.getInventoryUI().isDragging()) {
+                dsc.getInventoryUI().cancelDragging();
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public void focusNext(PointerToNextType type) {
+        if (dsc.getDialogUI().isVisible()) {
+            pointerToDialog(type);
+        } else if (dsc.getInventoryUI().isVisible()) {
+            pointerToInventory(type);
+        } else if (dsc.getPie().isVisible()) {
+            pointerToPie();
+        } else {
+            pointerToSceneActor(dsc.getWorld(), type, dsc.getViewport());
+        }
+    }
+
+    private void pointerToInventory(PointerToNextType type) {
+        InventoryUI inv = dsc.getInventoryUI();
+        int i = inv.getIndexUnderCursor();
+
+        if (i == -1) {
+            inv.cursorToInventoryActor(0);
+        } else if (type == PointerToNextType.RIGHT)
+            inv.cursorToInventoryActor(++i == dsc.getWorld().getInventory().getNumItems() ? 0 : i);
+        else
+            inv.cursorToInventoryActor(--i == -1 ? dsc.getWorld().getInventory().getNumItems() - 1 : i);
+    }
+
+    private void pointerToDialog(PointerToNextType type) {
+
+        Button hit = getButtonUnderCursor(dsc.getStage());
+
+        DialogUI dialogUI = (DialogUI) dsc.getDialogUI();
+        Array<Actor> actors = ((Table) dialogUI.getChildren().get(0)).getChildren();
+
+        int idx = 0;
+
+        if (hit != null) {
+            idx = actors.indexOf(hit, true);
+
+            if (idx > 0 && type == PointerToNextType.LEFT) {
+                idx--;
+            } else if (idx < actors.size - 1 && type == PointerToNextType.RIGHT) {
+                idx++;
+            }
+
+        }
+
+        final Button target = (Button) actors.get(idx);
+
+        EngineLogger.debug("Final IDX: " + idx + " Button: " + target);
+
+        if (idx == 0 && hit != null && dialogUI.getScrollPercentY() != 0) {
+            dialogUI.setScrollPercentY(0);
+        } else if (idx == actors.size - 1 && dialogUI.getScrollPercentY() != 1) {
+            dialogUI.setScrollPercentY(1);
+        } else {
+            dialogUI.scrollTo(target.getX(), target.getY(), target.getWidth(), target.getHeight());
+
+        }
+
+        dialogUI.updateVisualScroll();
+        dialogUI.invalidate();
+        dialogUI.layout();
+        cursorToActor(target);
+
+        dialogUI.setUpDownVisibility();
+    }
+
+    private void pointerToPie() {
+
+        Button hit = getButtonUnderCursor(dsc.getStage());
+
+        Array<Actor> actors = dsc.getPie().getChildren();
+
+        int idx = 0;
+
+        if (hit != null) {
+            if (hit != actors.get(1) && hit != actors.get(2)) {
+                if (actors.get(1).isVisible()) {
+                    idx = 1;
+                } else {
+                    idx = 2;
+                }
+            }
+
+        }
+
+        Button target = (Button) actors.get(idx);
+
+        cursorToActor(target);
+    }
+
+    private void pointerToSceneActor(World w, PointerToNextType type, Viewport viewport) {
+
+        List<Vector2> positions = new ArrayList<>();
+
+        Vector3 unprojectV = new Vector3();
+        float scale = EngineAssetManager.getInstance().getScale();
+
+        InteractiveActor actorUnderCursor = w.getInteractiveActorAtInput(viewport, 0f);
+
+        for (InteractiveActor a : w.getUIActors().getActors()) {
+            if (!a.canInteract() || actorUnderCursor == a)
+                continue;
+
+            Vector2 pos = new Vector2();
+            a.getBBox().getBoundingRectangle().getCenter(pos);
+
+            if (w.getUIActors().getActorAt(pos.x, pos.y) == a) {
+                unprojectV.set(pos.x * scale, pos.y * scale, 0);
+                w.getUIActors().getCamera().project(unprojectV, 0, 0, viewport.getScreenWidth(),
+                        viewport.getScreenHeight());
+                positions.add(pos.set(unprojectV.x, viewport.getScreenHeight() - unprojectV.y));
+            }
+        }
+
+        for (BaseActor a : w.getCurrentScene().getActors().values()) {
+            if (!(a instanceof InteractiveActor) || !((InteractiveActor) a).canInteract() || actorUnderCursor == a)
+                continue;
+
+            Vector2 pos = new Vector2();
+            a.getBBox().getBoundingRectangle().getCenter(pos);
+
+            if (w.getUIActors().getActorAt(pos.x, pos.y) == null
+                    && w.getCurrentScene().getInteractiveActorAt(pos.x, pos.y) == a) {
+                unprojectV.set(pos.x * scale, pos.y * scale, 0);
+                w.getCurrentScene().getCamera().project(unprojectV, 0, 0, viewport.getScreenWidth(),
+                        viewport.getScreenHeight());
+                positions.add(pos.set(viewport.getScreenX() + unprojectV.x,
+                        viewport.getScreenY() + viewport.getScreenHeight() - unprojectV.y));
+            }
+        }
+
+        setNextCursorPosition(positions, type);
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneGestureDetector.java b/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneGestureDetector.java
new file mode 100644
index 000000000..3b46beec1
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneGestureDetector.java
@@ -0,0 +1,184 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui.defaults;
+
+import com.badlogic.gdx.Input;
+import com.badlogic.gdx.input.GestureDetector;
+import com.badlogic.gdx.scenes.scene2d.utils.UIUtils;
+import com.bladecoder.engine.ui.InventoryUI.InventoryPos;
+import com.bladecoder.engine.ui.SceneScreen;
+import com.bladecoder.engine.ui.UI.InputMode;
+import com.bladecoder.engine.ui.defaults.DefaultSceneScreen.UIModes;
+import com.bladecoder.engine.util.EngineLogger;
+
+import java.io.IOException;
+
+public class SceneGestureDetector extends GestureDetector {
+
+    private final DefaultSceneScreen dsc;
+    private final SceneControllerHandler sceneControllerHandler;
+
+    public SceneGestureDetector(DefaultSceneScreen dsc, SceneControllerHandler sceneControllerHandler) {
+        super(new SceneGestureListener(dsc));
+        this.dsc = dsc;
+        this.sceneControllerHandler = sceneControllerHandler;
+    }
+
+    @Override
+    public boolean keyUp(int keycode) {
+        switch (keycode) {
+            case Input.Keys.ESCAPE:
+            case Input.Keys.BACK:
+            case Input.Keys.MENU:
+                dsc.showMenu();
+                break;
+            case Input.Keys.D:
+                if (UIUtils.ctrl())
+                    EngineLogger.toggle();
+                break;
+            case Input.Keys.SPACE:
+                if (dsc.getDrawHotspots())
+                    dsc.setDrawHotspots(false);
+                break;
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean keyTyped(char character) {
+        switch (character) {
+            case Input.Keys.F1:
+                EngineLogger.setDebugLevel(EngineLogger.DEBUG0);
+                break;
+            case Input.Keys.F2:
+                EngineLogger.setDebugLevel(EngineLogger.DEBUG1);
+                break;
+            case '1':
+                break;
+            case 'f':
+                // ui.toggleFullScreen();
+                break;
+            case 'i':
+                dsc.tap(SceneScreen.ActionButton.INVENTORY, 1);
+                break;
+            case '\n':
+            case '\r':
+            case 'q':
+                dsc.getUI().setInputMode(InputMode.GAMEPAD);
+
+                if (!sceneControllerHandler.clickOnUI()) {
+                    dsc.tap(SceneScreen.ActionButton.LOOKAT, 1);
+                }
+                break;
+            case 'e':
+                dsc.getUI().setInputMode(InputMode.GAMEPAD);
+
+                if (!sceneControllerHandler.clickOnUI()) {
+                    dsc.tap(SceneScreen.ActionButton.ACTION, 1);
+                }
+                break;
+            case 's':
+                if (EngineLogger.debugMode()) {
+                    try {
+                        dsc.getUI().getWorld().saveGameState();
+                    } catch (IOException e) {
+                        EngineLogger.error(e.getMessage());
+                    }
+                }
+                break;
+            case 'l':
+                if (EngineLogger.debugMode()) {
+                    try {
+                        dsc.getUI().getWorld().loadGameState();
+                    } catch (IOException e) {
+                        EngineLogger.error(e.getMessage());
+                    }
+                }
+                break;
+            case 't':
+                if (EngineLogger.debugMode()) {
+                    dsc.getUI().getTesterBot().setEnabled(!dsc.getUI().getTesterBot().isEnabled());
+                    dsc.updateUI();
+                }
+                break;
+            case '.':
+                if (EngineLogger.debugMode()) {
+                    dsc.getUI().getRecorder().setRecording(!dsc.getUI().getRecorder().isRecording());
+
+                    dsc.updateUI();
+                }
+                break;
+            case ',':
+                if (EngineLogger.debugMode()) {
+                    if (dsc.getUI().getRecorder().isPlaying())
+                        dsc.getUI().getRecorder().setPlaying(false);
+                    else {
+                        dsc.getUI().getRecorder().load();
+                        dsc.getUI().getRecorder().setPlaying(true);
+                    }
+
+                    dsc.updateUI();
+                }
+                break;
+            case 'p':
+                if (dsc.getUI().getWorld().isPaused()) {
+                    dsc.resume();
+                } else {
+                    dsc.pause();
+                }
+                break;
+            case 'z':
+                sceneControllerHandler.focusNext(ScreenControllerHandler.PointerToNextType.LEFT);
+                break;
+            case 'x':
+                sceneControllerHandler.focusNext(ScreenControllerHandler.PointerToNextType.RIGHT);
+                break;
+            case ' ':
+                if (dsc.isUiEnabled() && !dsc.getUI().getWorld().hasDialogOptions()) {
+                    dsc.setDrawHotspots(true);
+                }
+                break;
+        }
+
+        // FIXME: This is returning false even in the cases where we
+        // actually process the character
+        return false;
+    }
+
+    @Override
+    public boolean scrolled(float amountX, float amountY) {
+        if (dsc.isUiEnabled() && !dsc.getUI().getWorld().hasDialogOptions()
+                && dsc.getUI().getWorld().getInventory().isVisible()) {
+
+            dsc.getUI().setInputMode(InputMode.MOUSE);
+
+            boolean fromDown = (dsc.getInventoryUI().getInventoryPos() == InventoryPos.CENTER
+                    || dsc.getInventoryUI().getInventoryPos() == InventoryPos.DOWN);
+
+            if ((amountY > 0 && fromDown || amountY < 0 && !fromDown) && dsc.getInventoryUI().isVisible())
+                dsc.getInventoryUI().hide();
+            else if ((amountY > 0 && !fromDown || amountY < 0 && fromDown) && !dsc.getInventoryUI().isVisible()) {
+                if (dsc.getUIMode() == UIModes.PIE && dsc.getPie().isVisible())
+                    dsc.getPie().hide();
+
+                dsc.getInventoryUI().show();
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneGestureListener.java b/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneGestureListener.java
new file mode 100644
index 000000000..7a37ebdf9
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneGestureListener.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui.defaults;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input.Peripheral;
+import com.badlogic.gdx.input.GestureDetector;
+import com.bladecoder.engine.ui.SceneScreen.ActionButton;
+import com.bladecoder.engine.ui.UI.InputMode;
+import com.bladecoder.engine.util.EngineLogger;
+
+public class SceneGestureListener extends GestureDetector.GestureAdapter {
+    private final DefaultSceneScreen dsc;
+
+    public SceneGestureListener(DefaultSceneScreen dsc) {
+        this.dsc = dsc;
+    }
+
+    @Override
+    public boolean touchDown(float x, float y, int pointer, int button) {
+        return true;
+    }
+
+    @Override
+    public boolean tap(float x, float y, int count, int button) {
+        EngineLogger.debug("Event TAP button: " + button + " count: " + count);
+
+        if (Gdx.input.isPeripheralAvailable(Peripheral.MultitouchScreen)) {
+            dsc.getUI().setInputMode(InputMode.TOUCHPANEL);
+        } else {
+            dsc.getUI().setInputMode(InputMode.MOUSE);
+        }
+
+        ActionButton actionButton = mouseToAction(button);
+        dsc.tap(actionButton, count);
+
+        return true;
+    }
+
+    @Override
+    public boolean longPress(float x, float y) {
+        EngineLogger.debug("Event LONG PRESS");
+
+        if (dsc.isUiEnabled() && !dsc.getWorld().hasDialogOptions()) {
+            dsc.setDrawHotspots(true);
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean pan(float x, float y, float deltaX, float deltaY) {
+        return true;
+    }
+
+    @Override
+    public boolean panStop(float x, float y, int pointer, int button) {
+        tap(x, y, 1, button);
+
+        return true;
+    }
+
+    public static ActionButton mouseToAction(int b) {
+        if (b == 0) {
+            return ActionButton.LOOKAT;
+        }
+
+        if (b == 1) {
+            return ActionButton.ACTION;
+        }
+
+        if (b == 2) {
+            return ActionButton.INVENTORY;
+        }
+
+        return ActionButton.NONE;
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/defaults/ScenePointer.java b/blade-engine/src/com/bladecoder/engine/ui/defaults/ScenePointer.java
new file mode 100644
index 000000000..9fc206196
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/defaults/ScenePointer.java
@@ -0,0 +1,186 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui.defaults;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.scenes.scene2d.utils.TransformDrawable;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.ActorRenderer;
+import com.bladecoder.engine.model.SpriteActor;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.ui.AnimationDrawable;
+import com.bladecoder.engine.ui.UI;
+import com.bladecoder.engine.ui.UI.InputMode;
+import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.RectangleRenderer;
+
+public class ScenePointer {
+	private static final String LEAVE_ICON = "leave";
+	private static final String POINTER_ICON = "pointer";
+	private static final String HOTSPOT_ICON = "hotspotpointer";
+
+	private static final Color DRAG_NOT_HOTSPOT_COLOR = new Color(.5f, 0.5f, 0.5f, 1f);
+
+	private Color tmpTint = new Color();
+
+	private BitmapFont font;
+
+	private String desc = null;
+
+	private Drawable leaveIcon;
+	private Drawable pointerIcon;
+	private Drawable hotspotIcon;
+	private Drawable currentIcon;
+	private SpriteActor draggingActor;
+
+	private final Vector2 mousepos = new Vector2();
+
+	private float pointerScale;
+	private float leaveRotation = 0f;
+	private final World world;
+	private final UI ui;
+
+	private final GlyphLayout layout = new GlyphLayout();
+
+	public ScenePointer(UI ui) {
+		this.ui = ui;
+		this.world = ui.getWorld();
+		font = ui.getSkin().getFont("desc");
+		pointerIcon = ui.getSkin().getDrawable(POINTER_ICON);
+		leaveIcon = ui.getSkin().getDrawable(LEAVE_ICON);
+		hotspotIcon = ui.getSkin().getDrawable(HOTSPOT_ICON);
+		reset();
+	}
+
+	public void reset() {
+		setDefaultIcon();
+		draggingActor = null;
+	}
+
+	public void drag(SpriteActor a) {
+		draggingActor = a;
+		tmpTint.set(DRAG_NOT_HOTSPOT_COLOR);
+
+		if (a != null && draggingActor.getTint() != null)
+			tmpTint.mul(draggingActor.getTint());
+	}
+
+	public void setDefaultIcon() {
+		currentIcon = pointerIcon;
+		desc = null;
+	}
+
+	public void setLeaveIcon(float rot) {
+		currentIcon = leaveIcon;
+		leaveRotation = rot;
+	}
+
+	public void setHotspotIcon() {
+		currentIcon = hotspotIcon;
+	}
+
+	public void setIcon(Drawable r) {
+		currentIcon = r;
+	}
+
+	public void setDesc(String s) {
+		desc = s;
+
+		if (desc != null) {
+
+			if (desc.charAt(0) == I18N.PREFIX)
+				desc = world.getI18N().getString(desc.substring(1));
+
+			layout.setText(font, desc);
+		}
+	}
+
+	private void getInputUnproject(Viewport v, Vector2 out) {
+		out.set(Gdx.input.getX(), Gdx.input.getY());
+
+		v.unproject(out);
+	}
+
+	public void update(float delta) {
+		if (currentIcon instanceof AnimationDrawable)
+			((AnimationDrawable) currentIcon).act(delta);
+	}
+
+	public void draw(SpriteBatch batch, Viewport v) {
+
+		getInputUnproject(v, mousepos);
+
+		boolean multiTouch = ui.getInputMode() == InputMode.TOUCHPANEL;
+
+		// DRAW TARGET DESCRIPTION
+		if (desc != null && (!multiTouch || Gdx.input.isTouched())) {
+			float margin = DPIUtils.UI_SPACE;
+
+			float textX = mousepos.x - layout.width / 2;
+			float textY = mousepos.y + layout.height + DPIUtils.UI_SPACE + DPIUtils.getTouchMinSize();
+
+			if (textX < 0)
+				textX = 0;
+
+			RectangleRenderer.draw(batch, textX - margin, textY - layout.height - margin, layout.width + margin * 2,
+					layout.height + margin * 2, Color.BLACK);
+			font.draw(batch, layout, textX, textY);
+		}
+
+		if (draggingActor == null) {
+			if (!multiTouch || (currentIcon == leaveIcon && Gdx.input.isTouched())) {
+
+				if (currentIcon instanceof TransformDrawable) {
+
+					TransformDrawable i = (TransformDrawable) currentIcon;
+
+					i.draw(batch, mousepos.x - currentIcon.getMinWidth() / 2,
+							mousepos.y - currentIcon.getMinHeight() / 2, currentIcon.getMinWidth() / 2,
+							currentIcon.getMinHeight() / 2, currentIcon.getMinWidth(), currentIcon.getMinHeight(),
+							pointerScale, pointerScale, currentIcon == leaveIcon ? leaveRotation : 0);
+				} else {
+					float width = currentIcon.getMinWidth() * pointerScale;
+					float height = currentIcon.getMinHeight() * pointerScale;
+					float x = mousepos.x - width / 2;
+					float y = mousepos.y - height / 2;
+
+					currentIcon.draw(batch, x, y, width, height);
+				}
+			}
+		} else {
+			float h = (draggingActor.getHeight() > draggingActor.getWidth() ? draggingActor.getHeight()
+					: draggingActor.getWidth());
+			float size = DPIUtils.getTouchMinSize() / h * 1.8f;
+
+			ActorRenderer r = draggingActor.getRenderer();
+
+			r.draw(batch, mousepos.x, mousepos.y - draggingActor.getHeight() * size / 2, size, size, 0f,
+					currentIcon != hotspotIcon ? tmpTint : draggingActor.getTint());
+		}
+	}
+
+	public void resize(int width, int height) {
+		pointerScale = DPIUtils.getTouchMinSize() / pointerIcon.getMinHeight() * .8f;
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneWorldListener.java b/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneWorldListener.java
new file mode 100644
index 000000000..62cbcee95
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/defaults/SceneWorldListener.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui.defaults;
+
+import com.bladecoder.engine.model.Text;
+import com.bladecoder.engine.model.World.AssetState;
+import com.bladecoder.engine.model.WorldListener;
+import com.bladecoder.engine.ui.ITextManagerUI;
+import com.bladecoder.engine.util.UIUtils;
+
+public class SceneWorldListener implements WorldListener {
+
+	private final DefaultSceneScreen dsc;
+
+	public SceneWorldListener(DefaultSceneScreen dsc) {
+		this.dsc = dsc;
+	}
+
+	@Override
+	public void text(Text t) {
+		if (t != null && t.type == Text.Type.UI) {
+			UIUtils.showUIText(dsc.getStage(), dsc.getUI().getSkin(), dsc.getWorld(), t);
+		} else {
+			((ITextManagerUI) dsc.getTextManagerUI()).setText(t);
+		}
+	}
+
+	@Override
+	public void dialogOptions() {
+		dsc.updateUI();
+	}
+
+	@Override
+	public void cutMode(boolean value) {
+		dsc.updateUI();
+	}
+
+	@Override
+	public void inventoryEnabled(boolean value) {
+		dsc.getInventoryUI().hide();
+		dsc.getInventoryButton().setVisible(value);
+	}
+
+	@Override
+	public void pause(boolean value) {
+		if (dsc.getUI().getWorld().getAssetState() == AssetState.LOADED)
+			dsc.updateUI();
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/defaults/ScreenControllerHandler.java b/blade-engine/src/com/bladecoder/engine/ui/defaults/ScreenControllerHandler.java
new file mode 100644
index 000000000..ece588367
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/defaults/ScreenControllerHandler.java
@@ -0,0 +1,333 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui.defaults;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
+import com.badlogic.gdx.controllers.Controller;
+import com.badlogic.gdx.controllers.Controllers;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Group;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.bladecoder.engine.ui.UI;
+import com.bladecoder.engine.ui.UI.InputMode;
+import com.bladecoder.engine.ui.UI.Screens;
+import com.bladecoder.engine.util.EngineLogger;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+public class ScreenControllerHandler {
+    public static final float THUMBSTICKVELOCITY = 12f * 60f;
+
+    private final Stage stage;
+    private final UI ui;
+    private final Viewport viewport;
+
+    private int pressed = -1;
+
+    public ScreenControllerHandler(UI ui, Stage stage, Viewport viewport) {
+        this.stage = stage;
+        this.ui = ui;
+        this.viewport = viewport;
+    }
+
+    public void update(float delta) {
+        updateAxis(delta);
+        updateDPad(delta);
+        updateButtons();
+    }
+
+    private void updateButtons() {
+
+        for (Controller controller : Controllers.getControllers()) {
+
+            for (int buttonCode = controller.getMinButtonIndex(); buttonCode <= controller
+                    .getMaxButtonIndex(); buttonCode++) {
+                boolean p = controller.getButton(buttonCode);
+
+                if (p) {
+                    if (pressed != -1 && buttonCode != pressed) {
+                        buttonUp(controller, pressed);
+                    }
+
+                    pressed = buttonCode;
+                } else if (buttonCode == pressed) {
+                    buttonUp(controller, pressed);
+                    pressed = -1;
+                }
+            }
+        }
+    }
+
+    protected boolean buttonUp(Controller controller, int buttonCode) {
+        EngineLogger.debug(buttonCode + " gamepad button up.");
+
+        ui.setInputMode(InputMode.GAMEPAD);
+
+        if (buttonCode == controller.getMapping().buttonStart) {
+            if (ui.getCurrentScreen() != ui.getScreen(Screens.MENU_SCREEN)) {
+                ui.setCurrentScreen(Screens.MENU_SCREEN);
+            }
+
+            return true;
+        }
+
+        if (buttonCode == controller.getMapping().buttonA || buttonCode == controller.getMapping().buttonB) {
+            // Simulate click on UI
+            int x = Gdx.input.getX();
+            int y = Gdx.input.getY();
+
+            int pointer = buttonCode == controller.getMapping().buttonA ? 11 : 12;
+
+            stage.touchDown(x, y, pointer, 0);
+            boolean handled = stage.touchUp(x, y, pointer, 0);
+
+            return handled;
+        } else if (buttonCode == controller.getMapping().buttonR1 || buttonCode == controller.getMapping().buttonR2) {
+            focusNext(PointerToNextType.RIGHT);
+            return true;
+        } else if (buttonCode == controller.getMapping().buttonL1 || buttonCode == controller.getMapping().buttonL2) {
+            focusNext(PointerToNextType.LEFT);
+            return true;
+        }
+
+        return false;
+    }
+
+    public boolean clickOnUI() {
+        // Simulate click on UI
+        int x = Gdx.input.getX();
+        int y = Gdx.input.getY();
+
+        int pointer = 11;
+
+        stage.touchDown(x, y, pointer, 0);
+        return stage.touchUp(x, y, pointer, 0);
+    }
+
+    public void focusNext(PointerToNextType type) {
+        List<Vector2> positions = new ArrayList<>();
+
+        Array<Actor> actors = stage.getActors();
+
+        Button hit = getButtonUnderCursor(stage);
+
+        if (hit != null)
+            hit.getClickListener().exit(null, 0, 0, -1, null);
+
+        addActors(actors, positions, hit);
+
+        setNextCursorPosition(positions, type);
+
+        hit = getButtonUnderCursor(stage);
+
+        if (hit != null) {
+            hit.getClickListener().enter(null, 0, 0, -1, null);
+        }
+    }
+
+    protected Button getButtonUnderCursor(Stage stage) {
+        Vector2 inputPos = new Vector2(Gdx.input.getX(), Gdx.input.getY());
+        stage.screenToStageCoordinates(inputPos);
+        Actor hit = stage.hit(inputPos.x, inputPos.y, true);
+
+        if (hit != null) {
+            while (!(hit instanceof Button) && hit != null)
+                hit = hit.getParent();
+
+            EngineLogger.debug("HIT!!: " + hit);
+        }
+
+        return (Button) hit;
+    }
+
+    protected void addActors(Array<Actor> actors, List<Vector2> positions, Actor hit) {
+        for (Actor a : actors) {
+
+            if (a == hit)
+                continue;
+
+            if (!a.isVisible())
+                continue;
+
+            if (a instanceof Button) {
+
+                Vector2 pos = new Vector2();
+                a.localToScreenCoordinates(pos);
+
+                pos.x = pos.x + a.getWidth() / 2f;
+                pos.y = pos.y - a.getHeight() / 2f;
+
+                positions.add(pos);
+                EngineLogger.debug("ADD: " + a + " pos: " + pos);
+            } else if (a instanceof Group) {
+                addActors(((Group) a).getChildren(), positions, hit);
+            }
+        }
+    }
+
+    public static void cursorToActor(Actor target) {
+        Vector2 pos = new Vector2(target.getWidth() / 2f, target.getHeight() / 2f);
+        target.localToScreenCoordinates(pos);
+
+        Gdx.input.setCursorPosition((int) pos.x, (int) pos.y);
+
+        target.getStage().mouseMoved(Gdx.input.getX(), Gdx.input.getY());
+    }
+
+    protected void setNextCursorPosition(List<Vector2> positions, PointerToNextType type) {
+        if (positions.isEmpty())
+            return;
+
+        if (type == PointerToNextType.RIGHT) {
+            positions.sort(new Comparator<Vector2>() {
+                @Override
+                public int compare(Vector2 o1, Vector2 o2) {
+                    int val = (int) (o1.x - o2.x);
+
+                    if (val == 0)
+                        val = (int) (o1.y - o2.y);
+
+                    return val;
+                }
+            });
+        } else {
+            positions.sort(new Comparator<Vector2>() {
+
+                @Override
+                public int compare(Vector2 o1, Vector2 o2) {
+                    int val = (int) (o2.x - o1.x);
+
+                    if (val == 0)
+                        val = (int) (o2.y - o1.y);
+
+                    return val;
+                }
+            });
+        }
+
+        int idx = 0;
+
+        Vector2 mPos = new Vector2(Gdx.input.getX(), Gdx.input.getY());
+
+        // get the nearest actor
+        for (int i = 0; i < positions.size(); i++) {
+            Vector2 actPos = positions.get(i);
+
+            if (type == PointerToNextType.RIGHT) {
+                if ((int) actPos.x < (int) mPos.x)
+                    continue;
+
+                if ((int) actPos.x == (int) mPos.x && (int) actPos.y < (int) mPos.y)
+                    continue;
+            } else {
+                if ((int) actPos.x > (int) mPos.x)
+                    continue;
+
+                if ((int) actPos.x == (int) mPos.x && (int) actPos.y > (int) mPos.y)
+                    continue;
+            }
+
+            idx = i;
+            break;
+        }
+
+        EngineLogger.debug("Selected: " + positions.get(idx) + " IDX: " + idx);
+        Gdx.input.setCursorPosition((int) positions.get(idx).x, (int) positions.get(idx).y);
+
+    }
+
+    private void updateAxis(int vx, int vy) {
+        if (vx != 0 || vy != 0) {
+            int x = Gdx.input.getX() + vx;
+            int y = Gdx.input.getY() + vy;
+
+            ui.setInputMode(InputMode.GAMEPAD);
+
+            Gdx.input.setCursorPosition(
+                    MathUtils.clamp(x, viewport.getScreenX(), viewport.getScreenWidth() + viewport.getScreenX()),
+                    MathUtils.clamp(y, viewport.getScreenY(), viewport.getScreenHeight() + viewport.getScreenY()));
+
+            if (stage != null)
+                stage.mouseMoved(Gdx.input.getX(), Gdx.input.getY());
+        }
+    }
+
+    private float getVelocity(float delta) {
+        return THUMBSTICKVELOCITY * delta * viewport.getScreenWidth() / 1080f;
+    }
+
+    private void updateAxis(float delta) {
+        float v = getVelocity(delta);
+
+        int vx = 0, vy = 0;
+
+        for (Controller controller : Controllers.getControllers()) {
+            vx += controller.getAxis(controller.getMapping().axisLeftX) * v;
+            vy += controller.getAxis(controller.getMapping().axisLeftY) * v;
+            vx += controller.getAxis(controller.getMapping().axisRightX) * v / 2f;
+            vy += controller.getAxis(controller.getMapping().axisRightY) * v / 2f;
+        }
+
+        updateAxis(vx, vy);
+    }
+
+    private void updateDPad(float delta) {
+        float v = getVelocity(delta);
+
+        int vx = 0, vy = 0;
+
+        for (Controller controller : Controllers.getControllers()) {
+
+            if (controller.getButton(controller.getMapping().buttonDpadRight)) {
+                vx += v;
+            } else if (controller.getButton(controller.getMapping().buttonDpadLeft)) {
+                vx -= v;
+            }
+
+            if (controller.getButton(controller.getMapping().buttonDpadUp)) {
+                vy -= v;
+            } else if (controller.getButton(controller.getMapping().buttonDpadDown)) {
+                vy += v;
+            }
+        }
+
+        if (Gdx.input.isKeyPressed(Input.Keys.D) || Gdx.input.isKeyPressed(Input.Keys.RIGHT)) {
+            vx += v;
+        } else if (Gdx.input.isKeyPressed(Input.Keys.A) || Gdx.input.isKeyPressed(Input.Keys.LEFT)) {
+            vx -= v;
+        }
+
+        if (Gdx.input.isKeyPressed(Input.Keys.W) || Gdx.input.isKeyPressed(Input.Keys.UP)) {
+            vy -= v;
+        } else if (Gdx.input.isKeyPressed(Input.Keys.S) || Gdx.input.isKeyPressed(Input.Keys.DOWN)) {
+            vy += v;
+        }
+
+        updateAxis(vx, vy);
+    }
+
+    public enum PointerToNextType {
+        LEFT, RIGHT
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/retro/RendererDrawable.java b/blade-engine/src/com/bladecoder/engine/ui/retro/RendererDrawable.java
new file mode 100644
index 000000000..49087d05b
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/retro/RendererDrawable.java
@@ -0,0 +1,35 @@
+package com.bladecoder.engine.ui.retro;
+
+import com.badlogic.gdx.graphics.g2d.Batch;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.scenes.scene2d.utils.BaseDrawable;
+import com.bladecoder.engine.model.ActorRenderer;
+
+public class RendererDrawable extends BaseDrawable {
+
+	private ActorRenderer renderer;
+
+	public void setRenderer(ActorRenderer r) {
+		renderer = r;
+		
+		if (r != null) {
+			setMinWidth(renderer.getWidth());
+			setMinHeight(renderer.getHeight());
+		}
+	}
+
+	@Override
+	public void draw(Batch batch, float x, float y, float width, float height) {
+		if (renderer == null)
+			return;
+
+		float scale;
+
+		if (renderer.getWidth() > renderer.getHeight())
+			scale = width / renderer.getWidth();
+		else
+			scale = height / renderer.getHeight();
+
+		renderer.draw((SpriteBatch) batch, x + renderer.getWidth() * scale  / 2, y, scale, scale, 0f, null);
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/retro/RetroSceneScreen.java b/blade-engine/src/com/bladecoder/engine/ui/retro/RetroSceneScreen.java
new file mode 100644
index 000000000..6a849df8a
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/retro/RetroSceneScreen.java
@@ -0,0 +1,747 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.ui.retro;
+
+import java.io.IOException;
+
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.Input;
+import com.badlogic.gdx.InputMultiplexer;
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.graphics.glutils.HdpiUtils;
+import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
+import com.badlogic.gdx.input.GestureDetector;
+import com.badlogic.gdx.math.Polygon;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.ui.Button;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.BaseActor;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Scene;
+import com.bladecoder.engine.model.Text;
+import com.bladecoder.engine.model.Transition;
+import com.bladecoder.engine.model.World;
+import com.bladecoder.engine.model.World.AssetState;
+import com.bladecoder.engine.model.WorldListener;
+import com.bladecoder.engine.ui.DialogUI;
+import com.bladecoder.engine.ui.Pointer;
+import com.bladecoder.engine.ui.Recorder;
+import com.bladecoder.engine.ui.SceneFitViewport;
+import com.bladecoder.engine.ui.SceneScreen;
+import com.bladecoder.engine.ui.TesterBot;
+import com.bladecoder.engine.ui.TextManagerUI;
+import com.bladecoder.engine.ui.UI;
+import com.bladecoder.engine.ui.UI.InputMode;
+import com.bladecoder.engine.ui.UI.Screens;
+import com.bladecoder.engine.ui.defaults.SceneGestureListener;
+import com.bladecoder.engine.util.DPIUtils;
+import com.bladecoder.engine.util.EngineLogger;
+import com.bladecoder.engine.util.RectangleRenderer;
+
+public class RetroSceneScreen implements SceneScreen {
+	private static final float UI_SCREEN_PERCENT = 1 - 144.0f / 200.0f; // % of
+																		// screen
+																		// height
+																		// of
+																		// verbui;
+
+	private UI ui;
+
+	private Stage stage;
+
+	// we need an stage for the TextManagerUI because it runs inside the world
+	// viewport
+	private Stage worldViewportStage;
+
+	private VerbUI verbUI;
+	private DialogUI dialogUI;
+	private TextManagerUI textManagerUI;
+	private ShapeRenderer renderer;
+
+	private Button menuButton;
+
+	private Recorder recorder;
+	private TesterBot testerBot;
+
+	private final Viewport screenViewport;
+	private final Viewport worldViewport;
+
+	private final Vector3 unprojectTmp = new Vector3();
+
+	private final StringBuilder sbTmp = new StringBuilder();
+
+	// BaseActor under the cursor
+	private InteractiveActor currentActor = null;
+
+	private boolean drawHotspots = false;
+
+	private float speed = 1.0f;
+
+	private final GlyphLayout textLayout = new GlyphLayout();
+
+	private Pointer pointer;
+
+	private boolean uiEnabled = true;
+
+	private final GestureDetector inputProcessor = new GestureDetector(new GestureDetector.GestureAdapter() {
+		@Override
+		public boolean touchDown(float x, float y, int pointer, int button) {
+			return true;
+		}
+
+		@Override
+		public boolean tap(float x, float y, int count, int button) {
+			EngineLogger.debug("Event TAP button: " + button);
+
+			World w = ui.getWorld();
+
+			if (w.isPaused() || recorder.isPlaying() || testerBot.isEnabled())
+				return true;
+
+			if (drawHotspots)
+				drawHotspots = false;
+			else {
+				if (w.inCutMode() && !recorder.isRecording()) {
+					w.getCurrentScene().getTextManager().next();
+				} else if (!w.hasDialogOptions()) {
+					sceneClick(SceneGestureListener.mouseToAction(button));
+				}
+			}
+
+			return true;
+		}
+
+		@Override
+		public boolean longPress(float x, float y) {
+			EngineLogger.debug("Event LONG PRESS");
+
+			if (uiEnabled && !ui.getWorld().hasDialogOptions()) {
+				drawHotspots = true;
+			}
+
+			return false;
+		}
+
+		@Override
+		public boolean pan(float x, float y, float deltaX, float deltaY) {
+			return true;
+		}
+
+		@Override
+		public boolean panStop(float x, float y, int pointer, int button) {
+			return true;
+		}
+	}) {
+		@Override
+		public boolean keyUp(int keycode) {
+			switch (keycode) {
+			case Input.Keys.ESCAPE:
+			case Input.Keys.BACK:
+			case Input.Keys.MENU:
+				ui.setCurrentScreen(Screens.MENU_SCREEN);
+				break;
+			case Input.Keys.SPACE:
+				if (drawHotspots)
+					drawHotspots = false;
+				break;
+			}
+
+			return true;
+		}
+
+		@Override
+		public boolean keyTyped(char character) {
+			switch (character) {
+
+			case 'd':
+				EngineLogger.toggle();
+				break;
+			case '1':
+				EngineLogger.setDebugLevel(EngineLogger.DEBUG0);
+				break;
+			case '2':
+				EngineLogger.setDebugLevel(EngineLogger.DEBUG1);
+				break;
+			case 'f':
+				// ui.toggleFullScreen();
+				break;
+			case 's':
+				try {
+					ui.getWorld().saveGameState();
+				} catch (IOException e) {
+					EngineLogger.error(e.getMessage());
+				}
+				break;
+			case 'l':
+				try {
+					ui.getWorld().loadGameState();
+				} catch (IOException e) {
+					EngineLogger.error(e.getMessage());
+				}
+				break;
+			case 't':
+				testerBot.setEnabled(!testerBot.isEnabled());
+				break;
+			case '.':
+				if (recorder.isRecording())
+					recorder.setRecording(false);
+				else
+					recorder.setRecording(true);
+				break;
+			case ',':
+				if (recorder.isPlaying())
+					recorder.setPlaying(false);
+				else {
+					recorder.load();
+					recorder.setPlaying(true);
+				}
+				break;
+			case 'p':
+				if (ui.getWorld().isPaused()) {
+					ui.getWorld().resume();
+				} else {
+					ui.getWorld().pause();
+				}
+				break;
+			case ' ':
+				if (uiEnabled && !ui.getWorld().hasDialogOptions()) {
+					drawHotspots = true;
+				}
+				break;
+			}
+
+			// FIXME: This is returning false even in the cases where we
+			// actually process the character
+			return false;
+		}
+	};
+
+	private final WorldListener worldListener = new WorldListener() {
+		@Override
+		public void text(Text t) {
+			textManagerUI.setText(t);
+		}
+
+		@Override
+		public void dialogOptions() {
+			updateUI();
+		}
+
+		@Override
+		public void cutMode(boolean value) {
+			updateUI();
+		}
+
+		@Override
+		public void inventoryEnabled(boolean value) {
+			if (value)
+				verbUI.show();
+			else
+				verbUI.hide();
+		}
+
+		@Override
+		public void pause(boolean value) {
+			updateUI();
+		}
+	};
+
+	public RetroSceneScreen() {
+		screenViewport = new SceneFitViewport();
+
+		worldViewport = new Viewport() {
+			// This is the World Viewport. It is like a ScreenViewport but the
+			// camera is the same that the screenViewport;
+			@Override
+			public void apply(boolean centerCamera) {
+				HdpiUtils.glViewport(getScreenX(), getScreenY(), getScreenWidth(), getScreenHeight());
+				getCamera().viewportWidth = getScreenWidth();
+				getCamera().viewportHeight = getScreenHeight();
+				if (centerCamera)
+					getCamera().position.set(getScreenWidth() / 2, getScreenHeight() / 2, 0);
+				getCamera().update();
+			}
+		};
+
+		worldViewport.setCamera(screenViewport.getCamera());
+	}
+
+	@Override
+	public UI getUI() {
+		return ui;
+	}
+
+	private void updateUI() {
+		World w = ui.getWorld();
+
+		if (w.isPaused() || w.inCutMode() || testerBot.isEnabled() || recorder.isPlaying()) {
+			// DISABLE UI
+			dialogUI.setVisible(false);
+			verbUI.hide();
+			pointer.hide();
+			uiEnabled = false;
+		} else {
+			if (ui.getWorld().hasDialogOptions()) {
+				dialogUI.setVisible(true);
+				verbUI.hide();
+			} else {
+				dialogUI.setVisible(false);
+
+				if (w.getInventory().isVisible())
+					verbUI.show();
+				else
+					verbUI.hide();
+			}
+
+			pointer.show();
+			uiEnabled = true;
+		}
+	}
+
+	/**
+	 * Sets the game speed. Can be used to fastfordward
+	 *
+	 * @param s The multiplier speed. ej. 2.0
+	 */
+	@Override
+	public void setSpeed(float s) {
+		speed = s;
+	}
+
+	@Override
+	public float getSpeed() {
+		return speed;
+	}
+
+	private void update(float delta) {
+		final World world = ui.getWorld();
+
+		currentActor = null;
+
+		if (!world.isDisposed()) {
+			world.update(delta * speed);
+		}
+
+		AssetState assetState = world.getAssetState();
+
+		if (assetState != AssetState.LOADED) {
+			ui.setCurrentScreen(Screens.LOADING_SCREEN);
+			return;
+		}
+
+		stage.act(delta);
+		worldViewportStage.act(delta);
+
+		if (world.isPaused())
+			return;
+
+		recorder.update(delta * speed);
+		testerBot.update(delta * speed);
+
+		if (uiEnabled && !world.hasDialogOptions()) {
+
+			final float tolerance;
+
+			if (ui.getInputMode() == InputMode.TOUCHPANEL)
+				tolerance = DPIUtils.getTouchMinSize();
+			else
+				tolerance = 0;
+
+			currentActor = world.getInteractiveActorAtInput(worldViewport, tolerance);
+
+			verbUI.setCurrentActor(currentActor);
+		}
+	}
+
+	@Override
+	public void render(float delta) {
+		final World world = ui.getWorld();
+
+		update(delta);
+
+		// Gdx.gl.glClearColor(0, 0, 0, 1);
+		// Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+
+		if (world.getAssetState() != AssetState.LOADED)
+			return;
+
+		SpriteBatch batch = ui.getBatch();
+
+		Gdx.gl.glClearColor(0, 0, 0, 1);
+		Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
+
+		// WORLD CAMERA
+		if (world.getInventory().isVisible()) {
+			worldViewport.setScreenY(screenViewport.getScreenY() + (int) verbUI.getHeight());
+			worldViewport.setScreenHeight(screenViewport.getScreenHeight() - (int) verbUI.getHeight());
+			world.resize(world.getWidth(), world.getHeight() * (1 - UI_SCREEN_PERCENT));
+		} else {
+			worldViewport.setScreenY(screenViewport.getScreenY());
+			worldViewport.setScreenHeight(screenViewport.getScreenHeight());
+			world.resize(world.getWidth(), world.getHeight());
+		}
+
+		worldViewport.apply(true);
+
+		world.draw();
+
+		// DRAW DEBUG BBOXES
+		if (EngineLogger.debugMode() && EngineLogger.getDebugLevel() == EngineLogger.DEBUG1) {
+			renderer.setProjectionMatrix(world.getSceneCamera().combined);
+			world.getCurrentScene().drawBBoxLines(renderer);
+			renderer.end();
+		}
+
+		// SCREEN CAMERA
+		batch.setProjectionMatrix(worldViewport.getCamera().combined);
+		batch.begin();
+
+		// DRAW DEBUG STRING
+		if (EngineLogger.debugMode()) {
+			drawDebugText(batch);
+		}
+
+		Transition t = world.getTransition();
+
+		t.draw(batch, worldViewport.getScreenWidth(), worldViewport.getScreenHeight());
+
+		recorder.draw(batch);
+		testerBot.draw(batch);
+
+		if (drawHotspots)
+			drawHotspots(batch);
+
+		batch.end();
+
+		worldViewportStage.draw();
+
+		// STAGE CAMERA
+		screenViewport.apply(true);
+		stage.draw();
+	}
+
+	private void drawDebugText(SpriteBatch batch) {
+		World w = ui.getWorld();
+
+		w.getSceneCamera().getInputUnProject(worldViewport, unprojectTmp);
+
+		Color color;
+
+		sbTmp.setLength(0);
+
+		if (EngineLogger.lastError != null) {
+			sbTmp.append(EngineLogger.lastError);
+
+			color = Color.RED;
+		} else {
+
+			sbTmp.append("( ");
+			sbTmp.append((int) unprojectTmp.x);
+			sbTmp.append(", ");
+			sbTmp.append((int) unprojectTmp.y);
+			sbTmp.append(") FPS:");
+			sbTmp.append(Gdx.graphics.getFramesPerSecond());
+			// sbTmp.append(" Density:");
+			// sbTmp.append(Gdx.graphics.getDensity());
+			// sbTmp.append(" UI Multiplier:");
+			// sbTmp.append(DPIUtils.getSizeMultiplier());
+
+			if (w.getCurrentScene().getPlayer() != null) {
+				sbTmp.append(" Depth Scl: ");
+				sbTmp.append(w.getCurrentScene().getFakeDepthScale(unprojectTmp.y));
+			}
+
+			color = Color.WHITE;
+		}
+
+		String strDebug = sbTmp.toString();
+
+		textLayout.setText(ui.getSkin().getFont("debug"), strDebug, color, worldViewport.getScreenWidth(), Align.left,
+				true);
+
+		RectangleRenderer.draw(batch, 0, worldViewport.getScreenHeight() - textLayout.height - 10, textLayout.width,
+				textLayout.height + 10, Color.BLACK);
+		ui.getSkin().getFont("debug").draw(batch, textLayout, 0, worldViewport.getScreenHeight() - 5);
+
+		// Draw actor states when debug
+		if (EngineLogger.getDebugLevel() == EngineLogger.DEBUG1) {
+
+			for (BaseActor a : w.getCurrentScene().getActors().values()) {
+				Rectangle r = a.getBBox().getBoundingRectangle();
+				sbTmp.setLength(0);
+				sbTmp.append(a.getId());
+				if (a instanceof InteractiveActor && ((InteractiveActor) a).getState() != null)
+					sbTmp.append(".").append(((InteractiveActor) a).getState());
+
+				unprojectTmp.set(r.getX(), r.getY(), 0);
+				w.getSceneCamera().scene2screen(worldViewport, unprojectTmp);
+
+				if (w.getInventory().isVisible()) {
+					// unprojectTmp.y += verbUI.getHeight();
+				}
+
+				ui.getSkin().getFont("debug").draw(batch, sbTmp.toString(), unprojectTmp.x, unprojectTmp.y);
+			}
+
+		}
+	}
+
+	private void drawHotspots(SpriteBatch batch) {
+		final World world = ui.getWorld();
+		for (BaseActor a : world.getCurrentScene().getActors().values()) {
+			if (!(a instanceof InteractiveActor) || !a.isVisible() || a == world.getCurrentScene().getPlayer())
+				continue;
+
+			InteractiveActor ia = (InteractiveActor) a;
+
+			if (!ia.canInteract())
+				continue;
+
+			Polygon p = a.getBBox();
+
+			if (p == null) {
+				EngineLogger.error("ERROR DRAWING HOTSPOT FOR: " + a.getId());
+			}
+
+			Rectangle r = a.getBBox().getBoundingRectangle();
+
+			unprojectTmp.set(r.getX() + r.getWidth() / 2, r.getY() + r.getHeight() / 2, 0);
+			world.getSceneCamera().scene2screen(worldViewport, unprojectTmp);
+
+			if (world.getInventory().isVisible()) {
+				// unprojectTmp.y += verbUI.getHeight();
+			}
+
+			if (ia.getDesc() == null) {
+
+				float size = DPIUtils.ICON_SIZE * DPIUtils.getSizeMultiplier();
+
+				Drawable drawable = ((TextureRegionDrawable) getUI().getSkin().getDrawable("circle")).tint(Color.RED);
+
+				drawable.draw(batch, unprojectTmp.x - size / 2, unprojectTmp.y - size / 2, size, size);
+			} else {
+				BitmapFont font = getUI().getSkin().getFont("desc");
+				String desc = ia.getDesc();
+				if (desc.charAt(0) == I18N.PREFIX)
+					desc = getWorld().getI18N().getString(desc.substring(1));
+
+				textLayout.setText(font, desc);
+
+				float textX = unprojectTmp.x - textLayout.width / 2;
+				float textY = unprojectTmp.y + textLayout.height;
+
+				RectangleRenderer.draw(batch, textX - 8, textY - textLayout.height - 8, textLayout.width + 16,
+						textLayout.height + 16, Color.BLACK);
+				font.draw(batch, textLayout, textX, textY);
+			}
+		}
+	}
+
+	@Override
+	public void resize(int width, int height) {
+		final World world = ui.getWorld();
+
+		if (!world.isDisposed()) {
+			screenViewport.setWorldSize(world.getWidth(), world.getHeight());
+			screenViewport.update(width, height, true);
+
+			worldViewport.setScreenBounds(screenViewport.getScreenX(), screenViewport.getScreenY(),
+					screenViewport.getScreenWidth(), screenViewport.getScreenHeight());
+
+			world.resize(screenViewport.getWorldWidth(), screenViewport.getWorldHeight());
+		}
+
+		pointer.resize();
+
+		verbUI.setSize(screenViewport.getScreenWidth(), screenViewport.getScreenHeight() * UI_SCREEN_PERCENT);
+
+		float size = DPIUtils.getPrefButtonSize();
+		float margin = DPIUtils.getMarginSize();
+
+		menuButton.setSize(size, size);
+		menuButton.setPosition(stage.getViewport().getScreenWidth() - menuButton.getWidth() - margin,
+				stage.getViewport().getScreenHeight() - menuButton.getHeight() - margin);
+	}
+
+	@Override
+	public void dispose() {
+		renderer.dispose();
+		stage.dispose();
+		worldViewportStage.dispose();
+	}
+
+	private void retrieveAssets(TextureAtlas atlas) {
+		renderer = new ShapeRenderer();
+	}
+
+	private void sceneClick(ActionButton button) {
+		World w = ui.getWorld();
+
+		w.getSceneCamera().getInputUnProject(worldViewport, unprojectTmp);
+
+		Scene s = w.getCurrentScene();
+
+		if (currentActor != null) {
+
+			if (EngineLogger.debugMode()) {
+				EngineLogger.debug(currentActor.toString());
+			}
+
+			actorClick(currentActor, button);
+		} else if (s.getPlayer() != null) {
+			if (s.getPlayer().getVerb("goto") != null) {
+				runVerb(s.getPlayer(), "goto", null);
+			} else {
+				Vector2 pos = new Vector2(unprojectTmp.x, unprojectTmp.y);
+
+				if (recorder.isRecording()) {
+					recorder.add(pos);
+				}
+
+				s.getPlayer().goTo(pos, null, false);
+			}
+		}
+	}
+
+	@Override
+	public void actorClick(InteractiveActor a, ActionButton button) {
+		runVerb(a, verbUI.getCurrentVerb(), verbUI.getTarget());
+	}
+
+	/**
+	 * Run actor verb and handles recording
+	 *
+	 * @param a
+	 * @param verb
+	 * @param target
+	 */
+	@Override
+	public void runVerb(InteractiveActor a, String verb, String target) {
+
+		if (recorder.isRecording()) {
+			recorder.add(a.getId(), verb, target);
+		}
+
+		a.runVerb(verb, target);
+	}
+
+	@Override
+	public void show() {
+		retrieveAssets(ui.getUIAtlas());
+
+		stage = new Stage(screenViewport);
+		// stage.addActor(textManagerUI);
+		stage.addActor(dialogUI);
+		stage.addActor(menuButton);
+		stage.addActor(verbUI);
+		stage.addActor(pointer);
+
+		menuButton.addListener(new ClickListener() {
+			@Override
+			public void clicked(InputEvent event, float x, float y) {
+				ui.setCurrentScreen(Screens.MENU_SCREEN);
+			}
+		});
+
+		worldViewportStage = new Stage(worldViewport);
+		worldViewportStage.addActor(textManagerUI);
+
+		final InputMultiplexer multiplexer = new InputMultiplexer();
+		multiplexer.addProcessor(stage);
+		multiplexer.addProcessor(inputProcessor);
+		Gdx.input.setInputProcessor(multiplexer);
+
+		if (ui.getWorld().isDisposed()) {
+			try {
+				ui.getWorld().load();
+			} catch (Exception e) {
+				EngineLogger.error("ERROR LOADING GAME", e);
+
+				dispose();
+				Gdx.app.exit();
+			}
+		}
+
+		ui.getWorld().setListener(worldListener);
+		ui.getWorld().resume();
+
+		textManagerUI.setText(ui.getWorld().getCurrentScene().getTextManager().getCurrentText());
+
+		updateUI();
+	}
+
+	@Override
+	public void hide() {
+		ui.getWorld().pause();
+		currentActor = null;
+		dispose();
+	}
+
+	@Override
+	public void pause() {
+		ui.getWorld().pause();
+	}
+
+	@Override
+	public void resume() {
+		ui.getWorld().resume();
+	}
+
+	@Override
+	public Viewport getViewport() {
+		return screenViewport;
+	}
+
+	@Override
+	public InteractiveActor getCurrentActor() {
+		return currentActor;
+	}
+
+	@Override
+	public void setUI(UI ui) {
+		this.ui = ui;
+
+		recorder = ui.getRecorder();
+		testerBot = ui.getTesterBot();
+
+		textManagerUI = new TextManagerUI(ui.getSkin(), getWorld());
+		menuButton = new Button(ui.getSkin(), "menu");
+		dialogUI = new DialogUI(ui, recorder);
+
+		verbUI = new VerbUI(this);
+
+		pointer = new Pointer(ui);
+	}
+
+	@Override
+	public World getWorld() {
+		return ui.getWorld();
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/ui/retro/VerbUI.java b/blade-engine/src/com/bladecoder/engine/ui/retro/VerbUI.java
new file mode 100644
index 000000000..47eadd1c5
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/ui/retro/VerbUI.java
@@ -0,0 +1,311 @@
+package com.bladecoder.engine.ui.retro;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.ui.Button.ButtonStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.ImageButton;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Label.LabelStyle;
+import com.badlogic.gdx.scenes.scene2d.ui.Table;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
+import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
+import com.badlogic.gdx.utils.Align;
+import com.bladecoder.engine.i18n.I18N;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Inventory;
+import com.bladecoder.engine.ui.SceneScreen;
+import com.bladecoder.engine.util.DPIUtils;
+
+public class VerbUI extends Table {
+	private final static float MARGIN = 1;
+
+	private static final List<String> VERBS = Arrays.asList("give", "pickup", "use", "open", "talkto", "push", "close",
+			"lookat", "pull");
+	private static final List<String> VERBS_DESC = Arrays.asList("Give", "Pick up", "Use", "Open", "Talk to", "Push",
+			"Close", "Lookat", "Pull");
+
+	private static final int VERB_COLS = 3;
+
+	private static final int INVENTORY_COLS = 3;
+	private static final int INVENTORY_ROWS = 3;
+
+	private final List<ImageButton> inventorySlots = new ArrayList<>();
+
+	private final SceneScreen sceneScreen;
+	private final String DEFAULT_VERB = "lookat";
+	private final Label infoLine;
+
+	private String currentVerb = DEFAULT_VERB;
+	private InteractiveActor target;
+
+	private VerbUIStyle style;
+
+	private int scroll = 0;
+
+	private Table arrowPanel;
+	private Table invPanel;
+
+	public VerbUI(SceneScreen scn) {
+		super(scn.getUI().getSkin());
+
+		style = scn.getUI().getSkin().get(VerbUIStyle.class);
+
+		if (style.background != null)
+			setBackground(style.background);
+
+		this.sceneScreen = scn;
+
+		infoLine = new Label(VERBS_DESC.get(VERBS.indexOf(DEFAULT_VERB)), style.infoLineLabelStyle);
+		infoLine.setAlignment(Align.center);
+		add(infoLine).colspan(3).fillX().expandX();
+		row();
+
+		Table verbs = createVerbPanel();
+		add(verbs).fill().expand();
+
+		arrowPanel = createArrowPanel();
+		add(arrowPanel).fillY().expandY();
+
+		invPanel = createInventoryPanel();
+		add(invPanel).fill().expand();
+	}
+
+	private Table createArrowPanel() {
+		Table arrows = new Table();
+
+		arrows.defaults().pad(MARGIN);
+
+		ImageButton.ImageButtonStyle s = new ImageButton.ImageButtonStyle(style.inventoryButtonStyle);
+		s.imageUp = style.upArrow;
+
+		ImageButton up = new ImageButton(s);
+
+		arrows.add(up).fillY().expandY();
+
+		up.addListener(new ClickListener() {
+			@Override
+			public void clicked(InputEvent event, float x, float y) {
+				if (scroll > 0)
+					scroll--;
+			}
+		});
+
+		arrows.row();
+
+		ImageButton.ImageButtonStyle s2 = new ImageButton.ImageButtonStyle(style.inventoryButtonStyle);
+		s2.imageUp = style.downArrow;
+
+		ImageButton down = new ImageButton(s2);
+
+		arrows.add(down).fillY().expandY();
+
+		down.addListener(new ClickListener() {
+			@Override
+			public void clicked(InputEvent event, float x, float y) {
+				Inventory inv = sceneScreen.getUI().getWorld().getInventory();
+
+				int itemsLeft = inv.getNumItems() - scroll * INVENTORY_COLS;
+
+				if (itemsLeft > inventorySlots.size())
+					scroll++;
+			}
+		});
+
+		return arrows;
+	}
+
+	private Table createVerbPanel() {
+		Table verbs = new Table();
+
+		verbs.defaults().pad(MARGIN);
+
+		for (int i = 0; i < VERBS.size(); i++) {
+			if (i % VERB_COLS == 0)
+				verbs.row();
+
+			TextButton b = new TextButton(VERBS_DESC.get(i), style.verbButtonStyle);
+			b.setName(VERBS.get(i));
+			b.addListener(new ClickListener() {
+				@Override
+				public void clicked(InputEvent event, float x, float y) {
+					currentVerb = event.getListenerActor().getName();
+					infoLine.setText(((TextButton) event.getListenerActor()).getText());
+					target = null;
+				}
+			});
+
+			verbs.add(b).fill().expand();
+		}
+
+		return verbs;
+	}
+
+	@Override
+	public void sizeChanged() {
+		super.sizeChanged();
+
+		for (Actor a : arrowPanel.getChildren()) {
+			ImageButton b = (ImageButton) a;
+			float h = (getHeight() / 2) - style.infoLineLabelStyle.font.getLineHeight() / 2 - DPIUtils.getSpacing();
+			float ih = b.getImage().getDrawable().getMinHeight();
+			float iw = b.getImage().getDrawable().getMinWidth() * h / ih;
+			b.getImageCell().maxSize(iw, h);
+		}
+
+		arrowPanel.invalidateHierarchy();
+	}
+
+	@Override
+	public void act(float delta) {
+		super.act(delta);
+
+		Inventory inv = sceneScreen.getUI().getWorld().getInventory();
+
+		// fill inventory
+		for (int i = 0; i < inventorySlots.size(); i++) {
+			RendererDrawable r = (RendererDrawable) inventorySlots.get(i).getImage().getDrawable();
+
+			int pos = scroll * INVENTORY_COLS + i;
+
+			if (pos < inv.getNumItems()) {
+				r.setRenderer(inv.get(pos).getRenderer());
+			} else {
+				r.setRenderer(null);
+			}
+
+			inventorySlots.get(i).getImage().invalidate();
+		}
+	}
+
+	private Table createInventoryPanel() {
+		Table inventory = new Table();
+
+		inventory.defaults().pad(MARGIN);
+
+		for (int i = 0; i < INVENTORY_COLS * INVENTORY_ROWS; i++) {
+			if (i % INVENTORY_COLS == 0)
+				inventory.row();
+
+			ImageButton.ImageButtonStyle s = new ImageButton.ImageButtonStyle(style.inventoryButtonStyle);
+			RendererDrawable r = new RendererDrawable();
+			s.imageUp = r;
+
+			ImageButton b = new ImageButton(s);
+
+			inventory.add(b).fill().expand();
+			b.setUserObject(i);
+			inventorySlots.add(b);
+
+			b.addListener(new ClickListener() {
+				@Override
+				public void clicked(InputEvent event, float x, float y) {
+					int i = (Integer) event.getListenerActor().getUserObject();
+					Inventory inv = sceneScreen.getUI().getWorld().getInventory();
+					target = null;
+
+					if (i < inv.getNumItems()) {
+						InteractiveActor actor = inv.get(i);
+
+						if (currentVerb.equals("use") || currentVerb.equals("give")) {
+							target = actor;
+						} else {
+							sceneScreen.runVerb(actor, currentVerb, null);
+						}
+					}
+				}
+			});
+
+			b.getImageCell().pad(MARGIN).expand().fill();
+		}
+
+		return inventory;
+	}
+
+	public String getCurrentVerb() {
+		return currentVerb;
+	}
+
+	public String getTarget() {
+		return target == null ? null : target.getId();
+	}
+
+	public void setCurrentActor(InteractiveActor actor) {
+		String verbDesc = VERBS_DESC.get(VERBS.indexOf(currentVerb));
+		String desc = getTranslatedDesc(actor);
+
+		if (target != null) {
+			String prep;
+
+			if (currentVerb.equals("give")) {
+				prep = " to ";
+			} else {
+				prep = " with ";
+			}
+
+			if (desc != null)
+				infoLine.setText(verbDesc + " " + getTranslatedDesc(target) + prep + desc);
+			else
+				infoLine.setText(verbDesc + " " + getTranslatedDesc(target) + prep);
+		} else {
+			if (desc != null)
+				infoLine.setText(verbDesc + " " + desc);
+			else
+				infoLine.setText(verbDesc);
+		}
+	}
+
+	private String getTranslatedDesc(InteractiveActor actor) {
+		String desc = null;
+
+		if (actor != null && actor.getDesc() != null) {
+			desc = actor.getDesc();
+
+			if (desc.charAt(0) == I18N.PREFIX)
+				desc = sceneScreen.getWorld().getI18N().getString(desc.substring(1));
+		}
+
+		return desc;
+	}
+
+	public void show() {
+		setVisible(true);
+	}
+
+	public void hide() {
+		target = null;
+		currentVerb = DEFAULT_VERB;
+		setCurrentActor(null);
+
+		setVisible(false);
+	}
+
+	/** The style for the VerbUI */
+	static public class VerbUIStyle {
+		/** Optional. */
+		public Drawable background;
+
+		public TextButtonStyle verbButtonStyle;
+		public ButtonStyle inventoryButtonStyle;
+		public LabelStyle infoLineLabelStyle;
+		public Drawable upArrow;
+		public Drawable downArrow;
+
+		public VerbUIStyle() {
+		}
+
+		public VerbUIStyle(VerbUIStyle style) {
+			background = style.background;
+			verbButtonStyle = style.verbButtonStyle;
+			inventoryButtonStyle = style.inventoryButtonStyle;
+			infoLineLabelStyle = style.infoLineLabelStyle;
+			upArrow = style.upArrow;
+			downArrow = style.downArrow;
+		}
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/util/ActionCallbackSerialization.java b/blade-engine/src/com/bladecoder/engine/util/ActionCallbackSerialization.java
deleted file mode 100644
index 76cb79d0b..000000000
--- a/blade-engine/src/com/bladecoder/engine/util/ActionCallbackSerialization.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.util;
-
-import com.bladecoder.engine.actions.Action;
-import com.bladecoder.engine.actions.ActionCallback;
-import com.bladecoder.engine.model.BaseActor;
-import com.bladecoder.engine.model.Scene;
-import com.bladecoder.engine.model.Verb;
-import com.bladecoder.engine.model.VerbManager;
-import com.bladecoder.engine.model.World;
-
-/**
- * 
- * Helper class to serialize ActionCallbacks. An ActionCallback is an Action or
- * a Verb.
- * 
- * This class can generate an String from an ActionCallback to save to a file
- * and then locate the ActionCallback based in the generated String.
- * 
- * The String generated to locate an ActionCallback is like:
- * 
- * For verbs: actorId#verbId
- * For actions: actorId#verbId#actionPos
- * 
- * If actorId == "DEFAULT_VERB" the ActionCallback is searched in the World default verbs.
- * If actorId == current scene ID the ActionCallback is searched in the current scene verbs.
- * 
- * @author rgarcia
- */
-public class ActionCallbackSerialization {
-	public static final String SEPARATION_SYMBOL = "#";
-
-	private static String find(ActionCallback cb, Verb v) {
-		String id = v.getId();
-
-		if (cb == v)
-			return id;
-
-		int pos = 0;
-
-		for (Action a : v.getActions()) {
-			if (cb == a) {
-				StringBuilder stringBuilder = new StringBuilder(id);
-				stringBuilder.append(SEPARATION_SYMBOL).append(pos);
-
-				return stringBuilder.toString();
-			}
-
-			pos++;
-		}
-
-		return null;
-	}
-
-	private static String find(ActionCallback cb, BaseActor a) {
-		if (a == null)
-			return null;
-
-		String id = a.getId();
-
-		for (Verb v : a.getVerbManager().getVerbs().values()) {
-			String result = find(cb, v);
-
-			if (result != null) {
-				StringBuilder stringBuilder = new StringBuilder(id);
-				stringBuilder.append(SEPARATION_SYMBOL).append(result);
-
-				return stringBuilder.toString();
-			}
-		}
-
-		return null;
-	}
-
-	private static String find(ActionCallback cb, Scene s) {
-		if (s == null)
-			return null;
-
-		String id = s.getId();
-
-		for (Verb v : s.getVerbManager().getVerbs().values()) {
-			String result = find(cb, v);
-
-			if (result != null) {
-				StringBuilder stringBuilder = new StringBuilder(id);
-				stringBuilder.append(SEPARATION_SYMBOL).append(result);
-
-				return stringBuilder.toString();
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Generates a String for serialization that allows locate the ActionCallback
-	 * 
-	 * @param cb The ActionCallback to serialize
-	 * @return The generated location string
-	 */
-	public static String find(ActionCallback cb) {
-		String id = null;
-
-		if (cb == null)
-			return null;
-
-		// search in scene verbs
-		Scene s = World.getInstance().getCurrentScene();
-
-		id = find(cb, s);
-
-		if (id != null)
-			return id;
-
-		id = find(cb, s.getPlayer());
-		if (id != null)
-			return id;
-
-		// search in actors
-		for (BaseActor a : s.getActors().values()) {
-			id = find(cb, a);
-			if (id != null)
-				return id;
-		}
-
-		// search in defaultVerbs
-		for (Verb v : VerbManager.getDefaultVerbs().values()) {
-			id = find(cb, v);
-			if (id != null) {
-				StringBuilder stringBuilder = new StringBuilder("DEFAULT_VERB");
-				stringBuilder.append(SEPARATION_SYMBOL).append(id);
-
-				return stringBuilder.toString();
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Searches for the ActionCallback represented by the id string.
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public static ActionCallback find(String id) {
-		Scene s = World.getInstance().getCurrentScene();
-
-		String[] split = id.split(SEPARATION_SYMBOL);
-
-		if (split.length < 2)
-			return null;
-
-		String actorId = split[0];
-		String verbId = split[1];
-		int actionPos = -1;
-
-		if (split.length > 2)
-			actionPos = Integer.parseInt(split[2]);
-
-		Verb v = null;
-
-		if (actorId.equals("DEFAULT_VERB")) {
-
-			v = VerbManager.getDefaultVerbs().get(verbId);
-		} else {
-
-			BaseActor a;
-
-			if (actorId.equals(s.getId())) {
-				v = s.getVerbManager().getVerbs().get(verbId);
-			} else {
-				a = s.getActor(actorId, true);
-
-				if (a == null)
-					return null;
-
-				v = a.getVerbManager().getVerbs().get(verbId);
-			}
-		}
-
-		if (v == null)
-			return null;
-
-		if (split.length == 2)
-			return v;
-
-		Action action = v.getActions().get(actionPos);
-
-		if (action instanceof ActionCallback)
-			return (ActionCallback) action;
-
-		return null;
-	}
-}
diff --git a/blade-engine/src/com/bladecoder/engine/util/ActionUtils.java b/blade-engine/src/com/bladecoder/engine/util/ActionUtils.java
new file mode 100644
index 000000000..32e78be75
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/util/ActionUtils.java
@@ -0,0 +1,384 @@
+package com.bladecoder.engine.util;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Json;
+import com.badlogic.gdx.utils.JsonValue;
+import com.badlogic.gdx.utils.SerializationException;
+import com.badlogic.gdx.utils.reflect.ReflectionException;
+import com.bladecoder.engine.actions.Action;
+import com.bladecoder.engine.actions.ActionDescription;
+import com.bladecoder.engine.actions.ActionFactory;
+import com.bladecoder.engine.actions.ActionProperty;
+import com.bladecoder.engine.actions.ActionPropertyDescription;
+import com.bladecoder.engine.actions.ActorAnimationRef;
+import com.bladecoder.engine.actions.Param;
+import com.bladecoder.engine.actions.Param.Type;
+import com.bladecoder.engine.actions.SceneActorRef;
+import com.bladecoder.engine.model.World;
+
+public class ActionUtils {
+	public static String getInfo(Class<?> clazz) {
+		return clazz.getAnnotation(ActionDescription.class).value();
+	}
+
+	public static boolean isDeprecated(Class<?> clazz) {
+		return clazz.getAnnotation(Deprecated.class) != null;
+	}
+
+	public static String getName(Class<?> clazz) {
+		String name = clazz.getAnnotation(ActionDescription.class).name();
+
+		if ("".equals(name)) {
+			name = clazz.getSimpleName();
+
+			if (name.endsWith("Action")) {
+				name = name.substring(0, name.length() - 6);
+			}
+		}
+
+		return name;
+	}
+
+	public static Param[] getParams(Action action) {
+		List<Param> params = new ArrayList<>();
+		Class<?> clazz = action.getClass();
+		while (clazz != null && clazz != Object.class) {
+			for (Field field : clazz.getDeclaredFields()) {
+				final ActionProperty property = field.getAnnotation(ActionProperty.class);
+				if (property == null) {
+					continue;
+				}
+
+				final ActionPropertyDescription propertyDescription = field
+						.getAnnotation(ActionPropertyDescription.class);
+
+				// properties without description are not editables but will be
+				// saved in the model.
+				if (propertyDescription == null)
+					continue;
+
+				final String name = field.getName();
+				Param.Type type = property.type();
+
+				Enum<?>[] options = null;
+
+				if (field.getType().isEnum()) {
+					final boolean accessible = field.isAccessible();
+					field.setAccessible(true);
+					options = (Enum[]) field.getType().getEnumConstants();
+					field.setAccessible(accessible);
+
+					type = Param.Type.OPTION;
+				} else if (property.type() == Param.Type.NOT_SET) {
+					type = getType(field);
+				}
+
+				params.add(new Param(name, propertyDescription != null ? propertyDescription.value() : "", type,
+						property.required(), property.defaultValue(), options));
+			}
+			clazz = clazz.getSuperclass();
+		}
+		return params.toArray(new Param[params.size()]);
+	}
+
+	public static String[] getFieldNames(Action a) {
+		List<String> result = new ArrayList<>();
+		Class<?> clazz = a.getClass();
+		while (clazz != null && clazz != Object.class) {
+			for (Field field : clazz.getDeclaredFields()) {
+				final ActionProperty property = field.getAnnotation(ActionProperty.class);
+				if (property == null) {
+					continue;
+				}
+
+				final String name = field.getName();
+				result.add(name);
+			}
+			clazz = clazz.getSuperclass();
+		}
+		return result.toArray(new String[result.size()]);
+	}
+
+	private static Type getType(Field field) {
+		if (field.getType().isAssignableFrom(String.class)) {
+			return Param.Type.STRING;
+		} else if (field.getType().isAssignableFrom(boolean.class)) {
+			return Param.Type.BOOLEAN;
+		} else if (field.getType().isAssignableFrom(Boolean.class)) {
+			return Param.Type.BOOLEAN;
+		} else if (field.getType().isAssignableFrom(float.class)) {
+			return Param.Type.FLOAT;
+		} else if (field.getType().isAssignableFrom(Float.class)) {
+			return Param.Type.FLOAT;
+		} else if (field.getType().isAssignableFrom(int.class)) {
+			return Param.Type.INTEGER;
+		} else if (field.getType().isAssignableFrom(Vector2.class)) {
+			return Param.Type.VECTOR2;
+		} else if (field.getType().isAssignableFrom(SceneActorRef.class)) {
+			return Param.Type.SCENE_ACTOR;
+		} else if (field.getType().isAssignableFrom(ActorAnimationRef.class)) {
+			return Param.Type.ACTOR_ANIMATION;
+		} else if (field.getType().isAssignableFrom(Color.class)) {
+			return Param.Type.COLOR;
+		} else if (field.getType().isEnum()) {
+			return Param.Type.OPTION;
+		} else {
+			EngineLogger.error("ACTION FIELD TYPE NOT SUPPORTED -  type: " + field.getType());
+		}
+
+		return Param.Type.NOT_SET;
+	}
+
+	@SuppressWarnings("unchecked")
+	public static void setParam(Action action, String param, String value)
+			throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
+		Class<?> clazz = action.getClass();
+
+		Field field = getField(clazz, param);
+
+		if (field == null)
+			throw new NoSuchFieldException(param);
+
+		final boolean accessible = field.isAccessible();
+		field.setAccessible(true);
+
+		if (field.getType().isAssignableFrom(String.class)) {
+			field.set(action, value);
+		} else if (field.getType().isAssignableFrom(boolean.class)) {
+			field.setBoolean(action, Boolean.parseBoolean(value));
+		} else if (field.getType().isAssignableFrom(Boolean.class)) {
+			Boolean b = null;
+
+			if (value != null)
+				b = Boolean.valueOf(value);
+
+			field.set(action, b);
+		} else if (field.getType().isAssignableFrom(float.class)) {
+			try {
+				field.setFloat(action, Float.parseFloat(value));
+			} catch (NumberFormatException ignored) {
+			}
+		} else if (field.getType().isAssignableFrom(Float.class)) {
+			try {
+				Float f = null;
+
+				if (value != null)
+					f = Float.valueOf(value);
+
+				field.set(action, f);
+			} catch (NumberFormatException ignored) {
+			}
+		} else if (field.getType().isAssignableFrom(int.class)) {
+			try {
+				Integer i = null;
+
+				if (value != null) {
+					i = Integer.parseInt(value);
+					field.setInt(action, i);
+				}
+			} catch (NumberFormatException ignored) {
+			}
+		} else if (field.getType().isAssignableFrom(Integer.class)) {
+			try {
+				Float f = null;
+
+				if (value != null)
+					f = Float.valueOf(value);
+
+				field.set(action, f);
+			} catch (NumberFormatException ignored) {
+			}
+		} else if (field.getType().isAssignableFrom(Vector2.class)) {
+			field.set(action, Param.parseVector2(value));
+		} else if (field.getType().isAssignableFrom(SceneActorRef.class)) {
+			if (value == null)
+				field.set(action, null);
+			else
+				field.set(action, new SceneActorRef(value));
+		} else if (field.getType().isAssignableFrom(ActorAnimationRef.class)) {
+			if (value == null)
+				field.set(action, null);
+			else
+				field.set(action, new ActorAnimationRef(value));
+		} else if (field.getType().isAssignableFrom(Color.class)) {
+			Color a = Param.parseColor(value);
+
+			field.set(action, a);
+		} else if (field.getType().isEnum()) {
+			field.set(action, Enum.valueOf(field.getType().asSubclass(Enum.class), value.toUpperCase(Locale.ENGLISH)));
+		} else {
+			EngineLogger.error("ACTION FIELD TYPE NOT SUPPORTED -  type: " + field.getType());
+		}
+
+		field.setAccessible(accessible);
+	}
+
+	public static String getStringValue(Action a, String param)
+			throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
+		String result = null;
+
+		Class<?> clazz = a.getClass();
+
+		Field field = getField(clazz, param);
+
+		if (field == null)
+			throw new NoSuchFieldException(param);
+
+		final boolean accessible = field.isAccessible();
+		field.setAccessible(true);
+
+		if (field.getType().isAssignableFrom(String.class)) {
+			result = (String) field.get(a);
+		} else if (field.getType().isAssignableFrom(boolean.class)) {
+			result = Boolean.toString(field.getBoolean(a));
+		} else if (field.getType().isAssignableFrom(Boolean.class)) {
+			Object o = field.get(a);
+
+			if (o != null)
+				result = o.toString();
+		} else if (field.getType().isAssignableFrom(float.class)) {
+			result = Float.toString(field.getFloat(a));
+		} else if (field.getType().isAssignableFrom(Float.class)) {
+			Object o = field.get(a);
+
+			if (o != null)
+				result = o.toString();
+		} else if (field.getType().isAssignableFrom(int.class)) {
+			result = Integer.toString(field.getInt(a));
+		} else if (field.getType().isAssignableFrom(Vector2.class)) {
+			result = Param.toStringParam((Vector2) field.get(a));
+		} else if (field.getType().isAssignableFrom(SceneActorRef.class)) {
+			Object o = field.get(a);
+
+			if (o != null)
+				result = o.toString();
+		} else if (field.getType().isAssignableFrom(ActorAnimationRef.class)) {
+			Object o = field.get(a);
+
+			if (o != null)
+				result = o.toString();
+		} else if (field.getType().isAssignableFrom(Color.class)) {
+			Object o = field.get(a);
+
+			if (o != null)
+				result = o.toString();
+		} else if (field.getType().isEnum()) {
+			Object o = field.get(a);
+
+			if (o != null)
+				result = ((Enum<?>) o).name();
+		} else {
+			EngineLogger.error("ACTION FIELD TYPE NOT SUPPORTED -  type: " + field.getType());
+		}
+
+		field.setAccessible(accessible);
+
+		return result;
+	}
+
+	public static Field getField(Class<?> clazz, String fieldName) {
+		Class<?> current = clazz;
+
+		do {
+			try {
+				return current.getDeclaredField(fieldName);
+			} catch (NoSuchFieldException e) {
+			}
+		} while ((current = current.getSuperclass()) != null);
+
+		return null;
+	}
+
+	public static void writeJson(Action a, Json json) {
+		Class<?> clazz = a.getClass();
+		json.writeObjectStart(clazz, null);
+		while (clazz != null && clazz != Object.class) {
+			for (Field field : clazz.getDeclaredFields()) {
+				final ActionProperty property = field.getAnnotation(ActionProperty.class);
+				if (property == null) {
+					continue;
+				}
+
+				// json.writeField(a, field.getName());
+				final boolean accessible = field.isAccessible();
+				field.setAccessible(true);
+
+				try {
+					Object o = field.get(a);
+
+					// doesn't write null fields
+					if (o == null)
+						continue;
+
+					if (o instanceof SceneActorRef) {
+						SceneActorRef sceneActor = (SceneActorRef) o;
+						json.writeValue(field.getName(), sceneActor.toString());
+					} else if (o instanceof ActorAnimationRef) {
+						ActorAnimationRef aa = (ActorAnimationRef) o;
+						json.writeValue(field.getName(), aa.toString());
+					} else if (o instanceof Color) {
+						json.writeValue(field.getName(), ((Color) o).toString());
+					} else if (o instanceof Vector2) {
+						json.writeValue(field.getName(), Param.toStringParam((Vector2) o));
+					} else {
+						json.writeValue(field.getName(), o);
+					}
+				} catch (IllegalArgumentException | IllegalAccessException e) {
+
+				}
+
+				field.setAccessible(accessible);
+			}
+			clazz = clazz.getSuperclass();
+		}
+		json.writeObjectEnd();
+	}
+
+	public static Action readJson(World w, Json json, JsonValue jsonData) {
+		String className = jsonData.getString("class", null);
+
+		Action action = null;
+		if (className != null) {
+			jsonData.remove("class");
+
+			try {
+				action = ActionFactory.create(className, null);
+			} catch (ClassNotFoundException | ReflectionException e1) {
+				throw new SerializationException(e1);
+			}
+
+			for (int j = 0; j < jsonData.size; j++) {
+				JsonValue v = jsonData.get(j);
+				try {
+					if (v.isNull())
+						ActionUtils.setParam(action, v.name, null);
+					else
+						ActionUtils.setParam(action, v.name, v.asString());
+				} catch (NoSuchFieldException e) {
+					EngineLogger.error("Action field not found - class: " + className + " field: " + v.name);
+				} catch (IllegalArgumentException | IllegalAccessException e) {
+					EngineLogger.error("Action field error - class: " + className + " field: " + v.name + " value: "
+							+ (v == null ? "null" : v.asString()));
+				}
+			}
+
+			action.init(w);
+		}
+
+		return action;
+	}
+
+	/**
+	 * Utility method to compare two Strings allowing null values.
+	 */
+	public static boolean compareNullStr(String str1, String str2) {
+		return (str1 == null ? str2 == null : str1.equals(str2));
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/util/Config.java b/blade-engine/src/com/bladecoder/engine/util/Config.java
index e070cc10e..d6e712a35 100644
--- a/blade-engine/src/com/bladecoder/engine/util/Config.java
+++ b/blade-engine/src/com/bladecoder/engine/util/Config.java
@@ -15,65 +15,116 @@
  ******************************************************************************/
 package com.bladecoder.engine.util;
 
+import java.io.IOException;
 import java.util.Properties;
 
-import com.bladecoder.engine.util.EngineLogger;
-
+import com.badlogic.gdx.files.FileHandle;
 import com.bladecoder.engine.assets.EngineAssetManager;
 
-public class Config {
-	public static final String PIE_MODE_DESKTOP_PROP="pie_mode.desktop";
-	public static final String INVENTORY_POS_PROP="inventory_pos";
-	public static final String TITLE_PROP="title";
-	public static final String LOAD_GAMESTATE_PROP="load_gamestate";
-	public static final String PLAY_RECORD_PROP="play_recording";
-	public static final String TEST_SCENE_PROP="test_scene";
+public final class Config {
+	public static final String INVENTORY_POS_PROP = "inventory_pos";
+	public static final String INVENTORY_AUTOSIZE_PROP = "inventory_autosize";
+	public static final String SINGLE_ACTION_INVENTORY = "single_action_inventory";
+	public static final String TITLE_PROP = "title";
+	public static final String LOAD_GAMESTATE_PROP = "load_gamestate";
+	public static final String PLAY_RECORD_PROP = "play_recording";
+	public static final String TEST_SCENE_PROP = "test_scene";
 	public static final String FORCE_RES_PROP = "force_res";
 	public static final String DEBUG_PROP = "debug";
 	public static final String CHAPTER_PROP = "chapter";
 	public static final String SHOW_DESC_PROP = "show_desc";
-	public static final String MENU_SCREEN_CLASS_PROP = "menu_screen";
-	public static final String HELP_SCREEN_CLASS_PROP = "help_screen";
-	public static final String CREDIT_SCREEN_CLASS_PROP = "credit_screen";
-	public static final String INIT_SCREEN_CLASS_PROP = "init_screen";
-	
+	public static final String EXTEND_VIEWPORT_PROP = "extend_viewport";
+	public static final String VERSION_PROP = "version";
+	public static final String BLADE_ENGINE_VERSION_PROP = "bladeEngineVersion";
+	public static final String CHARACTER_ICON_ATLAS = "character_icon_atlas";
+	public static final String UI_MODE = "ui_mode";
+	public static final String FAST_LEAVE = "fast_leave";
+	public static final String AUTO_HIDE_TEXTS = "auto_hide_texts";
+	public static final String RESOLUTIONS = "resolutions";
+	public static final String SHOW_HOTSPOTS = "show_hotspots";
+
 	public static final String PROPERTIES_FILENAME = "BladeEngine.properties";
+	public static final String PREFS_FILENAME = "prefs.properties";
+
+	private static Config instance;
+
+	private final Properties config = new Properties();
+	private final Properties prefs = new Properties();
+
+	private Config() {
+		load();
+	}
+
+	public static final Config getInstance() {
+		if (instance == null) {
+			instance = new Config();
+		}
+
+		return instance;
+	}
+
+	public String getProperty(String key, String defaultValue) {
+		return config.getProperty(key, defaultValue);
+	}
+
+	public void load() {
+		config.clear();
+
+		try {
+			config.load(EngineAssetManager.getInstance().getAsset(PROPERTIES_FILENAME).reader());
+		} catch (Exception e) {
+			EngineLogger.error("ERROR LOADING " + PROPERTIES_FILENAME + " :" + e.getMessage());
+			return;
+		}
+
+		EngineAssetManager.getInstance()
+				.setUserFolder("." + getProperty(Config.TITLE_PROP, "BladeEngine").replace(" ", ""));
+		FileHandle prefsFile = EngineAssetManager.getInstance().getUserFile(PREFS_FILENAME);
 
-	private static Properties config = null;
-	
-	public static String getProperty(String key, String defaultValue) {
-		if(config == null) {
-			config = new Properties();
-			
+		if (prefsFile.exists()) {
 			try {
-				config.load(EngineAssetManager.getInstance().getAsset(PROPERTIES_FILENAME).reader());
-			} catch (Exception e) {
-				EngineLogger.error("ERROR LOADING PROPERTIES: " + e.getMessage());
+				prefs.load(prefsFile.reader());
+			} catch (IOException e) {
+				EngineLogger.error("ERROR LOADING PREFERENCES " + PREFS_FILENAME + ": " + e.getMessage());
 			}
 		}
-		
-		return config.getProperty(key, defaultValue);
 	}
-	
-	public static boolean getProperty(String key, boolean defaultValue) {
+
+	public boolean getProperty(String key, boolean defaultValue) {
 		boolean result = false;
-		
+
 		try {
 			result = Boolean.parseBoolean(getProperty(key, String.valueOf(defaultValue)));
 		} catch (Exception e) {
 		}
-		
+
 		return result;
 	}
-	
-	public static int getProperty(String key, int defaultValue) {
+
+	public int getProperty(String key, int defaultValue) {
 		int result = 0;
-		
+
 		try {
 			result = Integer.parseInt(getProperty(key, String.valueOf(defaultValue)));
 		} catch (Exception e) {
 		}
-		
+
 		return result;
 	}
+
+	public String getPref(String name, String defaultValue) {
+		return prefs.getProperty(name, defaultValue);
+	}
+
+	public void setPref(String name, String value) {
+		prefs.setProperty(name, value);
+	}
+
+	public void savePrefs() {
+		try {
+			prefs.store(EngineAssetManager.getInstance().getUserFile(PREFS_FILENAME).writer(false), null);
+		} catch (IOException e) {
+			EngineLogger.error("ERROR SAVING PREFERENCES: " + e.getMessage());
+		}
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/util/DPIUtils.java b/blade-engine/src/com/bladecoder/engine/util/DPIUtils.java
index 6b00bed58..b36165532 100644
--- a/blade-engine/src/com/bladecoder/engine/util/DPIUtils.java
+++ b/blade-engine/src/com/bladecoder/engine/util/DPIUtils.java
@@ -4,54 +4,56 @@
 
 public class DPIUtils {
 	public final static float BASE_DPI = 160.0f;
-	
+
 	/**
 	 * Current DPI
 	 */
-	public final static float DPI = BASE_DPI * Gdx.graphics.getDensity();
+	public final static float DPI = BASE_DPI * getLogicalDensity();
 
 	/**
 	 * The Google recommendations are 48 dp -> 9mm for touchable elements
 	 */
-	public final static float TOUCH_MIN_SIZE = 48 * Gdx.graphics.getDensity();
+	public final static float TOUCH_MIN_SIZE = 48 * getLogicalDensity();
 
 	/**
 	 * The Google recommendations of space between UI objects is 8 dp
 	 */
-	public final static float UI_SPACE = 8 * Gdx.graphics.getDensity();
+	public final static float UI_SPACE = 8 * getLogicalDensity();
 
 	/**
 	 * The Google recommendations of space from bottom or top is 16 dp
 	 */
-	public final static float MARGIN_SIZE = 16 * Gdx.graphics.getDensity();
+	public final static float MARGIN_SIZE = 16 * getLogicalDensity();
 
 	/**
 	 * The Google recommendations are 56 dp for action buttons
 	 */
-	public final static float BUTTON_SIZE = 56 * Gdx.graphics.getDensity();
-	
+	public final static float BUTTON_SIZE = 56 * getLogicalDensity();
+
 	/**
 	 * The Google recommendations are 24 dp for icons inside action buttons
 	 */
-	public final static float ICON_SIZE = 24 * Gdx.graphics.getDensity();
+	public final static float ICON_SIZE = 24 * getLogicalDensity();
 
-	
 	/**
 	 * The Google recommendations are 8 dp for space between ui elements
 	 */
-	public final static float SPACING = 8 * Gdx.graphics.getDensity();
+	public final static float SPACING = 8 * getLogicalDensity();
 
 	/**
 	 * The screen height in DP
 	 */
-	public final static float SCREEN_HEIGHT_DP = Gdx.graphics.getHeight()
-			/ Gdx.graphics.getDensity();
+	public final static float SCREEN_HEIGHT_DP = Gdx.graphics.getHeight() / getLogicalDensity();
 
 	public final static float NORMAL_MULTIPLIER = 1.0f; // 3-5"
 	public final static float LARGE_MULTIPLIER = 1.5f; // 5-7"
 	public final static float XLARGE_MULTIPLIER = 2f; // 8-10"
 	public final static float XXLARGE_MULTIPLIER = 2.5f; // > 10"
 
+	public static final float getLogicalDensity() {
+		return Gdx.graphics.getDensity() / Gdx.graphics.getBackBufferScale();
+	}
+
 	/**
 	 * Calcs the button size based in screen size
 	 *
@@ -60,7 +62,7 @@ public class DPIUtils {
 	public static float getPrefButtonSize() {
 		return getSizeMultiplier() * BUTTON_SIZE;
 	}
-	
+
 	/**
 	 * Calcs the minimum size based in screen size
 	 *
@@ -69,7 +71,7 @@ public static float getPrefButtonSize() {
 	public static float getTouchMinSize() {
 		return getSizeMultiplier() * TOUCH_MIN_SIZE;
 	}
-	
+
 	/**
 	 * Calcs the margin size based in screen size
 	 *
@@ -78,7 +80,7 @@ public static float getTouchMinSize() {
 	public static float getMarginSize() {
 		return getSizeMultiplier() * MARGIN_SIZE;
 	}
-	
+
 	/**
 	 * Calcs the space between ui elements based in screen size
 	 *
@@ -103,7 +105,7 @@ public static float getSpacing() {
 //		return NORMAL_MULTIPLIER;
 //
 //	}
-	
+
 	public static float getSizeMultiplier() {
 		float inches = pixelsToInches(Gdx.graphics.getWidth());
 		float s = inches / 6f;
@@ -113,17 +115,17 @@ public static float getSizeMultiplier() {
 	}
 
 	public static int dpToPixels(int dp) {
-		return (int) (dp * Gdx.graphics.getDensity());
+		return (int) (dp * getLogicalDensity());
 	}
-	
+
 	public static int pixelsToDP(int pixels) {
-		return (int) (pixels / Gdx.graphics.getDensity());
+		return (int) (pixels / getLogicalDensity());
 	}
-	
+
 	public static float pixelsToInches(int pixels) {
-		return (float)pixels / DPI;
+		return pixels / DPI;
 	}
-	
+
 	public static float ptToPixels(float pts) {
 		return pts * 72 / DPI;
 	}
diff --git a/blade-engine/src/com/bladecoder/engine/util/EngineLogger.java b/blade-engine/src/com/bladecoder/engine/util/EngineLogger.java
index 6b50c2b05..8242cd3a9 100644
--- a/blade-engine/src/com/bladecoder/engine/util/EngineLogger.java
+++ b/blade-engine/src/com/bladecoder/engine/util/EngineLogger.java
@@ -15,31 +15,62 @@
  ******************************************************************************/
 package com.bladecoder.engine.util;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+
 import com.badlogic.gdx.Application;
 import com.badlogic.gdx.Gdx;
 
 public class EngineLogger {
 	private static String TAG = "ENGINE";
 	private static int level = Application.LOG_ERROR;
+	private static final int MAX_BUFFER_SIZE = 512 * 1024;
 
 	public static final int DEBUG0 = 0;
 	public static final int DEBUG1 = 1;
-	public static final int DEBUG2 = 2;
 
 	public static int debugLevel = DEBUG0;
 
+	public static String lastError = null;
+	public static Exception lastException = null;
+	public static StringBuilder errorBuffer = new StringBuilder();
+
 	public static void debug(String message) {
 		Gdx.app.debug(TAG, message);
 	}
 
 	public static void error(String message) {
-		if(message != null)
+		if (message != null) {
 			Gdx.app.error(TAG, message);
+			lastError = message;
+			lastException = null;
+
+			if (errorBuffer.length() > MAX_BUFFER_SIZE) {
+				errorBuffer.setLength(0);
+			}
+
+			errorBuffer.append(message + "\n");
+		}
 	}
 
 	public static void error(String message, Exception e) {
-		if(message != null && e != null)
+		error(message);
+
+		if (e != null) {
 			Gdx.app.error(TAG, message, e);
+			lastException = e;
+
+			if (errorBuffer.length() > MAX_BUFFER_SIZE) {
+				errorBuffer.setLength(0);
+			}
+
+			// print stack trace to buffer
+			Writer result = new StringWriter();
+			PrintWriter printWriter = new PrintWriter(result);
+			e.printStackTrace(printWriter);
+			errorBuffer.append(result.toString());
+		}
 	}
 
 	public static void toggle() {
@@ -65,7 +96,7 @@ public static int getDebugLevel() {
 	public static void setDebugLevel(int level) {
 		debugLevel = level;
 	}
-	
+
 	public static void setDebug() {
 		level = Application.LOG_DEBUG;
 
diff --git a/blade-engine/src/com/bladecoder/engine/util/FileUtils.java b/blade-engine/src/com/bladecoder/engine/util/FileUtils.java
index 76663f9b9..0d931ea0b 100644
--- a/blade-engine/src/com/bladecoder/engine/util/FileUtils.java
+++ b/blade-engine/src/com/bladecoder/engine/util/FileUtils.java
@@ -1,7 +1,7 @@
 package com.bladecoder.engine.util;
 
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Application.ApplicationType;
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 
 public class FileUtils {
diff --git a/blade-engine/src/com/bladecoder/engine/util/I18NControl.java b/blade-engine/src/com/bladecoder/engine/util/I18NControl.java
deleted file mode 100644
index 7b4b719e6..000000000
--- a/blade-engine/src/com/bladecoder/engine/util/I18NControl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Locale;
-import java.util.PropertyResourceBundle;
-import java.util.ResourceBundle;
-import java.util.ResourceBundle.Control;
-
-import com.bladecoder.engine.util.FileUtils;
-
-import com.badlogic.gdx.files.FileHandle;
-import com.bladecoder.engine.assets.EngineAssetManager;
-
-public class I18NControl extends Control {
-
-	String encoding;
-
-	public I18NControl(String encoding) {
-		this.encoding = encoding;
-	}
-
-	@Override
-	public ResourceBundle newBundle(String baseName, Locale locale, String format,
-			ClassLoader loader, boolean reload) throws IllegalAccessException,
-			InstantiationException, IOException {
-		String bundleName = toBundleName(baseName, locale);
-		String resourceName = toResourceName(bundleName, "properties");
-		ResourceBundle bundle = null;
-		InputStream inputStream = null;
-
-		FileHandle fileHandle = EngineAssetManager.getInstance().getAsset(resourceName);
-
-		if (FileUtils.exists(fileHandle)) {
-			try {
-				// inputStream = loader.getResourceAsStream(resourceName);
-				inputStream = fileHandle.read();
-				bundle = new PropertyResourceBundle(new InputStreamReader(inputStream, encoding));
-			} finally {
-				if (inputStream != null)
-					inputStream.close();
-			}
-		}
-		return bundle;
-	}
-
-}
diff --git a/blade-engine/src/com/bladecoder/engine/util/InterpolationMode.java b/blade-engine/src/com/bladecoder/engine/util/InterpolationMode.java
new file mode 100644
index 000000000..665dab7aa
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/util/InterpolationMode.java
@@ -0,0 +1,67 @@
+package com.bladecoder.engine.util;
+
+import com.badlogic.gdx.math.Interpolation;
+
+/**
+ * Visual graphics and explanation:  https://github.com/libgdx/libgdx/wiki/Interpolation
+ *
+ * @author rgarcia
+ */
+public enum InterpolationMode {
+	LINEAR(Interpolation.linear),
+	FADE(Interpolation.fade),
+	
+	POW2(Interpolation.pow2),
+	POW2IN(Interpolation.pow2In),
+	POW2OUT(Interpolation.pow2Out),
+	POW2ININVERSE(Interpolation.pow2InInverse),
+	POW2OUTINVERSE(Interpolation.pow2OutInverse),
+	
+	POW3(Interpolation.pow3),
+	POW3IN(Interpolation.pow3In),
+	POW3OUT(Interpolation.pow3Out),
+	POW3ININVERSE(Interpolation.pow3InInverse),
+	POW3OUTINVERSE(Interpolation.pow3OutInverse),	
+	
+	POW4(Interpolation.pow4),
+	POW4IN(Interpolation.pow4In),
+	POW4OUT(Interpolation.pow4Out),
+	
+	POW5(Interpolation.pow5),
+	POW5IN(Interpolation.pow5In),
+	POW5OUT(Interpolation.pow5Out),
+	
+	SINE(Interpolation.sine),
+	SINEIN(Interpolation.sineIn),
+	SINEOUT(Interpolation.sineOut),
+	
+	EXP10(Interpolation.exp10),
+	EXP10EIN(Interpolation.exp10In),
+	EXP10OUT(Interpolation.exp10Out),
+	
+	CIRCLE(Interpolation.circle),
+	CIRCLEIN(Interpolation.circleIn),
+	CIRCLEOUT(Interpolation.circleOut),
+	
+	ELASTIC(Interpolation.elastic),
+	ELASTICIN(Interpolation.elasticIn),
+	ELASTICOUT(Interpolation.elasticOut),
+	
+	SWING(Interpolation.swing),
+	SWINGIN(Interpolation.swingIn),
+	SWINGOUT(Interpolation.swingOut),
+	
+	BOUNCE(Interpolation.bounce),
+	BOUNCEIN(Interpolation.bounceIn),
+	BOUNCEOUT(Interpolation.bounceOut);
+
+	private final Interpolation interpolation;
+
+	InterpolationMode(Interpolation interpolation) {
+		this.interpolation = interpolation;
+	}
+
+	public Interpolation getInterpolation() {
+		return interpolation;
+	}
+}
diff --git a/blade-engine/src/com/bladecoder/engine/util/MultiFontBitmapFontData.java b/blade-engine/src/com/bladecoder/engine/util/MultiFontBitmapFontData.java
new file mode 100644
index 000000000..4ba9865ce
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/util/MultiFontBitmapFontData.java
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.util;
+
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.Pixmap;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.PixmapPacker;
+import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class MultiFontBitmapFontData extends FreeTypeFontGenerator.FreeTypeBitmapFontData {
+
+    private final List<FreeTypeFontGenerator.FreeTypeBitmapFontData> fallBackBitmapFontData = new ArrayList<>();
+    private final List<FreeTypeFontGenerator> fallbackFontGenerators = new ArrayList<>();
+    private PixmapPacker packer;
+
+    public void addFallBackFont(FileHandle fontFile, FreeTypeFontGenerator.FreeTypeFontParameter parameter) {
+        FreeTypeFontGenerator.FreeTypeBitmapFontData fallbackData = new FreeTypeFontGenerator.FreeTypeBitmapFontData();
+        fallbackData.regions = regions;
+        parameter.packer = packer;
+
+        FreeTypeFontGenerator fallbackGen = new FreeTypeFontGenerator(fontFile);
+        fallbackFontGenerators.add(fallbackGen);
+        fallBackBitmapFontData.add(fallbackGen.generateData(parameter, fallbackData));
+    }
+
+    public void createPacker(FreeTypeFontGenerator.FreeTypeFontParameter parameter) {
+        int maxTextureSize = 1024;
+
+        int size;
+        PixmapPacker.PackStrategy packStrategy;
+
+        size = maxTextureSize;
+        packStrategy = new PixmapPacker.GuillotineStrategy();
+
+        PixmapPacker packer = new PixmapPacker(size, size, Pixmap.Format.RGBA8888, 1, false, packStrategy);
+        packer.setTransparentColor(parameter.color);
+        packer.getTransparentColor().a = 0;
+        if (parameter.borderWidth > 0) {
+            packer.setTransparentColor(parameter.borderColor);
+            packer.getTransparentColor().a = 0;
+        }
+
+        this.packer = packer;
+        parameter.packer = packer;
+    }
+
+    @Override
+    public BitmapFont.Glyph getGlyph(char ch) {
+        BitmapFont.Glyph glyph = super.getGlyph(ch);
+
+        if (glyph == null && fallBackBitmapFontData != null) {
+            for (FreeTypeFontGenerator.FreeTypeBitmapFontData data : fallBackBitmapFontData) {
+                glyph = data.getGlyph(ch);
+                if (glyph != null) {
+                    return glyph;
+                }
+            }
+        }
+
+        return glyph;
+    }
+
+    @Override
+    public void dispose() {
+        super.dispose();
+        packer.dispose();
+
+        for (FreeTypeFontGenerator.FreeTypeBitmapFontData data : fallBackBitmapFontData) {
+            data.dispose();
+        }
+
+        for (FreeTypeFontGenerator gen : fallbackFontGenerators) {
+            gen.dispose();
+        }
+    }
+}
diff --git a/blade-engine/src/com/bladecoder/engine/util/PolygonUtils.java b/blade-engine/src/com/bladecoder/engine/util/PolygonUtils.java
index b62ad2b1f..7e5266ecc 100644
--- a/blade-engine/src/com/bladecoder/engine/util/PolygonUtils.java
+++ b/blade-engine/src/com/bladecoder/engine/util/PolygonUtils.java
@@ -15,8 +15,7 @@
  ******************************************************************************/
 package com.bladecoder.engine.util;
 
-import com.bladecoder.engine.util.PolygonUtils;
-
+import com.badlogic.gdx.math.GeometryUtils;
 import com.badlogic.gdx.math.Intersector;
 import com.badlogic.gdx.math.Polygon;
 import com.badlogic.gdx.math.Vector2;
@@ -125,6 +124,29 @@ public static int getClampedPoint(Polygon poly, float x, float y,
 				dest.set(tmp);
 			}
 		}
+		
+		// ERROR CONTROL:
+		// If the clamped point is not in the walkzone 
+		// we search for the nearest walkzone vertex
+		if (!PolygonUtils.isPointInside(poly, dest.x, dest.y, true)) {
+			EngineLogger.debug("> PolygonalPathFinder: CLAMPED FAILED!!");
+			
+			tmp.set(verts[0], verts[1]);
+			d = Vector2.dst(x, y, tmp.x, tmp.y);
+			nearest = 0;
+			dest.set(tmp);
+			
+			for (int i = 2; i < verts.length; i += 2) {
+				tmp.set(verts[i], verts[i + 1]);
+				dTmp = Vector2.dst(x, y, tmp.x, tmp.y);
+
+				if (dTmp < d) {
+					d = dTmp;
+					nearest = i;
+					dest.set(tmp);
+				}
+			}
+		}
 
 		return nearest;
 	}
@@ -233,7 +255,7 @@ public static boolean inLineOfSight(Vector2 p1, Vector2 p2, Polygon polygon, boo
 		return obstacle?!result:result;
 	}
 
-	private static float TOLERANCE_LINE_SEGMENTS_CROSS = 0.1f;
+	private static float TOLERANCE_LINE_SEGMENTS_CROSS = 0.01f;
 	
 	public static boolean lineSegmentsCross(float ax, float ay, float bx,
 			float by, float cx, float cy, float dx, float dy) {
@@ -256,4 +278,18 @@ public static boolean lineSegmentsCross(float ax, float ay, float bx,
 
 		return (r > TOLERANCE_LINE_SEGMENTS_CROSS && r < 1 - TOLERANCE_LINE_SEGMENTS_CROSS) && (s > TOLERANCE_LINE_SEGMENTS_CROSS && s < 1 - TOLERANCE_LINE_SEGMENTS_CROSS);
 	}
+	
+	static public void ensureClockWise (float[] polygon, int offset, int count) {
+		if (GeometryUtils.isClockwise(polygon, offset, count)) return;
+		int lastX = offset + count - 2;
+		for (int i = offset, n = offset + count / 2; i < n; i += 2) {
+			int other = lastX - i;
+			float x = polygon[i];
+			float y = polygon[i + 1];
+			polygon[i] = polygon[other];
+			polygon[i + 1] = polygon[other + 1];
+			polygon[other] = x;
+			polygon[other + 1] = y;
+		}
+	}
 }
diff --git a/blade-engine/src/com/bladecoder/engine/util/RectangleRenderer.java b/blade-engine/src/com/bladecoder/engine/util/RectangleRenderer.java
index 8ba69d6e9..ed4d43bed 100644
--- a/blade-engine/src/com/bladecoder/engine/util/RectangleRenderer.java
+++ b/blade-engine/src/com/bladecoder/engine/util/RectangleRenderer.java
@@ -26,28 +26,28 @@ public final class RectangleRenderer {
 	private static Texture makePixel() {
 		Texture _temp;
 		Pixmap p = new Pixmap(1, 1, Pixmap.Format.RGBA8888);
-		p.setColor(new Color(1, 1, 1, 1));
+		p.setColor(Color.WHITE);
 		p.fillRectangle(0, 0, 1, 1);
 		_temp = new Texture(p, true);
 		p.dispose();
 		return _temp;
 	}
 
-	public static void draw(Batch batch, float posX, float posY,
-			float width, float height, Color color) {
-		
-		if(texture == null) texture = makePixel();
-		
-		Color tmp = batch.getColor();
+	public static void draw(Batch batch, float posX, float posY, float width, float height, Color color) {
+
+		if (texture == null)
+			texture = makePixel();
+
+		float tmp = batch.getPackedColor();
 		batch.setColor(color);
-		batch.draw(texture, posX, posY, 0,
-				0, width, height, 1, 1, 0, 0, 0, 1, 1, false, false);
-		
-		batch.setColor(tmp);
+		batch.draw(texture, posX, posY, 0, 0, width, height, 1, 1, 0, 0, 0, 1, 1, false, false);
+
+		batch.setPackedColor(tmp);
 	}
-	
+
 	public static void dispose() {
-		if(texture!=null) texture.dispose();
+		if (texture != null)
+			texture.dispose();
 		texture = null;
 	}
 
diff --git a/blade-engine/src/com/bladecoder/engine/util/TextUtils.java b/blade-engine/src/com/bladecoder/engine/util/TextUtils.java
deleted file mode 100644
index 594f586d9..000000000
--- a/blade-engine/src/com/bladecoder/engine/util/TextUtils.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.util;
-
-import com.bladecoder.engine.util.DPIUtils;
-
-import com.badlogic.gdx.graphics.g2d.BitmapFont;
-import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
-import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
-import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.math.Vector2;
-
-public class TextUtils {
-	
-	public static void drawCentered(SpriteBatch batch, BitmapFont font, CharSequence str, float x, float y) {
-		float x2, y2;
-		
-		TextBounds b = font.getMultiLineBounds(str);
-		
-		x2 = x - b.width/2;
-		y2 = y - b.height/2;
-				
-		font.drawMultiLine(batch, str, x2, y2, b.width, HAlignment.CENTER);
-	}
-	
-	public static void drawCenteredScreenY(SpriteBatch batch, BitmapFont font, CharSequence str, float x, 
-			int viewportHeight) {
-		float y;
-		
-		TextBounds b = font.getMultiLineBounds(str);
-	
-		y = (viewportHeight - b.height)/2;
-		
-		font.drawMultiLine(batch, str, x, y, b.width, HAlignment.CENTER);
-	}
-	
-	public static void drawCenteredScreenX(SpriteBatch batch, BitmapFont font, CharSequence str, float y, 
-			int viewportWidth) {
-
-		float x;
-		
-		TextBounds b = font.getMultiLineBounds(str);
-		
-		x = (viewportWidth - b.width)/2;
-		
-		font.drawMultiLine(batch, str, x, y, b.width, HAlignment.CENTER);
-	}
-	
-	public static float getCenterX(BitmapFont font, CharSequence str, 
-			int viewportWidth) {
-		float x;
-		
-		TextBounds b = font.getMultiLineBounds(str);
-		
-		x = (viewportWidth - b.width)/2;
-		
-		return x;
-	}
-	
-	public static float getCenterX(BitmapFont font, CharSequence str, float maxLength, 
-			int viewportWidth) {
-		float x;
-		
-		TextBounds b = font.getWrappedBounds(str, maxLength);
-		
-		x = (viewportWidth - b.width)/2;
-		
-		return x;
-	}
-	
-	public static float getCenterY(BitmapFont font, CharSequence str, int viewportHeight) {
-		
-		float y;
-		
-		TextBounds b = font.getMultiLineBounds(str);
-		
-		y = (viewportHeight + b.height)/2;
-		
-		return y;
-	}
-	
-	public static float getCenterY(BitmapFont font, CharSequence str, float maxLength, int viewportHeight) {
-		float y;
-		
-		TextBounds b = font.getWrappedBounds(str, maxLength);
-		
-		y = (viewportHeight + b.height)/2;
-		
-		return y;
-	}
-
-	public static Vector2 getCenter(BitmapFont font, CharSequence str, 
-			int viewportWidth, int viewportHeight) {
-		Vector2 p = new Vector2();
-		
-		TextBounds b = font.getMultiLineBounds(str);
-		
-		p.x = (viewportWidth - b.width)/2;
-		p.y = (viewportHeight + b.height)/2;
-		
-		return p;
-	}
-
-	public static float getSubtitleY(BitmapFont font, String str,  int viewportHeight) {
-		TextBounds b = font.getMultiLineBounds(str);
-		
-		float y = viewportHeight - b.height - viewportHeight/10;
-		
-		return y;
-	}	
-	
-	public static float getSubtitleY(BitmapFont font, String str, float maxLength, int viewportHeight) {
-		TextBounds b = font.getWrappedBounds(str, maxLength);
-		
-		float y = viewportHeight - b.height - DPIUtils.getMarginSize() * 4;
-		
-		return y;
-	}		
-	
-}
diff --git a/blade-engine/src/com/bladecoder/engine/util/UIUtils.java b/blade-engine/src/com/bladecoder/engine/util/UIUtils.java
new file mode 100644
index 000000000..43b509753
--- /dev/null
+++ b/blade-engine/src/com/bladecoder/engine/util/UIUtils.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright 2014 Rafael Garcia Moreno.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package com.bladecoder.engine.util;
+
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
+
+import com.badlogic.gdx.math.Interpolation;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.math.Vector3;
+import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.badlogic.gdx.scenes.scene2d.actions.Actions;
+import com.badlogic.gdx.scenes.scene2d.ui.Label;
+import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.viewport.Viewport;
+import com.bladecoder.engine.model.InteractiveActor;
+import com.bladecoder.engine.model.Text;
+import com.bladecoder.engine.model.TextManager;
+import com.bladecoder.engine.model.Verb;
+import com.bladecoder.engine.model.World;
+
+public class UIUtils {
+	private final static Vector3 unprojectTmp = new Vector3();
+	private final static Vector2 unproject2Tmp = new Vector2();
+
+	public static void showUIText(Stage stage, Skin skin, World w, Text t) {
+		// Type UI texts will show at the same time that TextManagerUI texts.
+
+		String style = t.style == null ? "ui-text" : t.style;
+		Label msg = new Label(t.str, skin, style);
+
+		msg.setWrap(true);
+		msg.setAlignment(Align.center, Align.center);
+
+		if (t.color != null)
+			msg.setColor(t.color);
+
+		msg.setSize(msg.getWidth() + DPIUtils.getMarginSize() * 2, msg.getHeight() + DPIUtils.getMarginSize() * 2);
+
+		stage.addActor(msg);
+		unprojectTmp.set(t.x, t.y, 0);
+		w.getSceneCamera().scene2screen(stage.getViewport(), unprojectTmp);
+
+		float posx, posy;
+
+		if (t.x == TextManager.POS_CENTER) {
+			posx = (stage.getViewport().getScreenWidth() - msg.getWidth()) / 2;
+		} else if (t.x == TextManager.POS_SUBTITLE) {
+			posx = DPIUtils.getMarginSize();
+		} else {
+			posx = unprojectTmp.x;
+		}
+
+		if (t.y == TextManager.POS_CENTER) {
+			posy = (stage.getViewport().getScreenHeight() - msg.getHeight()) / 2;
+		} else if (t.y == TextManager.POS_SUBTITLE) {
+			posy = stage.getViewport().getScreenHeight() - msg.getHeight() - DPIUtils.getMarginSize() * 3;
+		} else {
+			posy = unprojectTmp.y;
+		}
+
+		msg.setPosition(posx, posy);
+		msg.getColor().a = 0;
+		msg.addAction(sequence(Actions.fadeIn(0.4f, Interpolation.fade),
+				Actions.delay(t.time, sequence(fadeOut(0.4f, Interpolation.fade), Actions.removeActor()))));
+	}
+
+	/**
+	 * Calcs the rotation based in the actor screen position
+	 */
+	public static float calcLeaveArrowRotation(Viewport viewport, InteractiveActor actor) {
+		Verb verb = actor.getVerb(Verb.LEAVE_VERB);
+
+		if (verb == null || verb.getIcon() == null) {
+
+			actor.getBBox().getBoundingRectangle().getCenter(unproject2Tmp);
+
+			if (unproject2Tmp.x < viewport.getWorldWidth() / 3f) {
+				return 180; // LEFT
+			}
+
+			if (unproject2Tmp.x > viewport.getWorldWidth() / 3f * 2f) {
+				return 0; // RIGHT
+			}
+
+			if (unproject2Tmp.y < viewport.getWorldHeight() / 5f) {
+				return -90; // DOWN
+			}
+
+			return 90; // UP
+		} else {
+			String dir = verb.getIcon();
+
+			if (dir.equals("left")) {
+				return 180; // LEFT
+			}
+
+			if (dir.equals("right")) {
+				return 0; // RIGHT
+			}
+
+			if (dir.equals("down")) {
+				return -90; // DOWN
+			}
+
+			return 90; // UP
+		}
+	}
+
+}
diff --git a/blade-engine/src/com/bladecoder/engine/util/Utils3D.java b/blade-engine/src/com/bladecoder/engine/util/Utils3D.java
deleted file mode 100644
index 9077e8540..000000000
--- a/blade-engine/src/com/bladecoder/engine/util/Utils3D.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Rafael Garcia Moreno.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package com.bladecoder.engine.util;
-
-import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.GL20;
-import com.badlogic.gdx.graphics.VertexAttributes.Usage;
-import com.badlogic.gdx.graphics.g3d.Material;
-import com.badlogic.gdx.graphics.g3d.Model;
-import com.badlogic.gdx.graphics.g3d.ModelInstance;
-import com.badlogic.gdx.graphics.g3d.attributes.BlendingAttribute;
-import com.badlogic.gdx.graphics.g3d.attributes.ColorAttribute;
-import com.badlogic.gdx.graphics.g3d.utils.MeshPartBuilder;
-import com.badlogic.gdx.graphics.g3d.utils.ModelBuilder;
-
-public final class Utils3D {
-	
-	final static float GRID_MIN = -10f;
-	final static float GRID_MAX = 10f;
-	final static float GRID_STEP = 1f;
-	
-	private static Model axesModel;
-	private static ModelInstance axesInstance;
-	
-	private static Model floorModel;
-	private static ModelInstance floorInstance;
-	
-	public static void dispose() {
-		if(axesModel !=null ) {
-			axesModel.dispose();
-		}
-		
-		axesModel = null;
-
-		
-		if(floorModel !=null ) {
-			floorModel.dispose();
-		}
-		
-		floorModel = null;		
-	}
-	
-
-	
-	public static void createFloor() {
-
-		ModelBuilder modelBuilder = new ModelBuilder();
-		modelBuilder.begin();
-		MeshPartBuilder mpb = modelBuilder.part("parts", GL20.GL_TRIANGLES,
-				Usage.Position | Usage.Normal | Usage.Color, new Material(
-						ColorAttribute.createDiffuse(Color.WHITE)));
-		mpb.setColor(1f, 1f, 1f, 1f);
-//		mpb.box(0, -0.1f, 0, 10, .2f, 10);
-		mpb.rect(-10, 0, -10, 
-				-10, 0, 10,
-				10, 0, 10,
-				10, 0, -10, 0, 1, 0);
-		floorModel = modelBuilder.end();
-		floorInstance = new ModelInstance(floorModel);
-		
-		// TODO Set only when FBO is active
-		floorInstance.materials.get(0).set(new BlendingAttribute(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA));
-	}
-
-	
-	private static void createAxes() {
-		ModelBuilder modelBuilder = new ModelBuilder();
-		modelBuilder.begin();
-		MeshPartBuilder builder = modelBuilder.part("grid", GL20.GL_LINES, Usage.Position | Usage.Color, new Material());
-		builder.setColor(Color.LIGHT_GRAY);
-		for (float t = GRID_MIN; t <= GRID_MAX; t+=GRID_STEP) {
-			builder.line(t, 0, GRID_MIN, t, 0, GRID_MAX);
-			builder.line(GRID_MIN, 0, t, GRID_MAX, 0, t);
-		}
-		builder = modelBuilder.part("axes", GL20.GL_LINES, Usage.Position | Usage.Color, new Material());
-		builder.setColor(Color.RED);
-		builder.line(0, 0, 0, 10, 0, 0);
-		builder.setColor(Color.GREEN);
-		builder.line(0, 0, 0, 0, 10, 0);
-		builder.setColor(Color.BLUE);
-		builder.line(0, 0, 0, 0, 0, 10);
-		axesModel = modelBuilder.end();
-		axesInstance = new ModelInstance(axesModel);
-	}	
-
-	public static ModelInstance getFloor() {
-		if(floorModel == null) {
-			createFloor();
-		}
-		
-		return floorInstance;
-	}
-	
-	public static ModelInstance getAxes() {
-		if(axesModel == null) {
-			createAxes();
-		}
-		
-		return axesInstance;		
-	}
-}
diff --git a/build.gradle b/build.gradle
index a7ab09b3b..5b0fcf327 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,21 +1,21 @@
 allprojects {
-    apply plugin: "eclipse"
-    apply plugin: "idea"
-    
-    version = '0.5.0'
-
-    ext {
-        gdxVersion = '1.4.1'
-    }
-
     repositories {
-	    mavenLocal()
+        mavenLocal()
         mavenCentral()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://oss.sonatype.org/content/repositories/releases/" }
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    }
+}
+
+// DISABLES JAVADOC ULTRACHECKS IN JDK8
+if (JavaVersion.current().isJava8Compatible()) {
+    allprojects {
+        tasks.withType(Javadoc) {
+            options.addStringOption('Xdoclint:none', '-quiet')
+        }
     }
 }
 
-tasks.eclipse.doLast {
-    delete ".project"
+if (hasProperty("ci") && !version.endsWith("-SNAPSHOT")) {
+    version += "-SNAPSHOT"
 }
diff --git a/gradle.properties b/gradle.properties
index 0716c5e84..648c01db7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,7 @@
-signing.keyId=
-signing.password=
-signing.secretKeyRingFile=
-
-sonatypeUsername=
-sonatypePassword= 
\ No newline at end of file
+version=4.4.0-SNAPSHOT
+libgdxVersion=1.13.1
+roboVMVersion=2.3.22
+androidAPILevel=35
+androidGradlePluginVersion=8.6.1
+bladeInkVersion=1.2.0
+gdxControllersVersion=2.2.3
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b979729db..7454180f2 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d01e74dca..81aa1c044 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Sep 21 13:08:26 CEST 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip
diff --git a/gradlew b/gradlew
index 91a7e269e..1b6c78733 100755
--- a/gradlew
+++ b/gradlew
@@ -1,79 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -82,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -90,75 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
old mode 100644
new mode 100755
index 8a0b282aa..ac1b06f93
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,90 +1,89 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
index af211a8d0..18e82ab62 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include 'blade-engine', 'adventure-composer'
+include 'blade-engine', 'adventure-editor', 'blade-engine-spine-plugin'